harald/nixcfg
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Compare commits

base: harald:e45233bbfda79309641cca305524e70476ed7701
Branches Tags
harald:main
harald:b24.05
..
compare: harald:eafb5c1455bf7915b9d9d7bf3db32ea7d030d668
Branches Tags
harald:main
harald:b24.05

No commits in common. "e45233bbfda79309641cca305524e70476ed7701" and "eafb5c1455bf7915b9d9d7bf3db32ea7d030d668" have entirely different histories.
e45233bbfd ... eafb5c1455

6 changed files with 30 additions and 29 deletions
Show stats Expand all files Collapse all files

48
flake.lock
View file

@ -312,11 +312,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710717205, "lastModified": 1709771483,
"narHash": "sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A=", "narHash": "sha256-Hjzu9nCknHLQvhdaRFfCEprH0o15KcaNu1QDr3J88DI=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "bcc8afd06e237df060c85bad6af7128e05fd61a3", "rev": "550340062c16d7ef8c2cc20a3d2b97bcd3c6b6f6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -381,11 +381,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710724748, "lastModified": 1709439398,
"narHash": "sha256-aXlifKr6Brg0SBUBgRNEBaZf3JLUeGhM9BX2gam+vvo=", "narHash": "sha256-MW0zp3ta7SvdpjvhVCbtP20ewRwQZX2vRFn14gTc4Kg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "c09c3a9639690f94ddff44c3dd25c85602e5aeb2", "rev": "1f76b318aa11170c8ca8c225a9b4c458a5fcbb57",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -790,11 +790,11 @@
"gpg-base-conf": { "gpg-base-conf": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1710730803, "lastModified": 1710110429,
"narHash": "sha256-mZwEZxZJ3vLdgvKyFqGSkwg0JRgH1sshe5EvWXoU6JA=", "narHash": "sha256-sW7crQEhoGslXyO9djBuPYf1DFqTo5uYUEFkaSCw1xc=",
"owner": "drduh", "owner": "drduh",
"repo": "config", "repo": "config",
"rev": "6fc554136c5e179cacc9ba88a18ad61a9ea37979", "rev": "702281406b1f491b805d8e380dc03d73ace517f3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1313,11 +1313,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1710628718, "lastModified": 1709428628,
"narHash": "sha256-y+l3eH53UlENaYa1lmnCBHusZb1kxBEFd2/c7lDsGpw=", "narHash": "sha256-//ZCCnpVai/ShtO2vPjh3AWgo8riXCaret6V9s7Hew4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6dc11d9859d6a18ab0c5e5829a5b8e4810658de3", "rev": "66d65cb00b82ffa04ee03347595aa20e41fe3555",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1397,11 +1397,11 @@
"snowfall-lib": "snowfall-lib" "snowfall-lib": "snowfall-lib"
}, },
"locked": { "locked": {
"lastModified": 1710409997, "lastModified": 1709040449,
"narHash": "sha256-wJNbtX4pbPdkoS9oKRLqiZRCAwqT0JG6esCJtJEjSBw=", "narHash": "sha256-NDXSUI7GTCekniW52EBvi5PlzdQ37XkrIB1oH4GrUvM=",
"owner": "matter-labs", "owner": "matter-labs",
"repo": "nixsgx", "repo": "nixsgx",
"rev": "6aef709945875bae7cd4e62a1ef0b62766a507b7", "rev": "2b11fbc725fbab3fbaef13490decd3f93c43ae07",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2176,11 +2176,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1710644594, "lastModified": 1709711091,
"narHash": "sha256-RquCuzxfy4Nr8DPbdp3D/AsbYep21JgQzG8aMH9jJ4A=", "narHash": "sha256-L0rSIU9IguTG4YqSj4B/02SyTEz55ACq5t8gXpzteYc=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "83b68a0e8c94b72cdd0a6e547a14ca7eb1c03616", "rev": "25dd60fdd08fcacee2567a26ba6b91fe098941dc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2436,11 +2436,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1710806803, "lastModified": 1710631334,
"narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2629,11 +2629,11 @@
"yubikey-guide": { "yubikey-guide": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1710725874, "lastModified": 1710173432,
"narHash": "sha256-0COxYhs7VJGaO7mv23OEd7FjKRuTr+0zS9Ys9/exesI=", "narHash": "sha256-bzoO+sxhaC8P513XpxmYXhb/rRt3Qc6q65m8sn++5/s=",
"owner": "drduh", "owner": "drduh",
"repo": "YubiKey-Guide", "repo": "YubiKey-Guide",
"rev": "a7aa09bc80ccbcf13091e74fdf8e40701adee7f8", "rev": "12b232d28fbb6ea61ccff2075751105c77ca84ee",
"type": "github" "type": "github"
}, },
"original": { "original": {

7
modules/nixos/nix/default.nix
View file

@ -48,9 +48,6 @@ in
let let
users = [ "root" config.plusultra.user.name ] ++ users = [ "root" config.plusultra.user.name ] ++
optional config.services.hydra.enable "hydra"; optional config.services.hydra.enable "hydra";
extra-substituters = cfg.extra-substituters // {
"https://nixsgx.cachix.org".key = "nixsgx.cachix.org-1:tGi36DlY2joNsIXOlGnSgWW0+E094V6hW0umQRo/KoE=";
};
in in
{ {
package = cfg.package; package = cfg.package;
@ -68,11 +65,11 @@ in
substituters = substituters =
[ cfg.default-substituter.url ] [ cfg.default-substituter.url ]
++ ++
(mapAttrsToList (name: value: name) extra-substituters); (mapAttrsToList (name: value: name) cfg.extra-substituters);
trusted-public-keys = trusted-public-keys =
[ cfg.default-substituter.key ] [ cfg.default-substituter.key ]
++ ++
(mapAttrsToList (name: value: value.key) extra-substituters); (mapAttrsToList (name: value: value.key) cfg.extra-substituters);
} // (lib.optionalAttrs config.plusultra.tools.direnv.enable { } // (lib.optionalAttrs config.plusultra.tools.direnv.enable {
keep-outputs = true; keep-outputs = true;

1
systems/x86_64-linux/sgx-nixos/default.nix
View file

@ -8,6 +8,7 @@ with lib.plusultra;
base.enable = true; base.enable = true;
nix-ld.enable = true; nix-ld.enable = true;
nix.enable = true; nix.enable = true;
nix.extra-substituters."https://nixsgx.cachix.org".key = "nixsgx.cachix.org-1:tGi36DlY2joNsIXOlGnSgWW0+E094V6hW0umQRo/KoE=";
user.extraGroups = [ "docker" "sgx" ]; user.extraGroups = [ "docker" "sgx" ];
}; };

1
systems/x86_64-linux/sgx/default.nix
View file

@ -14,6 +14,7 @@ in
gui.enable = false; gui.enable = false;
nix-ld.enable = true; nix-ld.enable = true;
nix.enable = true; nix.enable = true;
nix.extra-substituters."https://nixsgx.cachix.org".key = "nixsgx.cachix.org-1:tGi36DlY2joNsIXOlGnSgWW0+E094V6hW0umQRo/KoE=";
pccs.enable = true; pccs.enable = true;
pccs.secret = config.sops.secrets.pccs.path; pccs.secret = config.sops.secrets.pccs.path;
podman.enable = true; podman.enable = true;

1
systems/x86_64-linux/t15/default.nix
View file

@ -7,6 +7,7 @@
gui.enable = true; gui.enable = true;
nix-ld.enable = true; nix-ld.enable = true;
nix.enable = true; nix.enable = true;
nix.extra-substituters."https://nixsgx.cachix.org".key = "nixsgx.cachix.org-1:tGi36DlY2joNsIXOlGnSgWW0+E094V6hW0umQRo/KoE=";
podman.enable = true; podman.enable = true;
secureboot.enable = true; secureboot.enable = true;
}; };

1
systems/x86_64-linux/x1/default.nix
View file

@ -9,6 +9,7 @@ with lib.plusultra;
gui.enable = true; gui.enable = true;
nix-ld.enable = true; nix-ld.enable = true;
nix.enable = true; nix.enable = true;
nix.extra-substituters."https://nixsgx.cachix.org".key = "nixsgx.cachix.org-1:tGi36DlY2joNsIXOlGnSgWW0+E094V6hW0umQRo/KoE=";
podman.enable = true; podman.enable = true;
secureboot.enable = true; secureboot.enable = true;
}; };