Merge branch 'master' of ssh://git.giugl.io/peperunas/nixos

This reverts commit 5b7fb4c77b.

flake.lock

@@ -8,11 +8,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1723293904,
+        "lastModified": 1736955230,
-        "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
+        "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
+        "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c",
         "type": "github"
       },
       "original": {
@@ -331,11 +331,11 @@
     },
     "nixos-master": {
       "locked": {
-        "lastModified": 1736856336,
+        "lastModified": 1738404497,
-        "narHash": "sha256-++h4ivM+M5dTsD4xEgWCMsXQNW15KzCZfB37/InO11Y=",
+        "narHash": "sha256-8quEiiLZEmb1sDmBXik2zuPrneM2KfGNTD0Th3dgUcY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "deb4f62a8ad1971753042cdb34138f739110425f",
+        "rev": "aedbfbb62892ddda99185685105a5a198e8414ea",
         "type": "github"
       },
       "original": {
@@ -347,11 +347,11 @@
     },
     "nixos-unstable": {
       "locked": {
-        "lastModified": 1736817698,
+        "lastModified": 1738297584,
-        "narHash": "sha256-1m+JP9RUsbeLVv/tF1DX3Ew9Vl/fatXnlh/g5k3jcSk=",
+        "narHash": "sha256-AYvaFBzt8dU0fcSK2jKD0Vg23K2eIRxfsVXIPCW9a0E=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2b1fca3296ddd1602d2c4f104a4050e006f4b0cb",
+        "rev": "9189ac18287c599860e878e905da550aa6dec1cd",
         "type": "github"
       },
       "original": {
@@ -379,11 +379,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1736853974,
+        "lastModified": 1738406476,
-        "narHash": "sha256-861AIG997tr2FlD+a5vGEQi3/7fUVwun79vDkZ/a+MM=",
+        "narHash": "sha256-EefAB0lz+bJb4a7C802AByCqeAE3LMVkxKg3MVkja38=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "62b598a93723c4808003e316bfd232da74767471",
+        "rev": "dcdc2c2adfe1ff857efdaf14b554356ff8182283",
         "type": "github"
       },
       "original": {
@@ -481,11 +481,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1736691253,
+        "lastModified": 1736883042,
-        "narHash": "sha256-2/S4tyZgGFZfbwZJTa95XK1RanfsFmsxIPFZWgoUDec=",
+        "narHash": "sha256-DFij3ZnNbP8bISN6ra6rKVb3CAhaX4jg3dDxJlDUFYA=",
         "owner": "icewind1991",
         "repo": "nvidia-patch-nixos",
-        "rev": "3a3b080ba7c2dc9b82ee90c1f7f1f98ed90e3ea7",
+        "rev": "bb8ac52eff4c4e8df0a18ab444263f2619d0d25a",
         "type": "github"
       },
       "original": {

hosts/architect/llm.nix

@@ -4,7 +4,7 @@ let
   backendDomain = "ollama.giugl.io";
   ollamaHost = "127.0.0.1";
   ollamaPort = 11434;
-  ollamaPkg = pkgs.unstablePkgs.ollama;
+  ollamaPkg = pkgs.unstablePkgs.ollama-cuda;
 in
 {
   environment = {

hosts/architect/sunshine.nix

@@ -35,12 +35,12 @@ let
     executable = true;
     destination = "/bin/resolution.sh";
   };
-  sunshinePkg = (pkgs.localPkgs.sunshine.override { cudaSupport = true; cudaPackages = pkgs.cudaPackages_12_4; boost = pkgs.boost186; });
+  sunshinePkg = (pkgs.unstablePkgs.sunshine.override { cudaSupport = true; });
 in
 {
   boot.kernelModules = [ "uinput" ];
 
-  environment.systemPackages = [ pkgs.unstablePkgs.gamemode ];
+  environment.systemPackages = with pkgs.unstablePkgs; [ gamemode heroic ];
 
   hardware = {
     pulseaudio.enable = false;
@@ -51,6 +51,7 @@ in
       powerManagement.finegrained = false;
       open = false;
       nvidiaSettings = true;
+      package = config.boot.kernelPackages.nvidiaPackages.latest;
     };
   };
   systemd.services.NetworkManager-wait-online.enable = pkgs.lib.mkForce false;
@@ -94,6 +95,7 @@ in
         origin_web_ui_allowed = "lan";
         min_threads = 12;
         log_path = "sunshine.log";
+        back_button_timeout = 2500;
       };
       applications = {
         env = {
@@ -128,25 +130,37 @@ in
               }
             ];
           }
+          {
+            name = "Heroic";
+            cmd = ''${pkgs.bash}/bin/bash -c "${pkgs.unstablePkgs.heroic}/bin/heroic"'';
+            prep-cmd = [
+              {
+                do = ''${pkgs.bash}/bin/bash -c "${resolutionScript}/bin/resolution.sh ''${SUNSHINE_CLIENT_WIDTH} ''${SUNSHINE_CLIENT_HEIGHT}" ''${SUNSHINE_CLIENT_FPS}"'';
+                undo = ''${pkgs.bash}/bin/bash -c "${pkgs.procps}/bin/pkill heroic; ${pkgs.procps}/bin/pkill sunshine"'';
+              }
+            ];
+          }
         ];
       };
     };
 
+    displayManager = {
+      autoLogin = {
+        inherit user;
+        enable = true;
+      };
+
+      sddm = {
+        enable = true;
+        wayland.enable = false;
+
+      };
+    };
+
     xserver = {
       enable = true;
       videoDrivers = [ "nvidia" ];
-      desktopManager.gnome.enable = true;
+      desktopManager.xfce.enable = true;
-      displayManager = {
-        gdm = {
-          enable = true;
-          autoSuspend = false;
-          autoLogin = {
-            inherit user;
-            enable = true;
-          };
-        };
-        defaultSession = "gnome-xorg";
-      };
 
       monitorSection = ''
         HorizSync       5.0 - 1000.0