Bump to 24.05

flake.lock

@@ -7,16 +7,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1715381426,
+        "lastModified": 1716736833,
-        "narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=",
+        "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4",
+        "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.11",
+        "ref": "release-24.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -24,7 +24,7 @@
     "local-unstable": {
       "locked": {
         "lastModified": 0,
-        "narHash": "sha256-zw0FIry0jIH2RD4oPubgHZ2YZ03s7f5YZyvXT/wvTBA=",
+        "narHash": "sha256-jZsJ1OJKLBDPlEfP3JMm+268g82AJFG8uIbS77UCzLQ=",
         "path": "/home/giulio/dev/nixpkgs",
         "type": "path"
       },
@@ -35,11 +35,11 @@
     },
     "nixos-unstable": {
       "locked": {
-        "lastModified": 1716499749,
+        "lastModified": 1717234412,
-        "narHash": "sha256-fCkyXpt1PXihhSWOQdgp2iTY5dgQmkHYDiqg1DhjhIM=",
+        "narHash": "sha256-G1BPi5PlMeI+262fCZbHq0eAjCco51dCDp/11DLL7+A=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b962cd91aa0b1150ebd4e8552943de9b7700fe5e",
+        "rev": "f302173b7fbca47e4d2793569f6f41604f54634a",
         "type": "github"
       },
       "original": {
@@ -51,16 +51,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1716492874,
+        "lastModified": 1717225736,
-        "narHash": "sha256-MLI6m4upxQnqAZ8ymRdEmyWa1EnT2C+wgy/HCU8Y3F0=",
+        "narHash": "sha256-IbJ9wR9xcNVo5LF/e9K3GnlEEGA84rUzTDl2LrY20kI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "880e6beaf8069075941eafac2d18cdd69558a2d2",
+        "rev": "3027b8b4cfe84f0dd6fad1c8a02a7a381af89c9c",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "release-23.11",
+        "ref": "release-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -73,15 +73,15 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1710353022,
+        "lastModified": 1714473972,
-        "narHash": "sha256-f4hsLsOqPUlh3iqg6gARj+c4pZzJhaPhoeoH36u0yQM=",
+        "narHash": "sha256-J1o+D45PXCmPZHvGpA8mhzb7BolvBv0wWY8vYo+WMp8=",
-        "owner": "peperunas",
+        "owner": "icewind1991",
         "repo": "nvidia-patch-nixos",
-        "rev": "021ad79e03f4a2266a98f90ac63b08d3e72f0ab0",
+        "rev": "0baf075bedfc84dc488000ae6c7cb4ed56967e2f",
         "type": "github"
       },
       "original": {
-        "owner": "peperunas",
+        "owner": "icewind1991",
         "repo": "nvidia-patch-nixos",
         "type": "github"
       }

flake.nix

@@ -1,14 +1,14 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/release-23.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
     nixos-unstable.url = "github:NixOS/nixpkgs/master";
     local-unstable.url = "path:///home/giulio/dev/nixpkgs";
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.11";
+      url = "github:nix-community/home-manager/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nvidia-patch = {
-      url = "github:peperunas/nvidia-patch-nixos";
+      url = "github:icewind1991/nvidia-patch-nixos";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
@@ -40,7 +40,7 @@
           overlays = [
             (final: prev: { inherit unstablePkgs; })
             (final: prev: { inherit localPkgs; })
-            (nvidia-patch.overlay)
+            (nvidia-patch.overlays.default)
           ];
         };
 

hosts/architect/dns.nix

