diff --git a/flake.lock b/flake.lock index d95a18a..a3c9336 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1754337839, - "narHash": "sha256-fEc2/4YsJwtnLU7HCFMRckb0u9UNnDZmwGhXT5U5NTw=", + "lastModified": 1754433428, + "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=", "owner": "ryantm", "repo": "agenix", - "rev": "856df6f6922845abd4fd958ce21febc07ca2fa45", + "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d", "type": "github" }, "original": { @@ -106,11 +106,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1754091436, - "narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=", + "lastModified": 1754487366, + "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd", + "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", "type": "github" }, "original": { @@ -127,11 +127,11 @@ ] }, "locked": { - "lastModified": 1754091436, - "narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=", + "lastModified": 1754420989, + "narHash": "sha256-3e4wHzNwTMg7GaeLH9A091DMaO9AfFxUjpfqbddCUeo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd", + "rev": "7f38f25a44023a21a504bd3fd9d4f41c4a39f55c", "type": "github" }, "original": { @@ -184,11 +184,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1754365350, - "narHash": "sha256-NLWIkn1qM0wxtZu/2NXRaujWJ4Y1PSZlc7h0y6pOzOQ=", + "lastModified": 1754527677, + "narHash": "sha256-qAzCtmKkMz40xFgP9KN+TCKjVieK4u04EWwl2KvVk0E=", "owner": "nix-community", "repo": "home-manager", - "rev": "c5d7e957397ecb7d48b99c928611c6e780db1b56", + "rev": "475d35797d9537354d825260cf583114537affc2", "type": "github" }, "original": { @@ -197,14 +197,30 @@ "type": "github" } }, + "homebrew-axe": { + "flake": false, + "locked": { + "lastModified": 1748788613, + "narHash": "sha256-rHXT2HX2HByObjdncBMGMM/4ezakO4bQsO+KGxB5Ajk=", + "owner": "cameroncooke", + "repo": "homebrew-axe", + "rev": "bd522a3347cdd2763000bfc697dc7ab42d72df62", + "type": "github" + }, + "original": { + "owner": "cameroncooke", + "repo": "homebrew-axe", + "type": "github" + } + }, "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1754412068, - "narHash": "sha256-oCevHZdlmwe+0j2I3TVrr0ioQFqLMRE+HpB+oFd0MkI=", + "lastModified": 1754568912, + "narHash": "sha256-q6rYblpJiohmQg5sJ2go9H5/Meu5u8JviD76m+1TAwg=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "e52ff1a5283b6f673b7344a74b12880b84151d5d", + "rev": "15c98ca87b47a2eb1720229090c7abd97e342c05", "type": "github" }, "original": { @@ -216,11 +232,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1754411121, - "narHash": "sha256-wVHJH09VJXm/FTJmXNYivpPcT6nt2/+tAL6tp0WPLr4=", + "lastModified": 1754565220, + "narHash": "sha256-xuUDUKwVvdNJUxPEQv+dGosx8lxwNp6L3714v3Ih5vY=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "3d0146a83f0a5f2f46b955794254c580725336bd", + "rev": "5474481a5618a9c363d707765b8e34bb37488eed", "type": "github" }, "original": { @@ -308,11 +324,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1753939845, - "narHash": "sha256-K2ViRJfdVGE8tpJejs8Qpvvejks1+A4GQej/lBk5y7I=", + "lastModified": 1754214453, + "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "94def634a20494ee057c76998843c015909d6311", + "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", "type": "github" }, "original": { @@ -340,11 +356,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1754278406, - "narHash": "sha256-jvIQTMN5EzoOP5RaGztpVese8a3wqy0M/h6tNzycW28=", + "lastModified": 1754340878, + "narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6a489c9482ca676ce23c0bcd7f2e1795383325fa", + "rev": "cab778239e705082fe97bb4990e0d24c50924c04", "type": "github" }, "original": { @@ -362,11 +378,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1754397955, - "narHash": "sha256-4hQT8mDSRNgPKiPdpYwr2QVJdA4FaUhOjT2lKkW8QHQ=", + "lastModified": 1754506651, + "narHash": "sha256-LcpDSjGtTVU0S+aWJPE3/8RONQV0q8dDuanfCj7mAW0=", "owner": "nix-community", "repo": "nixvim", - "rev": "8d47a07563120b36af149edf2273034563339a91", + "rev": "085ef66994f94226dd3d62921e1d48bf731b663a", "type": "github" }, "original": { @@ -405,28 +421,12 @@ "disko": "disko", "flake-parts": "flake-parts", "home-manager": "home-manager_2", + "homebrew-axe": "homebrew-axe", "homebrew-cask": "homebrew-cask", "homebrew-core": "homebrew-core", "nix-homebrew": "nix-homebrew", "nixpkgs": "nixpkgs_3", - "nixvim": "nixvim", - "secrets": "secrets" - } - }, - "secrets": { - "flake": false, - "locked": { - "lastModified": 1754243557, - "narHash": "sha256-IDeXqDg7bkfAktl5NqdthkDp8sEvl8OSv0qsfzyys5Q=", - "ref": "refs/heads/main", - "rev": "c931c4f0fd5436361ac951355624036ceb84ead7", - "revCount": 1, - "type": "git", - "url": "ssh://git@github.com/cschmatzler/nixos-config-secrets.git" - }, - "original": { - "type": "git", - "url": "ssh://git@github.com/cschmatzler/nixos-config-secrets.git" + "nixvim": "nixvim" } }, "systems": { diff --git a/flake.nix b/flake.nix index 3eaf72d..9c51ff9 100644 --- a/flake.nix +++ b/flake.nix @@ -11,20 +11,23 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nix-homebrew.url = "github:zhaofengli-wip/nix-homebrew"; - homebrew-core.url = "github:homebrew/homebrew-core"; + homebrew-core = { + url = "github:homebrew/homebrew-core"; + flake = false; + }; homebrew-cask = { url = "github:homebrew/homebrew-cask"; flake = false; }; + homebrew-axe = { + url = "github:cameroncooke/homebrew-axe"; + flake = false; + }; disko = { url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs"; }; nixvim.url = "github:nix-community/nixvim"; - secrets = { - url = "git+ssh://git@github.com/cschmatzler/nixos-config-secrets.git"; - flake = false; - }; }; outputs = inputs @ {flake-parts, ...}: @@ -59,9 +62,9 @@ taps = { "homebrew/homebrew-core" = inputs.homebrew-core; "homebrew/homebrew-cask" = inputs.homebrew-cask; + "cameroncooke/axe" = inputs.homebrew-axe; }; - mutableTaps = false; - autoMigrate = true; + mutableTaps = true; }; } ./hosts/darwin/${hostname} diff --git a/profiles/base/home-manager/mise.nix b/profiles/base/home-manager/mise.nix index 1176bcb..e33e454 100644 --- a/profiles/base/home-manager/mise.nix +++ b/profiles/base/home-manager/mise.nix @@ -2,5 +2,6 @@ programs.mise = { enable = true; enableFishIntegration = true; + enableZshIntegration = true; }; } diff --git a/profiles/base/packages.nix b/profiles/base/packages.nix index 491b653..690ba02 100644 --- a/profiles/base/packages.nix +++ b/profiles/base/packages.nix @@ -3,19 +3,21 @@ with pkgs; [ age age-plugin-yubikey alejandra + claude-code delta docker docker-compose git gnupg + iosevka jq killall libfido2 - iosevka nodejs_24 nurl opencode openssh + postgresql_17 prettier ripgrep sqlite diff --git a/profiles/darwin/homebrew.nix b/profiles/darwin/homebrew.nix index a249163..c464765 100644 --- a/profiles/darwin/homebrew.nix +++ b/profiles/darwin/homebrew.nix @@ -1,6 +1,9 @@ -{pkgs, ...}: { +{ homebrew = { enable = true; + casks = [ + "orbstack" + ]; masApps = { "wipr2" = 1662217862; };