diff --git a/common/auths.yaml b/common/auths.yaml index ab51ae1..2b80603 100644 --- a/common/auths.yaml +++ b/common/auths.yaml @@ -6,6 +6,8 @@ mail: users: macronova: password: ENC[AES256_GCM,data:GSWsFhbxrUn1/tuURrl+D9wR80PZWzMU8sIjZpDyCyTrsCnbwcyqlsEx6MYSF/bRtAujR/kH2ppLM5O6QcIduETIMfjAMl8th9ZbQLUPiTpXRkfI01GKeUzYuvlATBGbnNHouJ2HJPamG+TJSBrbJJasoe5wUQ==,iv:RZQXTptp9MZejgrhWbeHSk0qgA4lSyo9yFdKZdJfvIk=,tag:38KJZbV19oT+3MH60d/grw==,type:str] +vaultwarden: + environment: ENC[AES256_GCM,data:DKPhavj/WONXkwmvOqAEV03EqWK6nBK3oTva/R23hxeex+IiuLFtHYQwBkNdBVT5enat+w/NBLekv6f9uWIA9pfbL/38Hz7acXtn/r/zmoLaOC1YcZO4Lc5GPjPRdd3or/JMIv9YTiGyynHZ3JJTGPe6cHG+3MFf3aaDpYtN5yL8gGghJQQJR/M1uNpvGoP+tg8=,iv:ScfGqDxJ7sJ+S6OGEN/mrqqmsHBRhKNCOp+WnKfUI+w=,tag:I/Dz9hmskHwMYF1vGCPPNA==,type:str] sops: kms: [] gcp_kms: [] @@ -39,8 +41,8 @@ sops: SEZndElYa1NOWnQ1Y3dMUG9WUS9yZE0Ku4sIsnLwt7bPeceWT/fSbJngdLdeVFiL qYYzmQOAP/nb1KlZCQjbqxZaMq7An+Iqaat4ILD1i39hmbLAZdxIpA== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-09-01T06:31:43Z" - mac: ENC[AES256_GCM,data:w6s0HiUCsaVU0aYkCuIwLxW/NTP3dZbDZOS8zOAKgK4mBecs9MlBzFY6cQzM657aYvK/JibyD2L6AsjrdX9HOiN0dEFikDAaZ6OvyCoaxYawZF/aFPKR92sWzuMMvaU8g+g3F3tyhq/SR1ojHyPFztbkrfxIkm+ORl17w56Eb5E=,iv:7088zB1C/1Dt7zBJNRaTcDVJRa28dwPV43vR/yRc/mA=,tag:geuuukzQ4A8wofkK5Co4jg==,type:str] + lastmodified: "2024-12-15T05:14:38Z" + mac: ENC[AES256_GCM,data:uMxR0aIm37ub64O/RjkDAvY98vzkMxu0gqpbP+GoTFicWcyBDhxoOcXZf7ZRzONLWra+y2PS02i4b1odhmIdn8b6Xtse6l6v3GrpatGM6oLxwuEwG7t89bzj8oL9UazSV9MfGWiLMfI/E1bm1/osKEibIEhVkWUJ8KM+GnAZ0/U=,iv:oBW2/uJg3ZJSlb5l7gW+1xJNM+5MAm4pIAed2IHbS7o=,tag:+UQnMiopIvlWymkK8pk7WQ==,type:str] pgp: [] unencrypted_suffix: _unencrypted - version: 3.9.0 + version: 3.9.2 diff --git a/flake.lock b/flake.lock index 5092e23..f041c2e 100644 --- a/flake.lock +++ b/flake.lock @@ -19,11 +19,11 @@ "candy-icons": { "flake": false, "locked": { - "lastModified": 1730754101, - "narHash": "sha256-tT+JX2iBIq+uVELW7gdtTL6VHzohowMJ6IMBSCnnkAw=", + "lastModified": 1733869301, + "narHash": "sha256-EjjbRR2gPTZb18+ok9Wa+ivpSBqz9InS8OkD/A3/TU0=", "ref": "refs/heads/master", - "rev": "72e20c0c473b9c5904ea085de0954048ba14d701", - "revCount": 1236, + "rev": "cbf6189549400aa68822d37eeded001ad501d82a", + "revCount": 1246, "type": "git", "url": "https://github.com/EliverLara/candy-icons" }, @@ -37,11 +37,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1733168902, - "narHash": "sha256-8dupm9GfK+BowGdQd7EHK5V61nneLfr9xR6sc5vtDi0=", + "lastModified": 1734088167, + "narHash": "sha256-OIitVU+IstPbX/NWn2jLF+/sT9dVKcO2FKeRAzlyX6c=", "owner": "nix-community", "repo": "disko", - "rev": "785c1e02c7e465375df971949b8dcbde9ec362e5", + "rev": "d32f2d1750d61a476a236526b725ec5a32e16342", "type": "github" }, "original": { @@ -141,11 +141,11 @@ }, "hardware": { "locked": { - "lastModified": 1733481457, - "narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=", + "lastModified": 1733861262, + "narHash": "sha256-+jjPup/ByS0LEVIrBbt7FnGugJgLeG9oc+ivFASYn2U=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "e563803af3526852b6b1d77107a81908c66a9fcf", + "rev": "cf737e2eba82b603f54f71b10cb8fd09d22ce3f5", "type": "github" }, "original": { @@ -159,11 +159,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1733484277, - "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", + "lastModified": 1734093295, + "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=", "owner": "nix-community", "repo": "home-manager", - "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", + "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8", "type": "github" }, "original": { @@ -199,11 +199,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1733491721, - "narHash": "sha256-n4fTKTYXeGRngeanNDxSxbuWSRCQ6l74IwOBlqp8dcw=", + "lastModified": 1734162608, + "narHash": "sha256-m2AX+3eiVqIK6uO7GbGY7SFnkkYOlR5fQiNI0eRvWOQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "0f415721ee427270bc078ef3a5ba2a308d47461f", + "rev": "31bdf4c7c91204d65afbde01146deee0259a8fb7", "type": "github" }, "original": { @@ -247,11 +247,11 @@ "yorha-sound-theme": "yorha-sound-theme" }, "locked": { - "lastModified": 1731647853, - "narHash": "sha256-3yzajp5oNIHOL3SyLfunUm4PozLX52YMpA1Q4OyV62k=", + "lastModified": 1733896485, + "narHash": "sha256-KiHiqzMPsIEER2dW+C1MEpa0lA6ISMpf7r4S8ujQYVc=", "ref": "refs/heads/main", - "rev": "15ceb9dd2b4b388b76ff23cc95c24f6a9c46abd6", - "revCount": 30, + "rev": "79687538ddcc409c32cd93d54e2f8b867e9d8da3", + "revCount": 31, "type": "git", "url": "https://forgejo.invariantspace.com/macronova/nix-custom" }, @@ -284,11 +284,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732238832, - "narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=", + "lastModified": 1733749988, + "narHash": "sha256-+5qdtgXceqhK5ZR1YbP1fAUsweBIrhL38726oIEAtDs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d", + "rev": "bc27f0fde01ce4e1bfec1ab122d72b7380278e68", "type": "github" }, "original": { @@ -378,11 +378,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1731319897, - "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", + "lastModified": 1733759999, + "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dc460ec76cbff0e66e269457d7b728432263166c", + "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", "type": "github" }, "original": { @@ -394,11 +394,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1733581040, - "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", + "lastModified": 1733940404, + "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", + "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", "type": "github" }, "original": { @@ -462,11 +462,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1733578387, - "narHash": "sha256-XkMZGeqg0GCRoSXvMcaHP7bdvWPRZxCK1sw1ASsc16E=", + "lastModified": 1733858086, + "narHash": "sha256-h2BDIDKiqgMpA6E+mu0RgMGy3FeM6k+EuJ9xgOQ1+zw=", "owner": "pjones", "repo": "plasma-manager", - "rev": "2a64e173f1effdcc86e25cba0601e8feedf89115", + "rev": "7e2010249529931a3848054d5ff0dbf24675ab68", "type": "github" }, "original": { @@ -516,11 +516,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1733128155, - "narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=", + "lastModified": 1733965552, + "narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856", + "rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004", "type": "github" }, "original": { @@ -532,11 +532,11 @@ "sweet-ambar-blue": { "flake": false, "locked": { - "lastModified": 1731018321, - "narHash": "sha256-j/O1SkxkkBl47AhYiYix4Uz4vZ4jHP3VqwJ208Wnv3I=", + "lastModified": 1733350152, + "narHash": "sha256-SSsybjFgRQOe1CxiRdSuO7PNfeZX0KXta6/z27Xmo70=", "ref": "Ambar-Blue", - "rev": "ca388046f3d866feafdad77389bd5a72de77fcc5", - "revCount": 305, + "rev": "023979fe5d038e9e3b65a6d8e7c76f19c9ba835e", + "revCount": 310, "type": "git", "url": "https://github.com/EliverLara/Sweet" }, @@ -549,11 +549,11 @@ "sweet-ambar-blue-dark": { "flake": false, "locked": { - "lastModified": 1731018459, - "narHash": "sha256-oeZw8cU2+1kRAeuWBnGsVPGe6Di7ChkPJGkcUK+4jZ0=", + "lastModified": 1733349596, + "narHash": "sha256-Xag4lfDpCFOtt5x3b/BiMZkm5jJZnNTBIj6wafZ/rbg=", "ref": "Ambar-Blue-Dark", - "rev": "5a76db222a21a133792b8d3525fe997a629fdce4", - "revCount": 390, + "rev": "2da81f72c96220dd93ca060d7eae16fd57fff1a5", + "revCount": 396, "type": "git", "url": "https://github.com/EliverLara/Sweet" }, diff --git a/linux/singularity/vaultwarden.nix b/linux/singularity/vaultwarden.nix index 70883a0..cd8a427 100644 --- a/linux/singularity/vaultwarden.nix +++ b/linux/singularity/vaultwarden.nix @@ -1,4 +1,6 @@ -{config, ...}: { +{config, ...}: let + vaultEnvironment = "vaultwarden/environment"; +in { services.vaultwarden = { enable = true; config = with config.constants; { @@ -8,5 +10,7 @@ ROCKET_ADDRESS = localhost; ROCKET_PORT = port.vault; }; + environmentFile = config.sops.secrets.${vaultEnvironment}.path; }; + sops.secrets.${vaultEnvironment} = {}; }