@@ -49,7 +49,7 @@ in
     adguardhome = {
       enable = true;
       settings = {
-        bind_port = 5354;
+        port = 5354;
         dns = {
           port = 5300;
         };

hosts/architect/nextcloud.nix

@@ -47,7 +47,7 @@ in
       enable = true;
       hostName = domain;
       https = true;
-      package = pkgs.nextcloud28;
+      package = pkgs.nextcloud29;
       datadir = "/services/nextcloud";
       configureRedis = true;
       caching = {
@@ -59,8 +59,11 @@ in
 
       maxUploadSize = "50G";
 
+      settings = {
+        overwriteprotocol = "https";
+      };
+      
       config = {
-        overwriteProtocol = "https";
         dbtype = "mysql";
         dbuser = "nextcloud";
         dbhost = "localhost";

hosts/architect/sunshine.nix

@@ -1,12 +1,6 @@
 { config, pkgs, ... }:
 
 let
-  rev = "c4388cf"; # revision from https://github.com/keylase/nvidia-patch to use
-  hash = "sha256-ua6LpbV3ymR22hAT2AZenoMXDqr3DUJ1wtBi/Psypow="; # 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.latest;
 
@@ -52,7 +46,7 @@ let
       global_prep_cmd=[{"do":"${pkgs.bash}/bin/bash -c \"${resolutionScript}/bin/resolution.sh ''${SUNSHINE_CLIENT_WIDTH} ''${SUNSHINE_CLIENT_HEIGHT} ''${SUNSHINE_CLIENT_FPS}\""}]
     '';
   sunshinePkg = (pkgs.unstablePkgs.sunshine.override { cudaSupport = true; });
-  in
+in
 {
   boot.kernelModules = [ "uinput" ];
 
@@ -89,7 +83,7 @@ let
       powerManagement.finegrained = false;
       open = false;
       nvidiaSettings = true;
-      package = nvidia-patch.patch-nvenc (nvidia-patch.patch-fbc nvidiaPackage);
+      package = with pkgs; nvidia-patch.patch-nvenc (nvidia-patch.patch-fbc nvidiaPackage);
     };
   };
 
@@ -120,20 +114,21 @@ let
       KERNEL=="uinput", SUBSYSTEM=="misc", OPTIONS+="static_node=uinput", TAG+="uaccess"
     '';
 
+    displayManager = {
+      sddm = {
+        enable = true;
+        wayland.enable = false;
+        autoLogin.relogin = true;
+      };
+      autoLogin = {
+        inherit user;
+        enable = true;
+      };
+    };
+
     xserver = {
       enable = true;
       videoDrivers = [ "nvidia" ];
-      displayManager = {
-        sddm = {
-          enable = true;
-          wayland.enable = false;
-          autoLogin.relogin = true;
-        };
-        autoLogin = {
-          inherit user;
-          enable = true;
-        };
-      };
       desktopManager.xfce.enable = true;
 
       monitorSection = ''

lib/host.nix

@@ -37,7 +37,7 @@
             useGlobalPkgs = true;
           };
 
-          system.stateVersion = "23.11";
+          system.stateVersion = "24.05";
         }
 
         home-manager.nixosModules.home-manager

roles/common.nix

@@ -14,7 +14,6 @@
 
   nix = {
     settings.auto-optimise-store = true;
-    package = pkgs.nixUnstable;
     extraOptions = ''
       experimental-features = nix-command flakes
     '';

roles/home/common.nix

@@ -24,6 +24,6 @@
     ]
     ++ lib.optional (!pkgs.stdenv.isDarwin) pastebinit;
 
-    stateVersion = "23.11";
+    stateVersion = "24.05";
   };
 }

roles/home/zsh.nix

@@ -11,7 +11,7 @@
       plugins = [ "git" "sudo" "docker" "docker-compose" "adb" "systemd" ];
       theme = "bira";
     };
-    enableAutosuggestions = false;
+    autosuggestion.enable = false;
     dotDir = ".config/zsh";
     initExtra = ''
       # avoid macOS updates to destroy nix

templates/basicShell/flake.nix

@@ -1,24 +0,0 @@
-{
-  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-    flake-utils.url = "github:numtide/flake-utils";
-  };
-
-  outputs = { self, nixpkgs, flake-utils }:
-    flake-utils.lib.eachDefaultSystem (system:
-      let
-        pkgs = import nixpkgs {
-          inherit system;
-          config.allowUnfree = true;
-        };
-
-        shellWithPkgs = packages: pkgs.mkShell {
-          inherit packages;
-        };
-      in
-      {
-        devShells.default = shellWithPkgs [ pkgs.hello ];
-      });
-}
-
-