diff --git a/nix-darwin/flake.lock b/nix-darwin/flake.lock index 8f9d8f97..465a4f09 100644 --- a/nix-darwin/flake.lock +++ b/nix-darwin/flake.lock @@ -8,7 +8,7 @@ "railbird-secrets", "nixpkgs" ], - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1707830867, @@ -27,16 +27,16 @@ "brew-src": { "flake": false, "locked": { - "lastModified": 1718075954, - "narHash": "sha256-4TeUhv5VLEufP+Z/NkKnUk4NUaf59cMsj6NvsVbE+8w=", + "lastModified": 1763638478, + "narHash": "sha256-n/IMowE9S23ovmTkKX7KhxXC2Yq41EAVFR2FBIXPcT8=", "owner": "Homebrew", "repo": "brew", - "rev": "3f08c75e7b950d4340dab462f3e7f77e8093fa2b", + "rev": "fbfdbaba008189499958a7aeb1e2c36ab10c067d", "type": "github" }, "original": { "owner": "Homebrew", - "ref": "4.3.5", + "ref": "5.0.3", "repo": "brew", "type": "github" } @@ -66,25 +66,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1709126324, @@ -107,11 +89,11 @@ ] }, "locked": { - "lastModified": 1723399884, - "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", + "lastModified": 1767930051, + "narHash": "sha256-YXtqo8h5bAbqC64XAPMMsZdYk8XkwkyNj/7XOsIyVf8=", "owner": "nix-community", "repo": "home-manager", - "rev": "086f619dd991a4d355c07837448244029fc2d9ab", + "rev": "297a08510894822ddd93ee2cfc66d6ac65a3cebb", "type": "github" }, "original": { @@ -145,11 +127,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1722820732, - "narHash": "sha256-Y8TBYxYeUVvgYFylqBUtWxFuOZVstXW+yylI2wz2eQ0=", + "lastModified": 1767937441, + "narHash": "sha256-hiGvxqI6npGOAnNwMXkF1628IkyKhhYsAqO5kmSAuqM=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "9e3db5dd3130f9bf388409f39ce1706ca7b59efe", + "rev": "cc94d21fe7abb3cc93db50671bf5048176711be9", "type": "github" }, "original": { @@ -161,11 +143,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1722823168, - "narHash": "sha256-3sKYVUrhuS1fZJkrYAtB+O67dvaKyTvXXI9UqjAgI8A=", + "lastModified": 1767948289, + "narHash": "sha256-a6s+kRHOXRq4QoA4bDLZVKpC1woi6tTRqEt8Vk0ikGo=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "dd20841f7fe7375738708bc2f458152906a71f1d", + "rev": "f268dcd932823c65f8feb2cfc533300ccbcc4541", "type": "github" }, "original": { @@ -181,29 +163,11 @@ ] }, "locked": { - "lastModified": 1722609272, - "narHash": "sha256-Kkb+ULEHVmk07AX+OhwyofFxBDpw+2WvsXguUS2m6e4=", + "lastModified": 1767718503, + "narHash": "sha256-V+VkFs0aSG0ca8p/N3gib7FAf4cq9jyr5Gm+ZBrHQpo=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "f7142b8024d6b70c66fd646e1d099d3aa5bfec49", - "type": "github" - }, - "original": { - "owner": "LnL7", - "repo": "nix-darwin", - "type": "github" - } - }, - "nix-darwin_2": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1716329735, - "narHash": "sha256-ap51w+VqG21vuzyQ04WrhI2YbWHd3UGz0e7dc/QQmoA=", - "owner": "LnL7", - "repo": "nix-darwin", - "rev": "eac4f25028c1975a939c8f8fba95c12f8a25e01c", + "rev": "9f48ffaca1f44b3e590976b4da8666a9e86e6eb1", "type": "github" }, "original": { @@ -214,17 +178,14 @@ }, "nix-homebrew": { "inputs": { - "brew-src": "brew-src", - "flake-utils": "flake-utils", - "nix-darwin": "nix-darwin_2", - "nixpkgs": "nixpkgs_2" + "brew-src": "brew-src" }, "locked": { - "lastModified": 1719720211, - "narHash": "sha256-FNK5ZxmNC+V/wOuioc5HqkUy0ld4eW3NqcsZHLYg9HI=", + "lastModified": 1764473698, + "narHash": "sha256-C91gPgv6udN5WuIZWNehp8qdLqlrzX6iF/YyboOj6XI=", "owner": "zhaofengli-wip", "repo": "nix-homebrew", - "rev": "0afc51fd86693c73e4b60be8ed8c782c4c09b4cc", + "rev": "6a8ab60bfd66154feeaa1021fc3b32684814a62a", "type": "github" }, "original": { @@ -235,40 +196,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1687274257, - "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=", - "path": "/nix/store/22qgs3skscd9bmrxv9xv4q5d4wwm5ppx-source", - "rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1716330097, - "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", + "lastModified": 1767364772, + "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1722640603, - "narHash": "sha256-TcXjLVNd3VeH1qKPH335Tc4RbFDbZQX+d7rqnDUoRaY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "81610abc161d4021b29199aa464d6a1a521e0cc9", + "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", "type": "github" }, "original": { @@ -278,7 +210,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_2": { "locked": { "lastModified": 1709703039, "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", @@ -297,15 +229,15 @@ "railbird-secrets": { "inputs": { "agenix": "agenix", - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_4" + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1722639965, - "narHash": "sha256-ZRe5Z5s/UNaXI2piyncQ3YrFl5q3GryZAfFTyeJ/vhM=", + "lastModified": 1766173571, + "narHash": "sha256-iYU5oTgXkZHqkb03IDPVMHA4Yte4AFhusTem0nf7pcc=", "ref": "refs/heads/master", - "rev": "9a92b83c3ad376620db3556c33e51a4300c5badd", - "revCount": 73, + "rev": "5b42885b7c702fb30b4678e5cb51cc8501fd7830", + "revCount": 139, "type": "git", "url": "ssh://gitea@dev.railbird.ai:1123/railbird/secrets-flake.git" }, @@ -321,7 +253,7 @@ "homebrew-core": "homebrew-core", "nix-darwin": "nix-darwin", "nix-homebrew": "nix-homebrew", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs", "railbird-secrets": "railbird-secrets" } }, @@ -354,21 +286,6 @@ "repo": "default", "type": "github" } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/nix-darwin/flake.nix b/nix-darwin/flake.nix index 8d7ef78b..d470f4d9 100644 --- a/nix-darwin/flake.nix +++ b/nix-darwin/flake.nix @@ -61,7 +61,7 @@ gitFull gnused ncdu - nixFlakes + nixVersions.stable nodejs openssh wget @@ -75,6 +75,8 @@ XDG_RUNTIME_DIR = "/var/lib/gitea-runner/tmp"; }; + system.primaryUser = "kat"; + # launchd.daemons.gitea-runner-restarter = { # serviceConfig = { # ProgramArguments = [ @@ -112,8 +114,8 @@ nixpkgs.overlays = [(import ../nixos/overlay.nix)]; environment.systemPackages = with pkgs; [ - python-with-my-packages - emacs + #python-with-my-packages + emacs alejandra cocoapods gitFull @@ -124,6 +126,7 @@ nodejs ripgrep slack + claude-code typescript vim yarn @@ -133,7 +136,6 @@ # Auto upgrade nix package and the daemon service. - services.nix-daemon.enable = true; launchd.user.envVariables.PATH = config.environment.systemPath; programs.direnv.enable = true; @@ -149,6 +151,7 @@ system.stateVersion = 4; # The platform the configuration will be used on. + nixpkgs.hostPlatform = "aarch64-darwin"; users.users.kat.openssh.authorizedKeys.keys = inputs.railbird-secrets.keys.kanivanKeys; users.users.gitea-runner = { @@ -203,6 +206,6 @@ }; # Expose the package set, including overlays, for convenience. - darwinPackages = self.darwinConfigurations."Kats-Mac-mini".pkgs; + darwinPackages = self.darwinConfigurations."mac-demarco-mini".pkgs; }; }