remove angrr flake input - nixos has its own module; use that there - darwin doesn't. I can run it manually for now
7 files changed, 56 insertions(+), 187 deletions(-)
M flake.lock → flake.lock
@@ -28,28 +28,6 @@ "repo": "agenix", "type": "github" } }, - "angrr": { - "inputs": { - "flake-compat": "flake-compat", - "flake-parts": "flake-parts", - "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1776495037, - "narHash": "sha256-IsbdabvkJ4lK38LiGzQ8B287q8fE3H7fMPMY95aTkXc=", - "owner": "linyinfeng", - "repo": "angrr", - "rev": "27dd77b8dbbf8b58e4795947d39b8c88ec8e43ad", - "type": "github" - }, - "original": { - "owner": "linyinfeng", - "repo": "angrr", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [@@ -75,7 +53,7 @@ "elgit": { "inputs": { "flake-utils": "flake-utils", "gomod2nix": "gomod2nix", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1775392535,@@ -96,22 +74,6 @@ }, "flake-compat": { "flake": false, "locked": { - "lastModified": 1767039857, - "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { - "flake": false, - "locked": { "lastModified": 1747046372, "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra",@@ -141,27 +103,6 @@ "type": "github" } }, "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "angrr", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1775087534, - "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "nixvim",@@ -414,7 +355,7 @@ }, "impermanence": { "inputs": { "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1769548169,@@ -449,7 +390,7 @@ }, "mycal": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "pyproject-build-systems": "pyproject-build-systems", "pyproject-nix": "pyproject-nix", "uv2nix": "uv2nix"@@ -491,27 +432,6 @@ "repo": "nixos-nanopi", "type": "github" } }, - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "angrr", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1775037210, - "narHash": "sha256-KM2WYj6EA7M/FVZVCl3rqWY+TFV5QzSyyGE2gQxeODU=", - "owner": "nix-darwin", - "repo": "nix-darwin", - "rev": "06648f4902343228ce2de79f291dd5a58ee12146", - "type": "github" - }, - "original": { - "owner": "nix-darwin", - "repo": "nix-darwin", - "type": "github" - } - }, "nixos-hardware": { "locked": { "lastModified": 1775490113,@@ -529,16 +449,16 @@ } }, "nixpkgs": { "locked": { - "lastModified": 1776169885, - "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", - "owner": "nixos", + "lastModified": 1762943920, + "narHash": "sha256-ITeH8GBpQTw9457ICZBddQEBjlXMmilML067q0e6vqY=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", + "rev": "91c9a64ce2a84e648d0cf9671274bb9c2fb9ba60", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" }@@ -561,22 +481,6 @@ } }, "nixpkgs_2": { "locked": { - "lastModified": 1762943920, - "narHash": "sha256-ITeH8GBpQTw9457ICZBddQEBjlXMmilML067q0e6vqY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "91c9a64ce2a84e648d0cf9671274bb9c2fb9ba60", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { "lastModified": 1759036355, "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", "owner": "NixOS",@@ -591,7 +495,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1762361079, "narHash": "sha256-lz718rr1BDpZBYk7+G8cE6wee3PiBUpn8aomG/vLLiY=",@@ -607,7 +511,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1776268487, "narHash": "sha256-oGUKCRR4qQGTgicxkiAHDd7w2YWCLtG9n8IWtNZPxo4=",@@ -623,7 +527,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1770562336, "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=",@@ -639,7 +543,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1768564909, "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",@@ -655,7 +559,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1776434932, "narHash": "sha256-gyqXNMgk3sh+ogY5svd2eNLJ6oEwzbAeaoBrrxD0lKk=",@@ -673,7 +577,7 @@ } }, "nixvim": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts", "nixpkgs": [ "nixpkgs" ],@@ -695,7 +599,7 @@ } }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "gitignore": "gitignore", "nixpkgs": [ "searchix",@@ -769,7 +673,6 @@ }, "root": { "inputs": { "agenix": "agenix", - "angrr": "angrr", "darwin": "darwin", "elgit": "elgit", "flake-compatish": "flake-compatish",@@ -837,10 +740,10 @@ "searchix": { "inputs": { "flake-utils": "flake-utils_4", "gomod2nix": "gomod2nix_2", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "pre-commit-hooks": "pre-commit-hooks", "simple-css": "simple-css", - "treefmt-nix": "treefmt-nix_2" + "treefmt-nix": "treefmt-nix" }, "locked": { "lastModified": 1776191206,@@ -876,7 +779,7 @@ } }, "srvos": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1776306894,@@ -1001,7 +904,7 @@ "tg-auth": { "inputs": { "flake-utils": "flake-utils_5", "gomod2nix": "gomod2nix_3", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1773585135,@@ -1018,27 +921,6 @@ }, "treefmt-nix": { "inputs": { "nixpkgs": [ - "angrr", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1775636079, - "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_2": { - "inputs": { - "nixpkgs": [ "searchix", "nixpkgs" ]@@ -1085,7 +967,7 @@ }, "vpsadminos": { "inputs": { "impermanence": "impermanence", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "nixpkgsUnstable": "nixpkgsUnstable" }, "locked": {
M flake.nix → flake.nix
@@ -27,7 +27,6 @@ url = "github:cpick/nix-rosetta-builder"; inputs.nixpkgs.follows = "nixpkgs"; }; - angrr.url = "github:linyinfeng/angrr"; elgit.url = "git+https://git.alin.ovh/elgit?shallow=0"; mycal.url = "git+https://git.alin.ovh/mycal?shallow=0"; searchix.url = "git+https://git.alin.ovh/searchix?shallow=0";@@ -150,14 +149,8 @@ }; darwinConfigurations.marvin = darwin.lib.darwinSystem { system = "aarch64-darwin"; modules = [ - { - nixpkgs.overlays = [ - angrr.overlays.default - ]; - } rosetta-builder.darwinModules.default srvos.darwinModules.desktop - angrr.darwinModules.angrr ./system/hosts/marvin.nix ./packages/modules/darwin/caddy ];
M system/settings/configuration/nix-linux.nix → system/settings/configuration/nix-linux.nix
@@ -14,5 +14,38 @@ }; nixpkgs.config.allowUnfree = true; - services.angrr.enableNixGcIntegration = true; + services.angrr = { + enable = true; + settings = { + temporary-root-policies = { + direnv = { + path-regex = "/\\.direnv/"; + period = "14d"; + }; + result = { + path-regex = "/result[^/]*$"; + period = "3d"; + }; + }; + profile-policies = { + system = { + profile-paths = [ "/nix/var/nix/profiles/system" ]; + keep-since = "30d"; + keep-latest-n = 5; + keep-booted-system = true; + keep-current-system = true; + }; + user = { + enable = true; + profile-paths = [ + # `~` at the beginning will be expanded to the home directory of each discovered user + "~/.local/state/nix/profiles/profile" + "/nix/var/nix/profiles/per-user/root/profile" + ]; + keep-since = "3d"; + keep-latest-n = 1; + }; + }; + }; + }; }
M system/settings/configuration/nix.nix → system/settings/configuration/nix.nix
@@ -53,39 +53,4 @@ environment.systemPackages = with pkgs; [ nix-output-monitor ]; - - services.angrr = { - enable = true; - settings = { - temporary-root-policies = { - direnv = { - path-regex = "/\\.direnv/"; - period = "14d"; - }; - result = { - path-regex = "/result[^/]*$"; - period = "3d"; - }; - }; - profile-policies = { - system = { - profile-paths = [ "/nix/var/nix/profiles/system" ]; - keep-since = "30d"; - keep-latest-n = 5; - keep-booted-system = true; - keep-current-system = true; - }; - user = { - enable = true; - profile-paths = [ - # `~` at the beginning will be expanded to the home directory of each discovered user - "~/.local/state/nix/profiles/profile" - "/nix/var/nix/profiles/per-user/root/profile" - ]; - keep-since = "3d"; - keep-latest-n = 1; - }; - }; - }; - }; }
M system/settings/darwin.nix → system/settings/darwin.nix
@@ -32,10 +32,6 @@ settings.extra-platforms = "aarch64-darwin x86_64-darwin"; settings.trusted-users = [ "@admin" ]; }; - services.angrr = { - enable = true; - timer.enable = true; - }; nixpkgs.config = { allowUnfree = true;
M user/settings/darwin.nix → user/settings/darwin.nix
@@ -6,6 +6,7 @@ ... }: { home.packages = with pkgs; [ + angrr darwin.trash personal.lunchy-go coreutils-prefixed
M user/settings/nix.nix → user/settings/nix.nix
@@ -23,7 +23,6 @@ }; }; home.packages = with pkgs; [ - angrr nix-tree ]; programs.nixvim.plugins = {