flake.lock

@@ -2,38 +2,42 @@
   "nodes": {
     "darwin": {
       "inputs": {
-        "nixpkgs": ["nixpkgs"]
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1743127615,
+        "lastModified": 1748044287,
-        "narHash": "sha256-+sMGqywrSr50BGMLMeY789mSrzjkoxZiu61eWjYS/8o=",
+        "narHash": "sha256-9bJzyUX5+HXYmI60WMGYXXDdhGbSh1Le6yBM4og3K7E=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "fc843893cecc1838a59713ee3e50e9e7edc6207c",
+        "rev": "2456ff5c95edfc3b197cb012b947012faed77591",
         "type": "github"
       },
       "original": {
         "owner": "lnl7",
-        "ref": "nix-darwin-24.11",
+        "ref": "nix-darwin-25.05",
         "repo": "nix-darwin",
         "type": "github"
       }
     },
     "home-manager": {
       "inputs": {
-        "nixpkgs": ["nixpkgs"]
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1745557122,
+        "lastModified": 1747556831,
-        "narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=",
+        "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1",
+        "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.11",
+        "ref": "release-25.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -56,16 +60,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1745487689,
+        "lastModified": 1747953325,
-        "narHash": "sha256-FQoi3R0NjQeBAsEOo49b5tbDPcJSMWc3QhhaIi9eddw=",
+        "narHash": "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5630cf13cceac06cefe9fc607e8dfa8fb342dde3",
+        "rev": "55d1f923c480dadce40f5231feb472e81b0bab48",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -1,14 +1,14 @@
 {
   description = "Wyatt's nix configuration suite";
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
     nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1";
     home-manager = {
-      url = "github:nix-community/home-manager/release-24.11";
+      url = "github:nix-community/home-manager/release-25.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     darwin = {
-      url = "github:lnl7/nix-darwin/nix-darwin-24.11";
+      url = "github:lnl7/nix-darwin/nix-darwin-25.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };

home/packages/common.nix

@@ -37,7 +37,6 @@
     tree
     gnutar
     gnupg
-    nerdfonts
     zoxide
     babelfish
 
@@ -45,8 +44,6 @@
     nodejs
     cargo
     python3
-    jetbrains.rust-rover
-    jetbrains.rider
 
     # nix specific stuff
     nixd

home/shell.nix

@@ -57,7 +57,7 @@
 
   programs.zsh = {
     enable = true;
-    initExtra = ''
+    initContent = ''
       if [[ -z "$BASH_EXECUTION_STRING" ]]; then
         if [[ -n "$ZSH_VERSION" ]]; then
           LOGIN_OPTION="--login"

modules/common/fonts.nix

@@ -3,12 +3,13 @@
   lib,
   ...
 }: {
-  fonts.packages = with pkgs; [
+  fonts.packages = with pkgs;
-    nerdfonts
+    [
-    noto-fonts
+      noto-fonts
-    noto-fonts-emoji
+      noto-fonts-emoji
-    liberation_ttf
+      liberation_ttf
-    noto-fonts-cjk-sans
+      noto-fonts-cjk-sans
-    monaspace
+      monaspace
-  ];
+    ]
+    ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
 }

modules/graphics/default.nix

@@ -62,7 +62,7 @@ in {
 
     (mkIf (cfg.gpuVendor == "amd") {
       services.xserver.videoDrivers = ["amdgpu"];
-      hardware.opengl.extraPackages = with pkgs; [
+      hardware.graphics.extraPackages = with pkgs; [
         amdvlk
       ];
       environment.systemPackages = with pkgs; [
@@ -72,7 +72,7 @@ in {
 
     (mkIf (cfg.gpuVendor == "intel") {
       services.xserver.videoDrivers = ["modesetting"];
-      hardware.opengl.extraPackages = with pkgs; [
+      hardware.graphics.extraPackages = with pkgs; [
         intel-media-driver
         intel-compute-runtime
       ];

modules/machine/sephiroth/configuration.nix

@@ -8,9 +8,10 @@
   ];
 
   system = {
-    activationScripts.postUserActivation.text = ''
+    # activationScripts.postUserActivation.text = ''
-      /System/Library/PrivateFrameworks/SystemAdministration.framework/Resources/activateSettings -u
+    #   /System/Library/PrivateFrameworks/SystemAdministration.framework/Resources/activateSettings -u
-    '';
+    # '';
+    primaryUser = "wyatt";
 
     defaults = {
       menuExtraClock.Show24Hour = true;
@@ -148,7 +149,8 @@
   system.defaults.smb.NetBIOSName = hostname;
 
   # Add ability to used TouchID for sudo authentication
-  security.pam.enableSudoTouchIdAuth = true;
+  security.pam.services.sudo_local.touchIdAuth = true;
+  # security.pam.enableSudoTouchIdAuth = true;
 
   # Create /etc/zshrc that loads the nix-darwin environment.
   # this is required if you want to use darwin's default shell - zsh
@@ -159,12 +161,6 @@
     pkgs.bash
   ];
 
-  # Auto upgrade nix package and the daemon service.
-  # services.nix-daemon.enable = true;
-  # Use this instead of services.nix-daemon.enable if you
-  # don't wan't the daemon service to be managed for you.
-  services.nix-daemon.enable = true;
-
   system.stateVersion = 5;
 
   podman = {

modules/networking/core.nix

@@ -62,7 +62,7 @@ in {
     };
     networking.networkmanager = {
       enable = lib.mkForce cfg.networkManager.enable;
-      packages = cfg.networkManager.extraPlugins;
+      plugins = cfg.networkManager.extraPlugins;
     };
   };
 }