diff --git a/hosts/nixbook/default.nix b/hosts/nixbook/default.nix index b8c8ae1..e0c0b3c 100644 --- a/hosts/nixbook/default.nix +++ b/hosts/nixbook/default.nix @@ -21,6 +21,5 @@ steam ]; - # explicitly override videoDrivers (nvidia doesnt like us on nixbook ) - services.xserver.videoDrivers = lib.mkForce [ "intel" ]; + services.xserver.videoDrivers = [ "intel" ]; } diff --git a/hosts/tuxcomp/default.nix b/hosts/tuxcomp/default.nix index 733985c..588c97b 100644 --- a/hosts/tuxcomp/default.nix +++ b/hosts/tuxcomp/default.nix @@ -1,4 +1,3 @@ - { lib, config, pkgs, ... }: { @@ -7,20 +6,27 @@ ../../modules ./gaming.nix ./wireguard.nix + ./nvidia.nix ]; networking.hostName = "tuxcomp"; system.stateVersion = "26.05"; + hardware.tuxedo-rs = { + enable = true; + tailor-gui.enable = true; + }; + hardware.tuxedo-drivers.enable = true; + # adds a `stretch_aspect` scaler (Valve/gamescope#927) and lets `--rt` use the # rtprio limit from modules/gaming.nix instead of CAP_SYS_NICE. - #nixpkgs.overlays = [ + # nixpkgs.overlays = [ # (_final: prev: { # gamescope = prev.gamescope.overrideAttrs (old: { # patches = (old.patches or [ ]) ++ [ ../../patches/gamescope-stretch-aspect.patch ]; # }); # }) - #]; + # ]; } diff --git a/hosts/tuxcomp/nvidia.nix b/hosts/tuxcomp/nvidia.nix new file mode 100644 index 0000000..1f2fce0 --- /dev/null +++ b/hosts/tuxcomp/nvidia.nix @@ -0,0 +1,20 @@ +{ lib, ... }: + +{ + services.xserver.videoDrivers = lib.mkForce [ + "nvidia" + "amdgpu" + ]; + + hardware.nvidia.prime = { + reverseSync.enable = true; + amdgpuBusId = "PCI:6@0:0:0"; + nvidiaBusId = "PCI:1@0:0:0"; + }; + + hardware.nvidia = { + open = true; + modesetting.enable = true; + nvidiaSettings = true; + }; +} diff --git a/modules/apps.nix b/modules/apps.nix index 14683e1..9f3a588 100644 --- a/modules/apps.nix +++ b/modules/apps.nix @@ -29,6 +29,7 @@ zathura # media + exiftool feh feishin # TODO: inject my patches / use my version ffmpeg @@ -39,6 +40,7 @@ puddletag # tools + appimage-run fastfetch gparted ranger @@ -47,5 +49,11 @@ unrar unzip zip + fzf ]; + + programs.appimage = { + enable = true; + binfmt = true; + }; } diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index bb85481..e72fc07 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -1,19 +1,15 @@ { pkgs, inputs, ... }: { - services.displayManager.gdm.enable = true; # TODO: look into ly/greetd/something less heavy + services.displayManager.sddm.enable = true; # TODO: look into ly/greetd/something less heavy services.displayManager.autoLogin = { enable = true; user = "djai"; }; + # note that we set the videodrivers on a per-host basis, so not here. services.xserver = { enable = true; - videoDrivers = [ - "nvidia" - "amdgpu" - "intel" - ]; xkb = { layout = "us"; variant = "euro"; @@ -53,6 +49,7 @@ waybar wl-clipboard wl-clipboard-x11 + swaybg ]; # TODO: qt theming