chore(nix): Upgrade nixpkgs to v25.05

nix/systems/darwin/configuration.nix

@@ -86,8 +86,8 @@ in {
   '';
 
   # Auto upgrade nix package and the daemon service.
-  services.nix-daemon.enable = true;
   nix = {
+    enable = true;
     package = pkgs.nix;
     settings.experimental-features = "nix-command flakes";  # stopping nix from crying about using experimental features flakes and nix-command
     nixPath = [ "nixpkgs=/run/current-system/sw/nixpkgs" ];
@@ -110,6 +110,7 @@ in {
   # Used for backwards compatibility, please read the changelog before changing.
   # $ darwin-rebuild changelog
   system = {
+    primaryUser = "ziro";
     stateVersion = 4;
     # Nix-darwin does not link installed applications to the user environment. This means apps will not show up
     # in spotlight, and when launched through the dock they come with a terminal window. This is a workaround.

nix/systems/darwin/default.nix

@@ -4,10 +4,6 @@ let
   mkCommon = import ../../lib/mkCommon.nix;
   mkSystem = import ../../lib/mkSystem.nix;
   mkBrew = import ../../overlays/darwin/brew.nix;
-
-  kanataModules = [
-    (import ../../modules/darwin/kanata.nix { user = "ziro"; })
-  ];
 in
 {
   # Host list
@@ -30,6 +26,7 @@ in
             (import ../../overlays/darwin/heliport.nix)
             (import ../../overlays/darwin/kanata.nix)
             (import ../../overlays/vesktop.nix)
+            (import ../../overlays/rclone.nix)  # FIXME: Remove later
           ];
           nur = nur;
         }
@@ -43,8 +40,9 @@ in
       modules = [
         inputs.spicetify-nix.nixosModules.default  # Also works on nix-darwin thanks to it being nixosConfiguration replacement for macOS
         ./configuration.nix
+        ../../modules/darwin/kanata.nix
         #../../modules/darwin/dnscrypt.nix
-      ] ++ kanataModules;
+      ];
     };
 
   # Imaginary M1, just for reference
@@ -61,6 +59,7 @@ in
             (mkBrew { inherit system brew-api; nixpkgs = nixpkgs-stable; })
             (import ../../overlays/darwin/kanata.nix)
             (import ../../overlays/vesktop.nix)
+            (import ../../overlays/rclone.nix)  # FIXME: Remove later
           ];
           nur = nur;
         }
@@ -74,7 +73,8 @@ in
       modules = [
         inputs.spicetify-nix.nixosModules.default
         ./configuration.nix
+        ../../modules/darwin/kanata.nix
         #../../modules/darwin/dnscrypt.nix
-      ] ++ kanataModules;
+      ];
     };
 }