diff --git a/flake.lock b/flake.lock index c2ed922..5dff72c 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1706278226, - "narHash": "sha256-PfLIjoCzTp/wBxEA1/lxH0worupATAHW2bM8qerm59M=", + "lastModified": 1719395767, + "narHash": "sha256-Uu7dhaTBdPplKsxQx37xGKihXbQymh80nNlxofjsEw4=", "ref": "refs/heads/master", - "rev": "5ea5fa2f15ab5eedce812c36546247494a73ed3c", - "revCount": 18, + "rev": "a4128e9603f9decbdf531dbfc6131d238742c211", + "revCount": 20, "type": "git", "url": "https://git.dynamicdiscord.de/kalipso/ep3-bs.nix" }, @@ -99,11 +99,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1719322773, - "narHash": "sha256-BqPxtFwXrpJQDh65NOIHX99pz2rtIMshG9Mt2xnnc5c=", + "lastModified": 1719391814, + "narHash": "sha256-zlRvpIUQrxMSOi+1lVFuJNvIJt9LB93c05tYQ1KSdRg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "caabc425565bbd5c8640630b0bf6974961a49242", + "rev": "aab67495e34365045f9dfbe58725cc6fa03607b7", "type": "github" }, "original": { @@ -147,11 +147,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1719075281, - "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", + "lastModified": 1719254875, + "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", + "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", "type": "github" }, "original": { @@ -163,11 +163,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1719145550, - "narHash": "sha256-K0i/coxxTEl30tgt4oALaylQfxqbotTSNb1/+g+mKMQ=", + "lastModified": 1719253556, + "narHash": "sha256-A/76RFUVxZ/7Y8+OMVL1Lc8LRhBxZ8ZE2bpMnvZ1VpY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e4509b3a560c87a8d4cb6f9992b8915abf9e36d8", + "rev": "fc07dc3bdf2956ddd64f24612ea7fc894933eb2e", "type": "github" }, "original": { @@ -242,6 +242,21 @@ "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" + } + }, "tasklist": { "inputs": { "nixpkgs": [ @@ -263,12 +278,15 @@ } }, "utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -279,7 +297,7 @@ }, "utils_2": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1701680307, @@ -297,7 +315,7 @@ }, "utils_3": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1710146030, diff --git a/machines/durruti/configuration.nix b/machines/durruti/configuration.nix index c223ee9..6e0dc13 100644 --- a/machines/durruti/configuration.nix +++ b/machines/durruti/configuration.nix @@ -3,6 +3,10 @@ with lib; { + sops.defaultSopsFile = ./secrets.yaml; + sops.secrets.ep3bsDb = {}; + sops.secrets.ep3bsMail = {}; + boot.isContainer = true; networking = { hostName = mkDefault "durruti"; @@ -39,14 +43,14 @@ with lib; address = "dynamicdiscorddresden@systemli.org"; host = "mail.systemli.org"; user = "dynamicdiscorddresden@systemli.org"; - password = "E4XaTzv5hi0ClsMRtzy58uQ6D"; + passwordFile = config.sops.secrets.ep3bsMail.path; auth = "plain"; }; database = { user = "malodbuser"; - password = "aAljwdlaKQWhdakwLHdalkhwdhalaWLKhdaoiu"; + passwordFile = config.sops.secrets.ep3bsDb.path; }; };