From 21830a1ba7563f04d273a1d331ea2fd46f775c81 Mon Sep 17 00:00:00 2001
From: Julian Sutter <jsutter@symbiotip.com>
Date: Wed, 30 Jul 2025 14:55:16 -0700
Subject: [PATCH] Migrate to NixOS 24.05 stable branch

- Update flake.nix to use nixos-24.05 and home-manager release-24.05
- Remove deprecated services.pulseaudio configurations
- Fix home-manager compatibility issues:
  - Update stateVersion from 24.11 to 24.05
  - Change VSCode profiles.default.extensions to extensions
  - Update ZSH initContent to initExtra
  - Remove incompatible git signing.format option
- Remove unavailable windsurf package from dev.nix
- Successfully tested with nixos-rebuild dry-run
---
 desktop/dev.nix    |  2 --
 flake.lock         | 15 ++++++++-------
 flake.nix          |  4 ++--
 systems/common.nix |  1 -
 systems/skip01.nix |  1 -
 users/jsutter.nix  |  7 +++----
 6 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/desktop/dev.nix b/desktop/dev.nix
index 348718f..a4237e7 100644
--- a/desktop/dev.nix
+++ b/desktop/dev.nix
@@ -6,8 +6,6 @@ environment.systemPackages = with pkgs; [
    (python3.withPackages(ps: with ps; [ pandas requests python-dotenv pip uv ]))
   nodejs
   rpi-imager
-  windsurf
-  nodejs
   ];
 
 programs.nix-ld.enable = true;
diff --git a/flake.lock b/flake.lock
index 4a22058..85837c7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,15 +7,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1753829416,
-        "narHash": "sha256-Shx91k6pLdX8wK6LchsHRXWAWODvy6fHAbUqOmye43A=",
+        "lastModified": 1726989464,
+        "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ab14805267c132c5e9ac66129ca5361abd592a3a",
+        "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
+        "ref": "release-24.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -38,16 +39,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1753694789,
-        "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=",
+        "lastModified": 1735563628,
+        "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727",
+        "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-unstable",
+        "ref": "nixos-24.05",
         "type": "indirect"
       }
     },
diff --git a/flake.nix b/flake.nix
index 0fb027d..feaf6ff 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,10 +2,10 @@
   description = "Julian's system configuration";
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-unstable";
+    nixpkgs.url = "nixpkgs/nixos-24.05";
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     home-manager = {
-      url = github:nix-community/home-manager;
+      url = "github:nix-community/home-manager/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     plasma-manager = {
diff --git a/systems/common.nix b/systems/common.nix
index 2449400..bf5c538 100644
--- a/systems/common.nix
+++ b/systems/common.nix
@@ -74,7 +74,6 @@
   };
 
   # Services
-  services.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
     enable = true;
diff --git a/systems/skip01.nix b/systems/skip01.nix
index 3f2df3e..8b03843 100644
--- a/systems/skip01.nix
+++ b/systems/skip01.nix
@@ -76,7 +76,6 @@
   # Disable unnecessary services for server use
   services.xserver.enable = lib.mkForce false;
   services.pipewire.enable = lib.mkForce false;
-  services.pulseaudio.enable = lib.mkForce false;
   
   # Enable container support for future server services
   virtualisation.docker.enable = true;
diff --git a/users/jsutter.nix b/users/jsutter.nix
index 6944276..6d043e3 100644
--- a/users/jsutter.nix
+++ b/users/jsutter.nix
@@ -61,7 +61,7 @@
       home.username = "jsutter";
       home.homeDirectory = "/home/jsutter";
       programs.home-manager.enable = true;
-      home.stateVersion = "24.11";
+      home.stateVersion = "24.05";
       services.syncthing.tray.enable = false;
 
       # Set environment variables here
@@ -74,7 +74,6 @@
         enable = true;
         userName  = "Julian Sutter";
         userEmail = "jsutter@symbiotip.com";
-        signing.format = "ssh";
         extraConfig = {
           core.editor = "nano";
           credential.helper = "store";
@@ -87,7 +86,7 @@
       programs.vscode = {
         enable = true;
         package = pkgs.vscodium;
-        profiles.default.extensions = with pkgs.vscode-extensions; [
+        extensions = with pkgs.vscode-extensions; [
           dracula-theme.theme-dracula
           yzhang.markdown-all-in-one
           mkhl.direnv
@@ -102,7 +101,7 @@
         enable = true;
         enableCompletion = false; # enabled in oh-my-zsh
         autosuggestion.enable = true;
-        initContent = ''
+        initExtra = ''
           test -f ~/.dir_colors && eval $(dircolors ~/.dir_colors)
         '';
         shellAliases = {