flake.nix

@@ -1,7 +1,7 @@
 {
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/release-23.11";
-    nixos-unstable.url = "github:NixOS/nixpkgs/master";
+    nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     local-unstable.url = "path:///home/giulio/dev/nixpkgs";
     home-manager = {
       url = "github:nix-community/home-manager/release-23.11";
@@ -15,31 +15,34 @@
       sysDarwin = "aarch64-darwin";
       sysLinuxAarch = "aarch64-linux";
 
-      wrapPkgsSystem = { system, cudaSupport ? false }:
+      wrapPkgsSystem = { system }:
-        let
+        import nixpkgs rec {
+          inherit system;
+
+          unstablePkgs = wrapUnstablePkgsSystem { inherit system; };
+          localPkgs = import local-unstable {
+            inherit system;
+            config.allowUnfree = true;
+          };
           config = {
-            inherit cudaSupport;
             allowUnfree = true;
           };
-        in
-        import nixpkgs rec {
-          inherit system config;
-
-          unstablePkgs = import nixos-unstable {
-            inherit system config;
-          };
-
-          localPkgs = import local-unstable {
-            inherit system config;
-          };
-
           overlays = [
             (final: prev: { inherit unstablePkgs; })
             (final: prev: { inherit localPkgs; })
           ];
         };
 
-      wrapUtils = { pkgs, system }:
+      wrapUnstablePkgsSystem = { system }:
+        import nixos-unstable {
+          inherit system;
+
+          config = {
+            allowUnfree = true;
+          };
+        };
+
+      wrapUtils = { pkgs, unstablePkgs, system }:
         let
           inherit (pkgs.lib) makeScope;
           inherit (pkgs) newScope;
@@ -54,24 +57,35 @@
         });
 
 
-      pkgsLinuxX64Cuda = wrapPkgsSystem { system = sysLinuxX64; cudaSupport = true; };
+      pkgsLinuxX64 = wrapPkgsSystem { system = sysLinuxX64; };
-      utilsLinuxX64Cuda = wrapUtils { system = sysLinuxX64; pkgs = pkgsLinuxX64Cuda; };
+      unstableLinuxX64 = wrapUnstablePkgsSystem { system = sysLinuxX64; };
+      utilsLinuxX64 = wrapUtils { system = sysLinuxX64; pkgs = pkgsLinuxX64; unstablePkgs = unstableLinuxX64; };
 
       pkgsLinuxAarch = wrapPkgsSystem { system = sysLinuxAarch; };
-      utilsLinuxAarch = wrapUtils { system = sysLinuxAarch; pkgs = pkgsLinuxAarch; };
+      unstableLinuxAarch = wrapUnstablePkgsSystem { system = sysLinuxAarch; };
+      utilsLinuxAarch = wrapUtils { system = sysLinuxAarch; pkgs = pkgsLinuxAarch; unstablePkgs = unstableLinuxAarch; };
 
       pkgsDarwin = wrapPkgsSystem { system = sysDarwin; };
-      utilsDarwin = wrapUtils { system = sysDarwin; pkgs = pkgsDarwin; };
+      unstableDarwin = wrapUnstablePkgsSystem { system = sysDarwin; };
+      utilsDarwin = wrapUtils { system = sysDarwin; pkgs = pkgsDarwin; unstablePkgs = unstableDarwin; };
     in
     {
       nixosConfigurations = {
-        architect = utilsLinuxX64Cuda.host.mkHost {
+        architect = utilsLinuxX64.host.mkHost {
           name = "architect";
           users = [{
             user = "giulio";
             roles = [ ];
           }];
         };
+        gAluminum = utilsLinuxX64.host.mkHost {
+          name = "gAluminum";
+          users = [{
+            user = "giulio";
+            roles = [ "desktop" "ssh" "git" ];
+          }];
+          roles = [ "gnome" ];
+        };
       };
 
       homeConfigurations = {
@@ -83,11 +97,11 @@
           name = "giulio";
           roles = [ "ssh" ];
         };
-        giulioX64 = utilsLinuxX64Cuda.user.mkHMUser {
+        giulioX64 = utilsLinuxX64.user.mkHMUser {
           name = "giulio";
           roles = [ "ssh" "go" ];
         };
-        giulioX64NoSSH = utilsLinuxX64Cuda.user.mkHMUser {
+        giulioX64NoSSH = utilsLinuxX64.user.mkHMUser {
           name = "giulio";
           roles = [ "go" ];
         };

hosts/architect/sunshine.nix

@@ -1,16 +1,6 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 let
-  # nvidia-patch
-  rev = "b63013c"; # revision from https://github.com/keylase/nvidia-patch to use
-  hash = "sha256-EDPoMTj3J1f/7Sv/q7P/lZ4r2aXOCdsbZ4FumbvuCWk="; # sha256sum for https://github.com/keylase/nvidia-patch at the specified revision
-
-  # create patch functions for the specified revision
-  nvidia-patch = pkgs.nvidia-patch rev hash;
-
-  # nvidia package to patch
-  nvidiaPackage = config.boot.kernelPackages.nvidiaPackages.stable;
-
   user = "sunshine";
   resolutionScript = pkgs.writeTextFile {
     name = "sunshine-resolution-script";
@@ -33,8 +23,6 @@ let
 
       # Apply new xrandr mode
       xrandr --output DP-0 --primary --mode ''${mode_alias} --pos 0x0 --rotate normal
-
-      /run/current-system/sw/bin/nvidia-settings -a 'SyncToVBlank=0'
     '';
     executable = true;
     destination = "/bin/resolution.sh";
@@ -47,7 +35,7 @@ let
       min_threads=12
       global_prep_cmd=[{"do":"${pkgs.bash}/bin/bash -c \"${resolutionScript}/bin/resolution.sh ''${SUNSHINE_CLIENT_WIDTH} ''${SUNSHINE_CLIENT_HEIGHT} ''${SUNSHINE_CLIENT_FPS}\""}]
     '';
-  sunshineOverride = pkgs.unstablePkgs.sunshine.override { cudaSupport = true; };
+  sunshineOverride = pkgs.sunshine.override { cudaSupport = true; stdenv = pkgs.cudaPackages.backendStdenv; };
 in
 {
   security = {
@@ -64,13 +52,18 @@ in
     '';
   };
 
+  systemd.targets = {
+    sleep.enable = false;
+    suspend.enable = false;
+    hibernate.enable = false;
+    hybrid-sleep.enable = false;
+  };
 
   environment.systemPackages = with pkgs; [
     sunshineOverride
     xorg.xrandr
     xorg.xorgserver
     xorg.libxcvt
-    gamemode
   ];
   sound.enable = true;
 
@@ -137,15 +130,8 @@ in
     openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC1we38/N+t8Ah5yrLof8QUwhrob7/VXFKIddaJeOVBLuDVnW7ljiAtdtEiL69D/DV4Ohmt5wMvkAAjfuHmim6FD9A6lzPbSU4KH9W2dcckszKbbI636kuDwem/xui6BW3wJa6P+0xW5ksygEAkzcK2PXuC2b4B9uwhuUdKahiGMKDxISG/WianqAe72cGMfNkYvion3Y1VsMLUdm48d2ABnxNpr7NI9B5iJ8dziOft9gpgfz13CCQRlReo75gk/4xI+vSNrQp7eR+wzJy2/dZg/T8jtyA9Q6jVxrxBpqQ1LNXkAKaJkGo9OabF6Wgpzp+YTAurL4nwR2NaJxwFuyoKvACQy0ai4jrS3206gC6JXZv8ktZMZrwUN+jPqCwfgh5qObFkAqKCxbp52ioDek2MQLdOvzQBX//DBhGEp5rzHGLZ3vhRIiiQiaof5sF5zWiYDW5mqezSPNxJPX/BrTP/Wbs/jpwTLBh3wytiia0S1WXQmya89bqzTPFiDWvTRA62EVKB/JaQtPQQOFAxWwg799DMycPeZ81xttZOyMtI/MZSddyqx2S8fWGwvToZQvuZ38mSIpFseLM1IkgabRIrAmat5SBNGGy9Dqa0eMEa7bwIY/4CMB1y6HMTnaoMXA6cnQfHMoB/zyTZ6oTXIeqeOyiZsK+RN0Mvahj8mXi7dw== giulio@giulio-X230" ];
   };
 
-  systemd = {
-    targets = {
-      sleep.enable = false;
-      suspend.enable = false;
-      hibernate.enable = false;
-      hybrid-sleep.enable = false;
-    };
 
-    user.services.${user} = {
+  systemd.user.services.${user} = {
     description = "Sunshine server";
     wantedBy = [ "graphical-session.target" ];
     startLimitIntervalSec = 500;
@@ -153,14 +139,13 @@ in
     partOf = [ "graphical-session.target" ];
     wants = [ "graphical-session.target" ];
     after = [ "graphical-session.target" ];
-      path = with pkgs; [ resolutionScript xorg.xrandr bash xorg.libxcvt xorg.xorgserver gawk gamemode ];
+    path = [ resolutionScript pkgs.xorg.xrandr pkgs.bash pkgs.xorg.libxcvt pkgs.xorg.xorgserver pkgs.gawk ];
     serviceConfig = {
       ExecStart = "${sunshineOverride}/bin/sunshine ${configFile}";
       Restart = "on-failure";
       RestartSec = "5s";
     };
   };
-  };
 
   services.avahi.publish.userServices = true;
   boot.kernelModules = [ "uinput" ];
@@ -181,7 +166,6 @@ in
       powerManagement.finegrained = false;
       open = false;
       nvidiaSettings = true;
-      package = nvidia-patch.patch-nvenc (nvidia-patch.patch-fbc nvidiaPackage);
     };
   };
 

lib/host.nix

@@ -1,7 +1,9 @@
 { pkgs
 , nixpkgs
+, unstablePkgs
 , home-manager
 , system
+, mkHomeRole
 , mkSysRole
 , mkUser
 , ...
@@ -34,6 +36,7 @@
           ];
 
           home-manager = {
+            extraSpecialArgs.unstablePkgs = unstablePkgs;
             useGlobalPkgs = true;
           };
 

lib/user.nix

@@ -1,9 +1,4 @@
-{ pkgs
+{ pkgs, stdenv, home-manager, mkHomeRole, ... }:
-, stdenv
-, home-manager
-, mkHomeRole
-, ...
-}:
 
 {
   mkUser = { name, roles ? [ ] }: