Move to 25.05

flake.lock

@@ -5,11 +5,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1745598511,
+        "lastModified": 1748080874,
-        "narHash": "sha256-GWYB7PngGwTJrp7gr0w6E5nnvwiblPvN2kjRCQw3ZEg=",
+        "narHash": "sha256-sUebEzAkrY8Aq5G0GHFyRddmRNGP/a2iTtV7ISNvi/c=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "199cb288a85b15ed203089804c024ae5b3eacd7c",
+        "rev": "0ba11b12be81f0849a89ed17ab635164ea8f0112",
         "type": "github"
       },
       "original": {
@@ -46,16 +46,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1745557122,
+        "lastModified": 1748665073,
-        "narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=",
+        "narHash": "sha256-RMhjnPKWtCoIIHiuR9QKD7xfsKb3agxzMfJY8V9MOew=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1",
+        "rev": "282e1e029cb6ab4811114fc85110613d72771dea",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.11",
+        "ref": "release-25.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -78,11 +78,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1748693115,
+        "lastModified": 1748929857,
-        "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=",
+        "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc",
+        "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4",
         "type": "github"
       },
       "original": {
@@ -94,27 +94,27 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1748810746,
+        "lastModified": 1749086602,
-        "narHash": "sha256-1na8blYvU1F6HLwx/aFjrhUqpqZ0SCsnqqW9n2vXvok=",
+        "narHash": "sha256-DJcgJMekoxVesl9kKjfLPix2Nbr42i7cpEHJiTnBUwU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "78d9f40fd6941a1543ffc3ed358e19c69961d3c1",
+        "rev": "4792576cb003c994bd7cc1edada3129def20b27d",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1745526057,
+        "lastModified": 1748693115,
-        "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=",
+        "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f771eb401a46846c1aebd20552521b233dd7e18b",
+        "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc",
         "type": "github"
       },
       "original": {
@@ -131,11 +131,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1745869500,
+        "lastModified": 1748982388,
-        "narHash": "sha256-F32jQbtWw73KSWaXBktWe9Z7dMWXeBd65j+X+dhjcQM=",
+        "narHash": "sha256-LTeW3PfWqxEFLcqfcG/i+So4IB2HGI8IxZgn/cFamHc=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "11d18746af0de63402502d986bbb0f68a724e9c0",
+        "rev": "1c764f6eebc40f6db3a3b64a5fc5a192fc2a70e2",
         "type": "github"
       },
       "original": {

flake.nix

@@ -2,10 +2,10 @@
   description = "NixOS system flake.";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     home-manager = {
-        url = "github:nix-community/home-manager/release-24.11";
+        url = "github:nix-community/home-manager/release-25.05";
         inputs.nixpkgs.follows = "nixpkgs";
     };
     catppuccin.url = "github:catppuccin/nix";

nate-work/dotfiles/helix/config.toml

@@ -44,12 +44,14 @@ C-n = "select_next_sibling"
 
 # Misc
 "C-/" = "toggle_comments"
+"@" = ":append-output git config get user.email"
 
-[keys.normal."C-space"]
+[keys.normal.space]
-x = ":wbc!"
+x = ":write-buffer-close"
-s = ":w!" # save file
+X = ":write-quit-all"
 o = ":config-open"
-c = ["vsplit", ":open llm-chat.md"]
+h = "hover"
+k = "select_references_to_symbol_under_cursor"
 
 [keys.normal.g]
 "/" = "goto_next_buffer"
@@ -116,33 +118,18 @@ l = "no_op"
 L = "no_op"
 C-l = "no_op"
 
-[keys.normal."space"]
-h = "hover"
-k = "select_references_to_symbol_under_cursor"
-
 [editor]
-bufferline = "always"
-auto-save = true
-line-number = "relative"
-cursorline = true
-cursorcolumn = true
-color-modes = true
-text-width = 120
 auto-format = true
-
+auto-save = true
-[editor.statusline]
+bufferline = "always"
-left = ["mode", "spinner", "version-control"]
+color-modes = true # color each mode differently in statusline
-center = ["file-name"]
+completion-timeout = 5
-mode.normal = "Normal"
+cursorcolumn = true
-mode.insert = "Insert"
+cursorline = true
-mode.select = "Select"
+indent-heuristic = "tree-sitter"
-
+line-number = "relative"
-[editor.indent-guides]
+rulers = [120]
-render = true
+text-width = 120
-
-[editor.lsp]
-display-messages = true
-display-inlay-hints = false
 
 [editor.cursor-shape]
 insert = "bar"
@@ -152,6 +139,32 @@ select = "underline"
 [editor.file-picker]
 hidden = false
 
+[editor.indent-guides]
+render = true
+
+[editor.inline-diagnostics]
+cursor-line = "error"
+other-lines = "error"
+prefix-len = 5
+max-diagnostics = 1
+max-wrap = 30
+
+[editor.lsp]
+display-messages = true
+display-inlay-hints = true
+
+[editor.soft-wrap]
+enable = true
+max-wrap = 30
+
+[editor.statusline]
+left = ["mode", "file-modification-indicator", "spinner", "version-control"]
+center = ["file-name"]
+right = ["diagnostics", "selections", "register", "position", "file-encoding"]
+mode.normal = "Normal"
+mode.insert = "Insert"
+mode.select = "Select"
+
 [editor.whitespace.render]
 space = "all"
 tab = "all"

nate-work/modules/home-manager/home.nix

@@ -44,6 +44,7 @@
     cursors.enable = false;
     kvantum.enable = true;
     zsh-syntax-highlighting.enable = true;
+    mako.enable = false;
   };
 
   
@@ -66,6 +67,7 @@
       # Dev Tools
       #
       helix
+      vscodium-fhs
       unstable.distrobox
       unstable.docker_25
       docker-compose
@@ -136,7 +138,6 @@
       #
       # Photo / Video
       #
-      davinci-resolve-studio
       imv
       mpv
       ffmpeg
@@ -252,7 +253,7 @@
             zstyle :omz:plugins:ssh-agent lazy yes
           '';
       };
-      initExtra = ''
+      initContent = ''
           eval "$(direnv hook zsh)"
           # eval "$(ssh-agent)" >/dev/null
           # export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/ssh-agent

scrappy/modules/apps/firefox/firefox.nix

@@ -20,7 +20,7 @@ in
                     id = 0;
                     name = "default";
                     isDefault = true;
-                    extensions = with pkgs; [
+                    extensions.packages = with pkgs; [
                         nur.repos.rycee.firefox-addons.darkreader
                         nur.repos.rycee.firefox-addons.keepassxc-browser
                         nur.repos.crazazy.firefox-addons.ublock-origin