nixos 24.11 release, necessary changes

7 files changed, 65 insertions, 39 deletions

diff --git a/flake.lock b/flake.lock
index 4c03b8a..f4189da 100644
--- a/flake.lock
+++ b/flake.lock
@@ -223,16 +223,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1726989464,
-        "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
+        "lastModified": 1733050161,
+        "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
+        "rev": "62d536255879be574ebfe9b87c4ac194febf47c5",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.05",
+        "ref": "release-24.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -266,10 +266,40 @@
         "type": "github"
       }
     },
+    "hyprgraphics": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733248371,
+        "narHash": "sha256-FFLJzFTyNhS7tBEEECx0B8Ye/bpmxhFVEKlECgMLc6c=",
+        "owner": "hyprwm",
+        "repo": "hyprgraphics",
+        "rev": "cc95e5babc6065bc3ab4cd195429a9900836ef13",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprgraphics",
+        "type": "github"
+      }
+    },
     "hyprland": {
       "inputs": {
         "aquamarine": "aquamarine",
         "hyprcursor": "hyprcursor",
+        "hyprgraphics": "hyprgraphics",
         "hyprland-protocols": "hyprland-protocols",
         "hyprlang": "hyprlang",
         "hyprutils": "hyprutils",
@@ -282,11 +312,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1732988560,
-        "narHash": "sha256-CGtf2NTXgvAH0qXaYXMyZA5Dbw+86B3/jMmXz6QUCW0=",
+        "lastModified": 1733266710,
+        "narHash": "sha256-O3SohtpjLpC0NbokgMvCQXJkqbIRYs/h+NFQ9PyD2sI=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "d26439a0fe5594fb26d5a3c01571f9490a9a2d2c",
+        "rev": "3c617ce33c64cb43049489598b6391911eed7070",
         "type": "github"
       },
       "original": {
@@ -427,7 +457,7 @@
         "narHash": "sha256-zNW/rqNJwhq2lYmQf19wJerRuNimjhxHKmzrWWFJYts=",
         "rev": "622a2253a071a1fb97a4d3c8103a91114acc1140",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/622a2253a071a1fb97a4d3c8103a91114acc1140.tar.gz?rev=622a2253a071a1fb97a4d3c8103a91114acc1140"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/622a2253a071a1fb97a4d3c8103a91114acc1140.tar.gz"
       },
       "original": {
         "type": "tarball",
@@ -455,11 +485,11 @@
     },
     "nixlib": {
       "locked": {
-        "lastModified": 1732410305,
-        "narHash": "sha256-/hxIKRTBsdrnudJWDGaBN8wIjHovqVAVxXdi8ByVtck=",
+        "lastModified": 1733015484,
+        "narHash": "sha256-qiyO0GrTvbp869U4VGX5GhAZ00fSiPXszvosY1AgKQ8=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "87b6978992e2eb605732fba842cad0a7e14b2047",
+        "rev": "0e4fdd4a0ab733276b6d2274ff84ae353f17129e",
         "type": "github"
       },
       "original": {
@@ -476,11 +506,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732496924,
-        "narHash": "sha256-/MNhZLR0eh9z/d3l+ammq+F5XxHln0RHgO4Bhtjr0IM=",
+        "lastModified": 1733101779,
+        "narHash": "sha256-Qqnfnb/RFxBbD25UYJ/yibvl9kIZNK5WkyLsUcb2byk=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "098e8b6ff72c86944a8d54b64ddd7b7e6635830a",
+        "rev": "a471acc460d4c238936a5116c8cc48a3c431dd66",
         "type": "github"
       },
       "original": {
@@ -491,16 +521,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1732749044,
-        "narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=",
+        "lastModified": 1733120037,
+        "narHash": "sha256-En+gSoVJ3iQKPDU1FHrR6zIxSLXKjzKY+pnh9tt+Yts=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685",
+        "rev": "f9f0d5c5380be0a599b1fb54641fa99af8281539",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-24.05",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -538,11 +568,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1732837521,
-        "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=",
+        "lastModified": 1733212471,
+        "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370",
+        "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 89939cc..aa1a77b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,11 +2,11 @@
   description = "NixOS configuration";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-24.05"; 
+      url = "github:nix-community/home-manager/release-24.11"; 
       # The `follows` keyword in inputs is used for inheritance.
       # Here, `inputs.nixpkgs` of home-manager isn't kept consistent with the `inputs.nixpkgs` of the current flake,
       # to not avoid problems caused by different versions of nixpkgs dependencies.
@@ -263,14 +263,12 @@
           # ./modules/nixos/sway.nix
           ./modules/nixos/system-packages.nix
 
-          # ./home-manager/home.nix
-
           # # Let 'nixos-version --json' know the Git revision of this flake.
           # system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev;
           # nix.registry.nixpkgs.flake = nixpkgs;
         ];
-        # specialArgs = { inherit inputs; };
       };
+
       betsy = nixpkgs.lib.nixosSystem { # this is my work laptop
         modules = [
           ./machines/betsy/configuration.nix
diff --git a/machines/betsy/configuration.nix b/machines/betsy/configuration.nix
index a837d31..cebf038 100644
--- a/machines/betsy/configuration.nix
+++ b/machines/betsy/configuration.nix
@@ -84,8 +84,8 @@
   hardware.pulseaudio.enable = false;
   # OR
   services.pipewire = {
-    enable = true;
-    pulse.enable = true;
+  # enable = true;
+  # pulse.enable = true;
   };
 
   # Enable touchpad support (enabled default in most desktopManager).
diff --git a/machines/khad/configuration.nix b/machines/khad/configuration.nix
index c36c941..b16ecb5 100644
--- a/machines/khad/configuration.nix
+++ b/machines/khad/configuration.nix
@@ -33,12 +33,9 @@
 
   # services.xserver.videoDrivers = [ "nvidia" ];
   services.displayManager.sddm.autoNumlock = true;
-  hardware.opengl = {
-    enable = true;
-    # if hardware.opengl.driSupport is enabled, mesa is installed and provides Vulkan of supported hardware.
-    driSupport = true;
-    # needed by nvidia-docker
-    driSupport32Bit = true;
+  hardware.graphics = {
+    # enable = true;
+    enable32Bit = true;
   };
   
   environment.shellInit = ''export  NIXPATH="/nix/var/nix/profiles/per-user/$USER/channels:nixos-config=/etc/nixos/machines/khad/configuration.nix"'';
@@ -88,7 +85,7 @@
   services.printing.enable = true;
 
   # Enable sound.
-  sound.enable = true;
+  # sound.enable = true;
   security.rtkit.enable = true; #not sure what this does
   services.pipewire = {
     enable = true;
diff --git a/machines/zenbook/configuration.nix b/machines/zenbook/configuration.nix
index 25ea805..8829caf 100644
--- a/machines/zenbook/configuration.nix
+++ b/machines/zenbook/configuration.nix
@@ -42,7 +42,7 @@
     # wayland.enable = true;
     settings = {
       # Wayland.EnableHiDPI = "true";
-      X11.ServerArguments = "-nolisten tcp -dpi 170";
+      # X11.ServerArguments = "-nolisten tcp -dpi 170";
     };
   };
   networking = {
@@ -80,7 +80,7 @@
 
 
   # Enable sound.
-  sound.enable = true;
+  # sound.enable = true;
   # hardware.pulseaudio.enable = true;
 
 
diff --git a/modules/nixos/headscale.nix b/modules/nixos/headscale.nix
index 3fd7083..871762b 100644
--- a/modules/nixos/headscale.nix
+++ b/modules/nixos/headscale.nix
@@ -11,7 +11,7 @@ in {
       settings = { 
         logtail.enabled = false; 
         serverUrl = "https://${subDomain}";
-        dns_config.base_domain = "${domain}";
+        dns.base_domain = "${domain}";
         ip_prefixes = [
           "100.64.0.0/10"
           "fd7a:115c:a1e0::/48"
diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix
index 6e72fa3..3c95763 100644
--- a/modules/nixos/hyprland.nix
+++ b/modules/nixos/hyprland.nix
@@ -3,10 +3,11 @@
     enable = true;
     wlr.enable = true;
     extraPortals = [
+      pkgs.xdg-desktop-portal-kde
       pkgs.xdg-desktop-portal-gnome
       (pkgs.xdg-desktop-portal-gtk.override {
         # Do not build portals that we already have.
-        buildPortalsInGnome = false;
+        # buildPortalsInGnome = false;
       })
     ];
   };