Upgrade to 24.05?

common/configuration.nix

@@ -63,6 +63,6 @@
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "23.11"; # Did you read the comment?
+  system.stateVersion = "24.05"; # Did you read the comment?
 
 }

common/development-machine.nix

@@ -14,6 +14,6 @@
     llvmPackages_16.libllvm
     rr
 
-    nodejs_21
+    nodejs_22
   ];
 }

common/exwm.nix

@@ -7,17 +7,25 @@
     networkmanagerapplet
   ];
 
-  services.xserver.windowManager.exwm = {
+  services = {
-    enable = true;
+    xserver.windowManager.exwm = {
-    enableDefaultConfig = false;
+      enable = true;
+      enableDefaultConfig = false;
+    };
+
+    # gpg-agent = {
+    #   enable = true;
+    #   pinentryFlavor = "gtk2";
+    # };
   };
 
   programs = {
     nm-applet.enable = true;
+
     gnupg.agent = {
       enable = true;
-      pinentryFlavor = "gtk2";
       enableSSHSupport = true;
+      pinentryPackage = pkgs.pinentry-gtk2;
     };
   };
 

common/moms-house/printer.nix

@@ -16,7 +16,7 @@
     # Enable auto-discovery of printers
     avahi = {
       enable = true;
-      nssmdns = true;
+      nssmdns4 = true;
       openFirewall = true;
     };
   };

common/user-facing.nix

@@ -29,21 +29,23 @@
     # Enable the KDE Plasma Desktop Environment.
     desktopManager.plasma5.enable = true;
 
-    # Enable sddm, add exwm
-    displayManager = {
-      sddm.enable = true;
-      defaultSession = "none+exwm";
-    };
-
     # Configure keymap in X11
-    layout = "us";
+    xkb = {
-    xkbVariant = "";
+      layout = "us";
+      variant = "";
+    };
+  };
 
-    libinput = {
+  # Enable sddm, add exwm
-      enable = true;
+  services.displayManager = {
-      touchpad = {
+    sddm.enable = true;
-        naturalScrolling = true;
+    defaultSession = "none+exwm";
-      };
+  };
+
+  services.libinput = {
+    enable = true;
+    touchpad = {
+      naturalScrolling = true;
     };
   };
 
@@ -88,14 +90,16 @@
     yt-dlp
     dconf
 
-    (beets.override {
+    # TODO: Re-enable extrafiles
-      pluginOverrides = {
+    (beets# .override {
-        extrafiles = {
+    #   pluginOverrides = {
-          enable = true;
+    #     extrafiles = {
-          propagatedBuildInputs = [ beetsPackages.extrafiles ];
+    #       enable = true;
-        };
+    #       propagatedBuildInputs = [ beetsPackages.extrafiles ];
-      };
+    #     };
-    })
+    #   };
+    # }
+    )
 
     (gnuplot.override { withQt = true; })
   ];

flake.lock

@@ -65,16 +65,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1704099619,
+        "lastModified": 1719827385,
-        "narHash": "sha256-QRVMkdxLmv+aKGjcgeEg31xtJEIsYq4i1Kbyw5EPS6g=",
+        "narHash": "sha256-qs+nU20Sm8czHg3bhGCqiH+8e13BJyRrKONW34g3i50=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7e398b3d76bc1503171b1364c9d4a07ac06f3851",
+        "rev": "391ca6e950c2525b4f853cbe29922452c14eda82",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.11",
+        "ref": "release-24.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -97,16 +97,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1716061101,
+        "lastModified": 1719838683,
-        "narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=",
+        "narHash": "sha256-Zw9rQjHz1ilNIimEXFeVa1ERNRBF8DoXDhLAZq5B4pE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2",
+        "rev": "d032c1a6dfad4eedec7e35e91986becc699d7d69",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-23.11",
+        "ref": "nixos-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -171,16 +171,16 @@
     },
     "update": {
       "locked": {
-        "lastModified": 1716061101,
+        "lastModified": 1719838683,
-        "narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=",
+        "narHash": "sha256-Zw9rQjHz1ilNIimEXFeVa1ERNRBF8DoXDhLAZq5B4pE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2",
+        "rev": "d032c1a6dfad4eedec7e35e91986becc699d7d69",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-23.11",
+        "ref": "nixos-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -1,7 +1,7 @@
 {
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
-    update.url = "github:nixos/nixpkgs/nixos-23.11";
+    update.url = "github:nixos/nixpkgs/nixos-24.05";
     unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     emacs-overlay = {
       url = "github:nix-community/emacs-overlay/master";
@@ -10,7 +10,7 @@
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.11";
+      url = "github:nix-community/home-manager/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     bashcfg-input = {

home/home.nix

@@ -19,7 +19,7 @@
   # You should not change this value, even if you update Home Manager. If you do
   # want to update the value, then make sure to first check the Home Manager
   # release notes.
-  home.stateVersion = "23.11"; # Please read the comment before changing.
+  home.stateVersion = "24.05"; # Please read the comment before changing.
 
   # The home.packages option allows you to install Nix packages into your
   # environment.

hosts/NixDawn/configuration.nix

@@ -153,6 +153,6 @@
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "23.11"; # Did you read the comment?
+  system.stateVersion = "24.05"; # Did you read the comment?
 
 }

hosts/NixFrame/configuration.nix

@@ -65,6 +65,6 @@
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "23.11"; # Did you read the comment?
+  system.stateVersion = "24.05"; # Did you read the comment?
 
 }

hosts/NixGate/configuration.nix

@@ -110,5 +110,5 @@
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "23.11"; # Did you read the comment?
+  system.stateVersion = "24.05"; # Did you read the comment?
 }

hosts/NixSentinel/configuration.nix

@@ -135,6 +135,6 @@
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "23.11"; # Did you read the comment?
+  system.stateVersion = "24.05"; # Did you read the comment?
 
 }