erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

nix-cache: attic module is now in nixpkgs

Browse source
This commit is contained in:
Erwin Boskma 2024-10-24 13:51:45 +02:00
parent de70c8c165
commit 26b7c5f336
Signed by: erwin
SSH key fingerprint: SHA256:/Wk1WZdLg+vQHs3in9qq7PsIp8SMzwGSk/RLZ5zPuZk
5 changed files with 27 additions and 149 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

163
flake.lock
View file

@ -22,28 +22,6 @@
"type": "github" "type": "github"
} }
}, },
"attic": {
"inputs": {
"crane": "crane",
"flake-compat": "flake-compat",
"flake-parts": "flake-parts_2",
"nixpkgs": "nixpkgs",
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1729116596,
"narHash": "sha256-NnLMLIXGZtAscUF4dCShksuQ1nOGF6Y2dEeyj0rBbUg=",
"owner": "zhaofengli",
"repo": "attic",
"rev": "2b05b7d986cf6009b1c1ef7daa4961cd1a658782",
"type": "github"
},
"original": {
"owner": "zhaofengli",
"repo": "attic",
"type": "github"
}
},
"caddy-with-plugins": { "caddy-with-plugins": {
"inputs": { "inputs": {
"flake-parts": [ "flake-parts": [
@ -72,7 +50,7 @@
}, },
"colmena": { "colmena": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
@ -94,27 +72,6 @@
} }
}, },
"crane": { "crane": {
"inputs": {
"nixpkgs": [
"attic",
"nixpkgs"
]
},
"locked": {
"lastModified": 1722960479,
"narHash": "sha256-NhCkJJQhD5GUib8zN9JrmYGMwt4lCRp6ZVNzIiYCl0Y=",
"owner": "ipetkov",
"repo": "crane",
"rev": "4c6c77920b8d44cd6660c1621dea6b3fc4b4c4f4",
"type": "github"
},
"original": {
"owner": "ipetkov",
"repo": "crane",
"type": "github"
}
},
"crane_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"git-fs-monitor", "git-fs-monitor",
@ -135,9 +92,9 @@
"type": "github" "type": "github"
} }
}, },
"crane_3": { "crane_2": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_3",
"flake-utils": [ "flake-utils": [
"ha-now-playing", "ha-now-playing",
"flake-utils" "flake-utils"
@ -165,7 +122,7 @@
"type": "github" "type": "github"
} }
}, },
"crane_4": { "crane_3": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"pamedia", "pamedia",
@ -214,7 +171,7 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1729735549, "lastModified": 1729735549,
@ -232,7 +189,7 @@
}, },
"eww": { "eww": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
@ -255,22 +212,6 @@
} }
}, },
"flake-compat": { "flake-compat": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1650374568, "lastModified": 1650374568,
@ -286,7 +227,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_3": { "flake-compat_2": {
"locked": { "locked": {
"lastModified": 1709944340, "lastModified": 1709944340,
"narHash": "sha256-xr54XK0SjczlUxRo5YwodibUSlpivS9bqHt8BNyWVQA=", "narHash": "sha256-xr54XK0SjczlUxRo5YwodibUSlpivS9bqHt8BNyWVQA=",
@ -302,7 +243,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_4": { "flake-compat_3": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696267196, "lastModified": 1696267196,
@ -318,7 +259,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_5": { "flake-compat_4": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
@ -356,27 +297,6 @@
} }
}, },
"flake-parts_2": { "flake-parts_2": {
"inputs": {
"nixpkgs-lib": [
"attic",
"nixpkgs"
]
},
"locked": {
"lastModified": 1722555600,
"narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_3": {
"inputs": { "inputs": {
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
@ -429,7 +349,7 @@
}, },
"git-fs-monitor": { "git-fs-monitor": {
"inputs": { "inputs": {
"crane": "crane_2", "crane": "crane",
"flake-parts": [ "flake-parts": [
"flake-parts" "flake-parts"
], ],
@ -481,7 +401,7 @@
}, },
"ha-now-playing": { "ha-now-playing": {
"inputs": { "inputs": {
"crane": "crane_3", "crane": "crane_2",
"flake-utils": [ "flake-utils": [
"flake-utils" "flake-utils"
], ],
@ -632,16 +552,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1726042813, "lastModified": 1729665710,
"narHash": "sha256-LnNKCCxnwgF+575y0pxUdlGZBO/ru1CtGHIqQVfvjlA=", "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=",
"owner": "NixOS", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "159be5db480d1df880a0135ca0bfed84c2f88353", "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "nixos",
"ref": "nixpkgs-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -659,22 +579,6 @@
} }
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": {
"lastModified": 1724316499,
"narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1729449015, "lastModified": 1729449015,
"narHash": "sha256-Gf04dXB0n4q0A9G5nTGH3zuMGr6jtJppqdeljxua1fo=", "narHash": "sha256-Gf04dXB0n4q0A9G5nTGH3zuMGr6jtJppqdeljxua1fo=",
@ -690,7 +594,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable_3": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1720386169, "lastModified": 1720386169,
"narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=",
@ -706,7 +610,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable_4": { "nixpkgs-stable_3": {
"locked": { "locked": {
"lastModified": 1729357638, "lastModified": 1729357638,
"narHash": "sha256-66RHecx+zohbZwJVEPF7uuwHeqf8rykZTMCTqIrOew4=", "narHash": "sha256-66RHecx+zohbZwJVEPF7uuwHeqf8rykZTMCTqIrOew4=",
@ -722,25 +626,9 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1729665710,
"narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"pamedia": { "pamedia": {
"inputs": { "inputs": {
"crane": "crane_4", "crane": "crane_3",
"flake-parts": [ "flake-parts": [
"flake-parts" "flake-parts"
], ],
@ -768,12 +656,12 @@
}, },
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_5", "flake-compat": "flake-compat_4",
"gitignore": "gitignore", "gitignore": "gitignore",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-stable": "nixpkgs-stable_3" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1729104314, "lastModified": 1729104314,
@ -792,13 +680,12 @@
"root": { "root": {
"inputs": { "inputs": {
"anyrun": "anyrun", "anyrun": "anyrun",
"attic": "attic",
"caddy-with-plugins": "caddy-with-plugins", "caddy-with-plugins": "caddy-with-plugins",
"colmena": "colmena", "colmena": "colmena",
"disko": "disko", "disko": "disko",
"emacs-overlay": "emacs-overlay", "emacs-overlay": "emacs-overlay",
"eww": "eww", "eww": "eww",
"flake-parts": "flake-parts_3", "flake-parts": "flake-parts_2",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"git-fs-monitor": "git-fs-monitor", "git-fs-monitor": "git-fs-monitor",
"ha-now-playing": "ha-now-playing", "ha-now-playing": "ha-now-playing",
@ -808,7 +695,7 @@
"nil": "nil", "nil": "nil",
"nixos-facter-modules": "nixos-facter-modules", "nixos-facter-modules": "nixos-facter-modules",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs",
"pamedia": "pamedia", "pamedia": "pamedia",
"pre-commit-hooks": "pre-commit-hooks", "pre-commit-hooks": "pre-commit-hooks",
"rust-overlay": "rust-overlay", "rust-overlay": "rust-overlay",
@ -841,7 +728,7 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-stable": "nixpkgs-stable_4" "nixpkgs-stable": "nixpkgs-stable_3"
}, },
"locked": { "locked": {
"lastModified": 1729695320, "lastModified": 1729695320,

5
flake.nix
View file

@ -87,11 +87,6 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
attic = {
url = "github:zhaofengli/attic";
# inputs.nixpkgs.follows = "nixpkgs";
};
colmena = { colmena = {
url = "github:zhaofengli/colmena"; url = "github:zhaofengli/colmena";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

2
lib/default.nix
View file

@ -23,13 +23,11 @@ rec {
[ [
self.overlays.default self.overlays.default
inputs.rust-overlay.overlays.default inputs.rust-overlay.overlays.default
inputs.attic.overlays.default
inputs.emacs-overlay.overlay inputs.emacs-overlay.overlay
inputs.eww.overlays.default inputs.eww.overlays.default
inputs.nil.overlays.default inputs.nil.overlays.default
inputs.ha-now-playing.overlays.${system} inputs.ha-now-playing.overlays.${system}
inputs.pamedia.overlays.default inputs.pamedia.overlays.default
# inputs.atuin.overlays.default
] ]
++ nixpkgs.lib.optional (system == "aarch64-linux") ( ++ nixpkgs.lib.optional (system == "aarch64-linux") (
_final: super: { makeModulesClosure = x: super.makeModulesClosure (x // { allowMissing = true; }); } _final: super: { makeModulesClosure = x: super.makeModulesClosure (x // { allowMissing = true; }); }

4
machines/nix-cache/configuration.nix
View file

@ -1,6 +1,5 @@
{ {
self, self,
attic,
caddy-with-plugins, caddy-with-plugins,
... ...
}: }:
@ -14,7 +13,6 @@
{ {
imports = [ imports = [
(modulesPath + "/virtualisation/lxc-container.nix") (modulesPath + "/virtualisation/lxc-container.nix")
attic.nixosModules.atticd
../../users/root ../../users/root
../../users/erwin ../../users/erwin
]; ];
@ -101,7 +99,7 @@
atticd = { atticd = {
enable = true; enable = true;
credentialsFile = config.sops.secrets.attic-credentials.path; environmentFile = config.sops.secrets.attic-credentials.path;
settings = { settings = {
listen = "127.0.0.1:8080"; listen = "127.0.0.1:8080";

2
users/erwin/home.nix
View file

@ -198,7 +198,7 @@ in
[ [
amdgpu_top amdgpu_top
atool atool
inputs.attic.packages.${pkgs.system}.attic-client attic-client
bitwarden-cli bitwarden-cli
blink1-tool blink1-tool
bottles bottles