diff --git a/flake.lock b/flake.lock index 19505d35..2b114f63 100644 --- a/flake.lock +++ b/flake.lock @@ -144,11 +144,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1752511627, - "narHash": "sha256-b8vYxLdVqIFIVa8GaAI50WAGqs37rl76zRMIsjP8/fU=", + "lastModified": 1752764457, + "narHash": "sha256-1vE4SqVcS5eoALVPQHaOK1fxUYTKB8xYlPnkmp68NSQ=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "26106678ea5170e9db5907bfd2992bdfc26ecd7b", + "rev": "bf072abdae6fb8149dd7fdc715ca51e8e411e586", "type": "github" }, "original": { @@ -160,11 +160,11 @@ }, "crane": { "locked": { - "lastModified": 1750266157, - "narHash": "sha256-tL42YoNg9y30u7zAqtoGDNdTyXTi8EALDeCB13FtbQA=", + "lastModified": 1751562746, + "narHash": "sha256-smpugNIkmDeicNz301Ll1bD7nFOty97T79m4GUMUczA=", "owner": "ipetkov", "repo": "crane", - "rev": "e37c943371b73ed87faf33f7583860f81f1d5a48", + "rev": "aed2020fd3dc26e1e857d4107a5a67a33ab6c1fd", "type": "github" }, "original": { @@ -203,11 +203,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1752561972, - "narHash": "sha256-pPqES/udciKmKo422mfwRQ3YzjUCVyCTOsgZYA1xh+g=", + "lastModified": 1752734526, + "narHash": "sha256-OIg7NwrqyYJVpXJdDgaagIzM0dtc4GghdncUrUsCgT8=", "owner": "nix-community", "repo": "fenix", - "rev": "d17ca03c15660ecb8e5a01ca34e441f594feec62", + "rev": "f1526533e3a59a666dbae99594c9d29b201f302d", "type": "github" }, "original": { @@ -313,11 +313,11 @@ ] }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "type": "github" }, "original": { @@ -465,11 +465,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1752593456, - "narHash": "sha256-H/rJ/svNsq8Y7+jXtsOUJVRdWmmQnHXxVZe3wAo4lYo=", + "lastModified": 1752781573, + "narHash": "sha256-lciLQos2xk62PrLi/RbD12V8Da5xAysPnhP4KvI3Jho=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "f44c24ef88b9a663e760ad3a5a5866eb146b051e", + "rev": "155ddc3f8f0e99731d30f15653c62ac7e2476c46", "type": "github" }, "original": { @@ -540,11 +540,11 @@ }, "hardware": { "locked": { - "lastModified": 1752048960, - "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=", + "lastModified": 1752666637, + "narHash": "sha256-P8J72psdc/rWliIvp8jUpoQ6qRDlVzgSDDlgkaXQ0Fw=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806", + "rev": "d1bfa8f6ccfb5c383e1eba609c1eb67ca24ed153", "type": "github" }, "original": { @@ -576,11 +576,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1752604012, - "narHash": "sha256-/gfIVM+Vl1udE3QXgaiDV1ydfOzHQrC9ZduDdLgafuo=", + "lastModified": 1752674572, + "narHash": "sha256-rCAwXmLQJQVHRpquWTQV1fDurHhf4beUzqDi6FVkdEo=", "owner": "helix-editor", "repo": "helix", - "rev": "5cda70e86637c376bdfaaf3383872e44d7622ff8", + "rev": "2ee11a0a9d9b9951b5b64b54be05379cc030230b", "type": "github" }, "original": { @@ -596,11 +596,11 @@ ] }, "locked": { - "lastModified": 1752603129, - "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=", + "lastModified": 1752783339, + "narHash": "sha256-RXxejsGIWtJ5rJKLAm8Kh159euZHPMi7CtbOoHLsm2c=", "owner": "nix-community", "repo": "home-manager", - "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b", + "rev": "7c78e592a895f2f1921f0024848fe193e2f8518e", "type": "github" }, "original": { @@ -789,11 +789,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1752611080, - "narHash": "sha256-dHv7iufYA6Bd3JnF0An2biBCLXstSk5VB0ULgS50umE=", + "lastModified": 1752782660, + "narHash": "sha256-YIT3A+MLvX0EV5BpqyPN+ArLa6VLxO6cNPJeSyjIrdE=", "owner": "hyprwm", "repo": "hyprland", - "rev": "8453fbf4eb0af2e3265fd34a693b7d0e9167f4d2", + "rev": "a05c797e4a7b32f933569aec6cfba180bc693528", "type": "github" }, "original": { @@ -992,11 +992,11 @@ ] }, "locked": { - "lastModified": 1752218742, - "narHash": "sha256-GTJDHmzaeNlsUU0P03q0zHLfOAGtGQCf/oYn2SRPWKE=", + "lastModified": 1752743158, + "narHash": "sha256-YndFlXC9ZM7uiC75MfnYFk4S9s1Xqq3GTnW0xMBlG7g=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "17fefce86e6e857783aef38257af7a18be76323a", + "rev": "31297a871b7b1aea35dcf8627c6bfecf33fe03db", "type": "github" }, "original": { @@ -1200,11 +1200,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1751381593, - "narHash": "sha256-js1XwtJpYhvQrrTaVzViybpztkHJVZ63aXOlFAcTENM=", + "lastModified": 1752673703, + "narHash": "sha256-9Cc0YqL9ZUpaybJsrRJfXex91QlPmQNqpTLgw/KvJGA=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "f4eb75540307c2b33521322c04b7fea74e48a66f", + "rev": "5a776450d904b7ccd377c2a759703152b2553e98", "type": "github" }, "original": { @@ -1273,11 +1273,11 @@ ] }, "locked": { - "lastModified": 1752631802, - "narHash": "sha256-t65TV28ZatEKVyFoTmExQgb8LECvrj/3Wuogn5PxfYI=", + "lastModified": 1752765641, + "narHash": "sha256-2MoYXbaCQCBR066/XOKCZYrWeBCb8CddS97FQ6CZxpk=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "b8834a847dee8875e06e218830f33a3486f0185e", + "rev": "5497282068f11f4e9be8eda127a8ce21a25fd3ca", "type": "github" }, "original": { @@ -1391,11 +1391,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1751984180, - "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", + "lastModified": 1752480373, + "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", + "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", "type": "github" }, "original": { @@ -1452,11 +1452,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1751203939, - "narHash": "sha256-omYD+H5LlSihz2DRfv90I8Oeo7JNEwvcHPHX+6nMIM4=", + "lastModified": 1751791007, + "narHash": "sha256-JBrPWGksmjAw2X71W+kV6moKqPtnxmwsndMQSi+xcu4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "650e71cbf76de8dd16f5648a96981b726c4ef8fe", + "rev": "e8612a671c4f120f93a5c8dbf0cc225e745a4521", "type": "github" }, "original": { @@ -1490,11 +1490,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1752417534, - "narHash": "sha256-06CASFKAxc81QycTSsTw26EJOKi6VgMie6wp0ZUnvqE=", + "lastModified": 1752787341, + "narHash": "sha256-w0ECxf6WCg/T89REElgzw49nVBcHEMqYACHxWWevTBg=", "owner": "notashelf", "repo": "nvf", - "rev": "5e2df2dd5b83c07bad3d5e17dc056b52541ecb9c", + "rev": "6b841d4b9725ff30dc87b8f1f8f6cf5d144751b9", "type": "github" }, "original": { @@ -1584,11 +1584,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1752475356, - "narHash": "sha256-V2nHrCJ0/Pv30j8NWJ4GfDlaNzfkOdYI0jS69GdVpq8=", + "lastModified": 1752687976, + "narHash": "sha256-juLg/AlXwda5fwewOJq42Q5T49wU131glK55BzKyhvU=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "e10d64eb402a25a32d9f1ef60cacc89d82a01b85", + "rev": "152087654552a79f85e588da0a8de905436e62d8", "type": "github" }, "original": { @@ -1648,11 +1648,11 @@ ] }, "locked": { - "lastModified": 1751165203, - "narHash": "sha256-3QhlpAk2yn+ExwvRLtaixWsVW1q3OX3KXXe0l8VMLl4=", + "lastModified": 1751769931, + "narHash": "sha256-QR2Rp/41NkA5YxcpvZEKD1S2QE1Pb9U415aK8M/4tJc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "90f547b90e73d3c6025e66c5b742d6db51c418c3", + "rev": "3ac4f630e375177ea8317e22f5c804156de177e8", "type": "github" }, "original": { diff --git a/modules/nixos/programs/pkgs/default.nix b/modules/nixos/programs/pkgs/default.nix index 4057f120..4fc81500 100644 --- a/modules/nixos/programs/pkgs/default.nix +++ b/modules/nixos/programs/pkgs/default.nix @@ -61,6 +61,8 @@ in { gparted ntfs3g cloudflared + libargon2 + openssl ] (mkIf cfg.common.enable [ diff --git a/modules/server/vaultwarden/default.nix b/modules/server/vaultwarden/default.nix index caf194c5..dd9b1c72 100644 --- a/modules/server/vaultwarden/default.nix +++ b/modules/server/vaultwarden/default.nix @@ -1,11 +1,9 @@ -# yanked from @fufexan +# from @fufexan & @notthebee { config, - self, lib, ... }: let - inherit (config.networking) domain; inherit (lib) mkIf mkEnableOption; vcfg = config.services.vaultwarden.config; cfg = config.server.vaultwarden; @@ -46,6 +44,11 @@ in { }; }; + systemd.services.backup-vaultwarden.serviceConfig = { + User = "root"; + Group = "root"; + }; + services = { vaultwarden = { enable = true; diff --git a/secrets/vaultwarden-env.age b/secrets/vaultwarden-env.age index c06d529b..d202a50d 100644 --- a/secrets/vaultwarden-env.age +++ b/secrets/vaultwarden-env.age @@ -1,11 +1,11 @@ age-encryption.org/v1 --> ssh-ed25519 t9iOEg lYT+VxnAbAxJQ/doR7/CY5OazM7Q8TZWjEmWZj7YjwU -1QSzDOwhs/yZggXjSDVp8Fk8NbmbBLhVC71FZ/9oHyo --> ssh-ed25519 KUYMFA zdLKtKeC2HwlViQhnJySnLQ9LNFaomJ0Iaqfih8beiQ -yF463unL7wgpdRL5U4bvd6hBiO25u+cHUUL7mifOPBM --> ssh-ed25519 76RhUQ Hj5F2S+eR2BctyQ0X1IfKkPq4TTHYQE4du4gUHLNNRE -ynnIuCubn9ebvdxRo3TD7FlPbK8ALgXgrXywyKybxRg --> ssh-ed25519 Jf8sqw y033pCEVhE9EA3R0hdK6lTFTxw548AiM1K8jk3peAXE -ZziMR79AZAeNB/XgqaU4VjemYbzZULmLMahGm+UNaFI ---- W2ePt5mp2t5szmNcfsmeYRfza7KZKxvaEgsLHrnCV5c - OO0-?[ $i`EAetyTx I)i$yeT+hCjZOX" \ No newline at end of file +-> ssh-ed25519 t9iOEg kAkVnuGZBqtMnpkJP7IjziT6hkvRttgpi1bsRt9bbwY +C6vcZEdnx+yXOu2lSzgcufIzOAczkARRfuXGORwhhqU +-> ssh-ed25519 KUYMFA /HH+g+hDU8JHDi3e9ntRyhshyC8P+O36sAY9IpxgQXU +3CjRjJxhGyLiZwxvhOa2rNtAdbJFgkeyxCTAYO0Iw8c +-> ssh-ed25519 76RhUQ cBxH1jo90fOtkjNevdSok/gZXy/oEf/ZD4xGit9ImGA +RM0NWHbZpM2Ez2YOchqydnNXUzq3JdN7RuvVZnusS7o +-> ssh-ed25519 Jf8sqw 7MlM8acKWV7BAjuE+VafFDhKYg0v48mAOikXFZ3I3CQ +n3OtyE706BNe9KRN8cVGfOCl/G5HitF60JOAM65IX+I +--- KC9iqMX0ZGhn9zWIbsszgWVJ++mnfhW620Y9qePQv/k +DL.ÏpE5_D@)6|{(Wud1o(4\hvUaaDA13k|Rן դTȐN6G|ǰK'A_ֆXZ2%ؐtUx[ђ(>w~I҅ q'$ \ No newline at end of file