diff --git a/flake.nix b/flake.nix index 4dda2e5..7b82eaa 100644 --- a/flake.nix +++ b/flake.nix @@ -15,6 +15,13 @@ allowUnfree = true; packageOverrides = super: let self = super.pkgs; in { #more overrides can go here + polkit_fix = self.polkit_gnome.overrideAttrs ( oldAttrs: rec + { + postInstall = '' + mkdir $out/bin + ln -s $out/libexec/polkit-gnome-authentication-agent-1 $out/bin/polkit-gnome-authentication-agent-1 + ''; + }); nerdfonts-overpass = self.nerdfonts.override { fonts = [ "Overpass" ]; }; diff --git a/home-manager/bspwm.nix b/home-manager/bspwm.nix index 6230bf7..9b675d8 100755 --- a/home-manager/bspwm.nix +++ b/home-manager/bspwm.nix @@ -10,6 +10,7 @@ "xsetroot -cursor_name left_ptr" "xsetroot -solid \"#000000\"" "flashfocus" + "polkit-gnome-authentication-agent-1" ]; settings = { border_width = 0; diff --git a/home-manager/git.nix b/home-manager/git.nix new file mode 100644 index 0000000..54ec211 --- /dev/null +++ b/home-manager/git.nix @@ -0,0 +1,7 @@ +{ + programs.git = { + enable = true; + userName = "ISnortPennies"; + userEmail = "ISnortPennies@protonmail.com"; + }; +} diff --git a/home-manager/home-manager.nix b/home-manager/home-manager.nix index 6c607c6..3fd3503 100755 --- a/home-manager/home-manager.nix +++ b/home-manager/home-manager.nix @@ -11,7 +11,9 @@ ./alacritty.nix ./theme.nix ./picom.nix + ./git.nix ]; + xsession.numlock.enable = true; programs.home-manager.enable = true; home = { username = "gerg"; diff --git a/modules/misc.nix b/modules/misc.nix index b8145f4..d3fb199 100644 --- a/modules/misc.nix +++ b/modules/misc.nix @@ -3,8 +3,9 @@ nix.settings.auto-optimise-store = true; networking = { firewall.enable = true; + firewall.allowPing = true; useDHCP = lib.mkDefault true; - networkmanager. enable = true; + networkmanager.enable = true; }; qt5 = { enable = true; diff --git a/modules/packages.nix b/modules/packages.nix index 2d438a9..66fa5ec 100755 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -1,36 +1,31 @@ { config, pkgs, callPackage, ... }: { environment.systemPackages = with pkgs; [ - #single commands - nano + nano #editor wget - neofetch - htop - efibootmgr - maim + htop #view tasks + efibootmgr #efi editor + maim #screenshooter curlFull - #lightdm + #lightm stuff lightdm lightdm-mini-greeter #needed utils - pipewire - xorg.xf86videoamdgpu - mesa - mesa-demos + mesa #3d acceleration + git #git duh pciutils - git - dash binutils + alsa-utils + btrfs-progs #for external harddrive #user/gui discord spotify spotify-tray vlc bitwarden - protonvpn-gui gimp qbittorrent - feh + feh #for wallpaper #explicit xfce4 for bspwm xarchive xfce.catfish @@ -42,11 +37,13 @@ environment.systemPackages = with pkgs; [ networkmanager_dmenu networkmanagerapplet dmenu - qsudo flashfocus pavucontrol - gpick xclip - alsa-utils + neofetch + #my polkit fix + polkit_fix + #for thunar root + qsudo ]; } diff --git a/modules/refreshrate.nix b/modules/refreshrate.nix index 08d04f8..3f4f0e6 100644 --- a/modules/refreshrate.nix +++ b/modules/refreshrate.nix @@ -4,10 +4,6 @@ { output = "HDMI-0"; primary = true; - monitorConfig = '' - DisplaySize 1920 1080 - Option "DPMS" "false" - ''; } ]; screenSection = '' diff --git a/modules/smb.nix b/modules/smb.nix new file mode 100644 index 0000000..f252556 --- /dev/null +++ b/modules/smb.nix @@ -0,0 +1,22 @@ +{ + services.samba-wsdd.enable = true; # make shares visible for windows 10 clients + networking.firewall = { + allowedTCPPorts = [ 139 445 ]; + allowedUDPPorts = [ 137 138 ]; + }; + services.samba = { + enable = true; + securityType = "user"; + openFirewall = true; + shares = { + Share = { + path = "/home/gerg/Share"; + browseable = "no"; + "read only" = "no"; + "guest ok" = "no"; + "force user" = "gerg"; + "force group" = "users"; + }; + }; + }; +} diff --git a/systems/desktop.nix b/systems/desktop.nix index 493565a..38f7f1d 100755 --- a/systems/desktop.nix +++ b/systems/desktop.nix @@ -13,6 +13,7 @@ ../modules/vfio.nix ../modules/refreshrate.nix ../modules/xserver.nix + ../modules/smb.nix ]; networking.hostName = "gerg-desktop"; nix = { @@ -30,9 +31,10 @@ ]; # user managment users = { - defaultUserShell = pkgs.zsh; + defaultUserShell = pkgs.dash; users.gerg = { isNormalUser = true; + shell = pkgs.zsh; extraGroups = [ "wheel" "audio" "networkmanager" "kvm" "libvirtd" ]; }; }; diff --git a/systems/laptop.nix b/systems/laptop.nix index b2ce401..3f7eee7 100755 --- a/systems/laptop.nix +++ b/systems/laptop.nix @@ -23,12 +23,16 @@ system.stateVersion = "22.11"; hardware.cpu.amd.updateMicrocode = true; # end important stuff + environment.systemPackages = with pkgs; [ + xorg.xf86videoamdgpu + ]; # user managment users = { - defaultUserShell = pkgs.zsh; + defaultUserShell = pkgs.dash; users.gerg = { isNormalUser = true; + shell = pkgs.zsh; extraGroups = [ "wheel" "audio" "networkmanager"]; }; };