update to 25.05

10 files changed, 87 insertions, 113 deletions

diff --git a/flake.lock b/flake.lock
index 9080c2b..54fa1b1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -21,11 +21,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1746849806,
-        "narHash": "sha256-6vJX4DnhDlWNtOOh3v08YqPgjJblfgHnV9562nPHNEo=",
+        "lastModified": 1747800214,
+        "narHash": "sha256-4zStSk4O6GT0kZhN/zERhMHbcJnwFtYt3rM01t6gNhA=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "e2408d3f94a6b658e12f135501aa7fd38efabc72",
+        "rev": "54be6f6687f510002f7a1e6c3583278d989f3833",
         "type": "gitlab"
       },
       "original": {
@@ -150,16 +150,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1746171682,
-        "narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=",
+        "lastModified": 1747556831,
+        "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "50eee705bbdbac942074a8c120e8194185633675",
+        "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.11",
+        "ref": "release-25.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -188,11 +188,11 @@
     },
     "mnw": {
       "locked": {
-        "lastModified": 1746338991,
-        "narHash": "sha256-GbyoHjf14LOxZQc+0NFblI4xf/uwGrYo3W8lwE4HcwI=",
+        "lastModified": 1747499976,
+        "narHash": "sha256-YTiSI4WLbk0CleXeBheYmKZV6iqKyBpyoh1e+vcQzu4=",
         "owner": "Gerg-L",
         "repo": "mnw",
-        "rev": "c65407ee9387ef75985dad3e30f58c822c766ec1",
+        "rev": "72433a144c4ac16931e9148f78db4a0e4c147441",
         "type": "github"
       },
       "original": {
@@ -234,16 +234,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1743127615,
-        "narHash": "sha256-+sMGqywrSr50BGMLMeY789mSrzjkoxZiu61eWjYS/8o=",
+        "lastModified": 1747752302,
+        "narHash": "sha256-XqNAcEFfe5tJZGlx+Su0G67ZwRwZmHNWwiMK0fji0Hw=",
         "owner": "nix-darwin",
         "repo": "nix-darwin",
-        "rev": "fc843893cecc1838a59713ee3e50e9e7edc6207c",
+        "rev": "74ecd01d2c122f8a4a48066ab1d48f3e01671671",
         "type": "github"
       },
       "original": {
         "owner": "nix-darwin",
-        "ref": "nix-darwin-24.11",
+        "ref": "nix-darwin-25.05",
         "repo": "nix-darwin",
         "type": "github"
       }
@@ -256,11 +256,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1746815338,
-        "narHash": "sha256-2M1JzogleVnHmt1RtNGwBRg6y6lLloVdNSu6v7qyrIw=",
+        "lastModified": 1747791777,
+        "narHash": "sha256-+NrNiWyYxntPi+p95CNz50W4EqoaNbPuAOWsR0GO4p8=",
         "owner": "kaylorben",
         "repo": "nixcord",
-        "rev": "471817830e794440f725d4ed698a5442e75b55ad",
+        "rev": "6711002beed553a4bbcd6b38bf5327df0bf9ee1a",
         "type": "github"
       },
       "original": {
@@ -285,22 +285,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-darwin": {
-      "locked": {
-        "lastModified": 1746566971,
-        "narHash": "sha256-I40weT0FZWth1IEjgR5a0zC9LLyrPwTC0DAQcejtTJE=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "209c5b3b0f5cf5b5a7e12ddea59bf19699f97e75",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-24.11-darwin",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-lib": {
       "locked": {
         "lastModified": 1743296961,
@@ -350,27 +334,27 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1746557022,
-        "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=",
+        "lastModified": 1747610100,
+        "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860",
+        "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1746663147,
-        "narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=",
+        "lastModified": 1747744144,
+        "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54",
+        "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f",
         "type": "github"
       },
       "original": {
@@ -403,11 +387,11 @@
         "treefmt-nix": "treefmt-nix_2"
       },
       "locked": {
-        "lastModified": 1746899128,
-        "narHash": "sha256-Ptr+eEo1/TLYspc+AlZlcXeGj/MSnhFrAopFvRum1z8=",
+        "lastModified": 1747824892,
+        "narHash": "sha256-5lYnHfkCsdt75BS2qYNLlDrF5vM6eTTNveqMq564mwU=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "04dc40b66404c504869a568150779a2f54d46b73",
+        "rev": "2a41603d663c0065eddaf1dde1e405b31e3c7f8b",
         "type": "github"
       },
       "original": {
@@ -425,11 +409,11 @@
         "systems": "systems_4"
       },
       "locked": {
-        "lastModified": 1746852864,
-        "narHash": "sha256-4pE761eSft4GUboGMdseBC7WvfY81CMHuCuxnVy9PwI=",
+        "lastModified": 1747525582,
+        "narHash": "sha256-oEZ6DV4bPcNZIuwW5Kcd+/zT3PMkXse2kX/3jHoomGk=",
         "owner": "notashelf",
         "repo": "nvf",
-        "rev": "fee3bbe536b5bf484aedebafa5130b485068b64f",
+        "rev": "d3a0e7029ac57eef1120225973247851c5b967b5",
         "type": "github"
       },
       "original": {
@@ -446,7 +430,6 @@
         "nix-darwin": "nix-darwin",
         "nixcord": "nixcord",
         "nixpkgs": "nixpkgs_4",
-        "nixpkgs-darwin": "nixpkgs-darwin",
         "nur": "nur",
         "nvf": "nvf",
         "spicetify-nix": "spicetify-nix"
@@ -482,11 +465,11 @@
         "systems": "systems_5"
       },
       "locked": {
-        "lastModified": 1746738008,
-        "narHash": "sha256-bIMysaVhNyjuFgt8QpnGZv0T4YMao26Vz5R/xfYAJO0=",
+        "lastModified": 1747607404,
+        "narHash": "sha256-xj2Ji+rE+oYjf0BsTDT7K/StnYuZQK9MTbX8U1DUcC0=",
         "owner": "Gerg-L",
         "repo": "spicetify-nix",
-        "rev": "a43fae27f33f8d3e793a6ca2946190cb24a00b03",
+        "rev": "8c1be0e5e9a7f35ccd6f7b10bcfa08f2734dad91",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index b9224ac..58b9b75 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,23 +1,13 @@
 {
   description = "Nix configuration";
   
-  nixConfig = {
-    extra-substituters = [
-      "https://nix-community.cachix.org"
-    ];
-    extra-trusted-public-keys = [
-      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-    ];
-  };
-
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
-    nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-24.11-darwin";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
 
-    nix-darwin.url = "github:nix-darwin/nix-darwin/nix-darwin-24.11";
+    nix-darwin.url = "github:nix-darwin/nix-darwin/nix-darwin-25.05";
     nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
 
-    home-manager.url = "github:nix-community/home-manager/release-24.11";
+    home-manager.url = "github:nix-community/home-manager/release-25.05";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     firefox-addons.url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
diff --git a/hosts/darwin/configuration.nix b/hosts/darwin/configuration.nix
index 9e6a4f3..b25fb18 100644
--- a/hosts/darwin/configuration.nix
+++ b/hosts/darwin/configuration.nix
@@ -1,7 +1,6 @@
 { config, pkgs, lib, ...}:
 
 {
-  services.nix-daemon.enable = true;
   nix.settings.experimental-features = "nix-command flakes";
   nixpkgs.hostPlatform = "aarch64-darwin";
   nixpkgs.config.allowUnfree = true;
@@ -10,7 +9,8 @@
     home = "/Users/schererleander";
     shell = pkgs.zsh;
   };
-
+  
+  system.primaryUser = "schererleander";
   system.defaults = {
     dock.autohide = true;
   };
diff --git a/hosts/darwin/home.nix b/hosts/darwin/home.nix
index 69f5445..984c39b 100644
--- a/hosts/darwin/home.nix
+++ b/hosts/darwin/home.nix
@@ -31,7 +31,9 @@
     appcleaner
     rectangle
     jetbrains.idea-community-bin
-    (nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" "SpaceMono" "IBMPlexMono" ]; })
+
+    nerd-fonts.symbols-only
+    nerd-fonts.space-mono
   ];
 
   zsh.enable = true;
@@ -44,6 +46,7 @@
   spicetify.enable = true;
   zathura.enable = true;
   vscode.enable = true;
+  aerospace.enable = true;
 
   home.stateVersion = "24.11";
 }
diff --git a/hosts/nixos/home.nix b/hosts/nixos/home.nix
index 7b92cda..518f0d1 100644
--- a/hosts/nixos/home.nix
+++ b/hosts/nixos/home.nix
@@ -39,8 +39,7 @@
     noto-fonts
     noto-fonts-cjk-sans
     noto-fonts-emoji
-    (nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; })
-
+    nerd-fonts.symbols-only
   ];
 
   gtk = {
diff --git a/modules/aerospace.nix b/modules/aerospace.nix
index 34e7bf4..6c1164e 100644
--- a/modules/aerospace.nix
+++ b/modules/aerospace.nix
@@ -1,8 +1,8 @@
 { config, pkgs, lib, ...}:
 
 {
-  config.aerospace.enable = lib.mkEnableOption "Enalbe aerospace and setup";
-  config.enable = lib.mkIf config.aerospace.enable {
+  options.aerospace.enable = lib.mkEnableOption "Enalbe aerospace and setup";
+  config = lib.mkIf config.aerospace.enable {
     programs.aerospace = {
       enable = true;
       userSettings = {
diff --git a/modules/default.nix b/modules/default.nix
index 911b8b1..ccd3b8f 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -16,5 +16,6 @@
     ./wezterm.nix
     ./firefox.nix
     ./nvf.nix
+    ./aerospace.nix
   ];
 }
diff --git a/modules/foot.nix b/modules/foot.nix
index 880342f..69f6bf2 100644
--- a/modules/foot.nix
+++ b/modules/foot.nix
@@ -4,7 +4,7 @@
   options.foot.enable = lib.mkEnableOption "Enable and configure the Foot terminal emulator";
   config = lib.mkIf config.foot.enable {
     home.packages = with pkgs; [
-      (nerdfonts.override { fonts = [ "SpaceMono" "IBMPlexMono" "Terminus" ]; })
+      nerd-fonts.space-mono
     ];
 
     programs.foot = {
diff --git a/modules/vscode.nix b/modules/vscode.nix
index ee46ca5..3dd2541 100644
--- a/modules/vscode.nix
+++ b/modules/vscode.nix
@@ -5,45 +5,47 @@
   config = lib.mkIf config.vscode.enable {
     programs.vscode = {
       enable = true;
-      enableUpdateCheck = true;
-      enableExtensionUpdateCheck = true;
       mutableExtensionsDir = false;
-      
-      userSettings = {
-        "extensions.autoCheckUpdates" = false;
-        "workbench.colorTheme" = "Minimal";
-        "editor.fontFamily" = "'SpaceMono Nerd Font Mono', monospace";
-        "editor.tabSize" = 2;
-        "editor.minimap.enabled" = false;
-        "terminal.integrated.cursorStyle" = "underline";
-        "terminal.integrated.cursorStyleInactive" = "underline";
-        "terminal.integrated.fontFamily" = "'BlexMono Nerd Font Mono', monospace";
-        "terminal.integrated.fontSize" = 13;
-        "git.autofetch" = true;
-        "window.controlsStyle" = "custom";
-      };
+      profiles.default = {
+        enableUpdateCheck = true;
+        enableExtensionUpdateCheck = true;
+        
+        userSettings = {
+          "update.mode" = "none";
+          "workbench.colorTheme" = "Minimal";
+          "editor.fontFamily" = "'SpaceMono Nerd Font Mono', monospace";
+          "editor.tabSize" = 2;
+          "editor.minimap.enabled" = false;
+          "terminal.integrated.cursorStyle" = "underline";
+          "terminal.integrated.cursorStyleInactive" = "underline";
+          "terminal.integrated.fontFamily" = "'BlexMono Nerd Font Mono', monospace";
+          "terminal.integrated.fontSize" = 13;
+          "git.autofetch" = true;
+          "window.controlsStyle" = "custom";
+        };
 
-      extensions = (with pkgs.vscode-extensions; [
-        ms-vscode.cmake-tools
-        ms-azuretools.vscode-docker
-        eamodio.gitlens
-        ms-python.python
-        golang.go
-        rust-lang.rust-analyzer
-        vscjava.vscode-maven
-        sumneko.lua
-        #fwcd.kotlin
-        bradlc.vscode-tailwindcss
-        adpyke.codesnap
-        esbenp.prettier-vscode
-      ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
-        {
-          name = "minimalist-dark";
-          publisher = "nichabosh";
-          version = "1.0.0";
-          sha256 = "sha256-lw+Scfada6DycLdRT2Cz+Fd12JucglIrw3uRd2ZhabQ=";
-        }
-      ]);
+        extensions = (with pkgs.vscode-extensions; [
+          ms-vscode.cmake-tools
+          ms-azuretools.vscode-docker
+          eamodio.gitlens
+          ms-python.python
+          golang.go
+          rust-lang.rust-analyzer
+          vscjava.vscode-maven
+          sumneko.lua
+          #fwcd.kotlin
+          bradlc.vscode-tailwindcss
+          adpyke.codesnap
+          esbenp.prettier-vscode
+        ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
+          {
+            name = "minimalist-dark";
+            publisher = "nichabosh";
+            version = "1.0.0";
+            sha256 = "sha256-lw+Scfada6DycLdRT2Cz+Fd12JucglIrw3uRd2ZhabQ=";
+          }
+        ]);
+      };
     };
   };
 }
diff --git a/modules/wezterm.nix b/modules/wezterm.nix
index ca19e1a..b0fca5a 100644
--- a/modules/wezterm.nix
+++ b/modules/wezterm.nix
@@ -3,10 +3,6 @@
 {
   options.wezterm.enable = lib.mkEnableOption "Enable wezterm and setup";
   config = lib.mkIf config.wezterm.enable {
-    home.packages = with pkgs; [
-      (nerdfonts.override { fonts = [ "SpaceMono" "IBMPlexMono" "Terminus" ]; })
-    ];
-
     programs.wezterm = {
       enable = true;
       enableZshIntegration = true;
@@ -27,4 +23,4 @@
       '';
     };
   };
-}
\ No newline at end of file
+}