Compare commits

..

3 commits

Author SHA1 Message Date
github-actions[bot]
dd6f634705 flake.lock: Update
Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/51994df8ba24d5db5459ccf17b6494643301ad28?narHash=sha256-u9h03JQUuQJ607xmti9F9Eh6E96kKUAGP%2BaXWgwm70o%3D' (2024-09-20)
  → 'github:nix-community/disko/a6a3179ddf396dfc28a078e2f169354d0c137125?narHash=sha256-MuojlSnwAJAwfhgmW8ZtZrwm2Sko4fqubCvReqbUzYw%3D' (2024-10-18)
• Updated input 'firefox-addons':
    'gitlab:rycee/nur-expressions/cecf006ed59b5e41a7ee3378f57ee3729e8a67bc?dir=pkgs/firefox-addons&narHash=sha256-o01/njm1G%2B5H5dJoHncIaO8Fu/jfSgu/0radj4LaHcE%3D' (2024-09-21)
  → 'gitlab:rycee/nur-expressions/d6e0e74257ac513166c7ab4baa25f5335a6b7b5e?dir=pkgs/firefox-addons&narHash=sha256-O%2Bg7eF0OTJKce30wTBHJBRSguAzaB9LkOkDEstksOVI%3D' (2024-10-19)
• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a?narHash=sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U%3D' (2024-09-12)
  → 'github:hercules-ci/flake-parts/3d04084d54bedc3d6b8b736c70ef449225c361b1?narHash=sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0%3D' (2024-10-01)
• Updated input 'home-manager':
    'github:nix-community/home-manager/1bbc1a5a1f4de7401c92db85b2119ed21bb4139d?narHash=sha256-z2V74f5vXqkN5Q%2BgoFlhbFXY/dNaBAyeLpr2bxu4Eic%3D' (2024-09-20)
  → 'github:nix-community/home-manager/2f23fa308a7c067e52dfcc30a0758f47043ec176?narHash=sha256-Vl%2BWVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM%3D' (2024-09-22)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/dbebdd67a6006bb145d98c8debf9140ac7e651d0?narHash=sha256-Xc9lEtentPCEtxc/F1e6jIZsd4MPDYv4Kugl9WtXlz0%3D' (2024-09-18)
  → 'github:NixOS/nixpkgs/4eb33fe664af7b41a4c446f87d20c9a0a6321fa3?narHash=sha256-LDiPhQ3l%2BfBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I%3D' (2024-10-17)
• Updated input 'omnix':
    'github:juspay/omnix/40da50ae7d873eea97d134ef8a266de4d16e7d40?narHash=sha256-Pu1Lh4JwW9nQWt/iu8fybzEsa1DaZU7PhDtLr1BzmiU%3D' (2024-09-21)
  → 'github:juspay/omnix/be6ce4a0c31fc4cde860104baeb7af02ae924c73?narHash=sha256-AoYOCLIcvqFaO3IXApZkLYjTItGrUr2yyiyBTTYi15w%3D' (2024-10-18)
• Updated input 'pre-commit-hooks':
    'github:cachix/pre-commit-hooks.nix/4e743a6920eab45e8ba0fbe49dc459f1423a4b74?narHash=sha256-D5AegvGoEjt4rkKedmxlSEmC%2BnNLMBPWFxvmYnVLhjk%3D' (2024-09-19)
  → 'github:cachix/pre-commit-hooks.nix/3c3e88f0f544d6bb54329832616af7eb971b6be6?narHash=sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ%2B/nVtALHIciX/BI%3D' (2024-10-16)
• Updated input 'stylix':
    'github:danth/stylix/53bcceb4e46d0b3e8ae6434a7a6bcc3463092093?narHash=sha256-pGRPVVm7UXf%2Bfx2NVpH6FFSWR9AynG6eoVlagaqH9i4%3D' (2024-09-20)
  → 'github:danth/stylix/33a2eff15181e557bb6dd9d2073b90f7d218975d?narHash=sha256-hmG/u7qZEm7CTh1XPDi%2Bpg4Oi0nNrv7sL8PgZDRe6wg%3D' (2024-10-14)
• Removed input 'stylix/base16-foot'
• Removed input 'stylix/base16-kitty'
• Removed input 'stylix/base16-tmux'
• Added input 'stylix/tinted-foot':
    'github:tinted-theming/tinted-foot/eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce?narHash=sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU%3D' (2023-10-08)
• Added input 'stylix/tinted-kitty':
    'github:tinted-theming/tinted-kitty/eb39e141db14baef052893285df9f266df041ff8?narHash=sha256-2xF3sH7UIwegn%2B2gKzMpFi3pk5DlIlM18%2Bvj17Uf82U%3D' (2024-05-23)
• Added input 'stylix/tinted-tmux':
    'github:tinted-theming/tinted-tmux/c02050bebb60dbb20cb433cd4d8ce668ecc11ba7?narHash=sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU%2B3Q%3D' (2023-10-08)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/ee41a466c2255a3abe6bc50fc6be927cdee57a9f?narHash=sha256-VUH5O5AcOSxb0uL/m34dDkxFKP6WLQ6y4I1B4%2BN3L2w%3D' (2024-09-19)
  → 'github:numtide/treefmt-nix/d986489c1c757f6921a48c1439f19bfb9b8ecab5?narHash=sha256-6jWSWxv2crIXmYSEb3LEVsFkCkyVHNllk61X4uhqfCs%3D' (2024-10-18)
• Updated input 'unstable':
    'github:NixOS/nixpkgs/c04d5652cfa9742b1d519688f65d1bbccea9eb7e?narHash=sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK%2BWk%3D' (2024-09-19)
  → 'github:NixOS/nixpkgs/5785b6bb5eaae44e627d541023034e1601455827?narHash=sha256-KOTTUfPkugH52avUvXGxvWy8ibKKj4genodIYUED%2BKc%3D' (2024-10-16)
2024-10-19 05:12:11 +00:00
dependabot[bot]
423418f69e ci: bump cachix/install-nix-action from V28 to 30
Some checks failed
/ ci (push) Has been cancelled
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from V28 to 30. This release includes the previously tagged commit.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](https://github.com/cachix/install-nix-action/compare/V28...v30)

---
updated-dependencies:
- dependency-name: cachix/install-nix-action
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-10-15 16:45:24 +01:00
af15c64ead
vaultwarden 2024-10-15 16:32:53 +01:00
8 changed files with 65 additions and 27 deletions

View file

@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: cachix/install-nix-action@V28 - uses: cachix/install-nix-action@v30
with: with:
nix_path: nixpkgs=channel:nixos-unstable nix_path: nixpkgs=channel:nixos-unstable
- name: Free Disk Space - name: Free Disk Space

View file

@ -12,7 +12,7 @@ jobs:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Install Nix - name: Install Nix
uses: cachix/install-nix-action@V28 uses: cachix/install-nix-action@v30
- name: Update flake.lock - name: Update flake.lock
uses: DeterminateSystems/update-flake-lock@v24 uses: DeterminateSystems/update-flake-lock@v24
with: with:

48
flake.lock generated
View file

@ -238,11 +238,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728687662, "lastModified": 1729281548,
"narHash": "sha256-D9TChzb00eTG1YWBx8eN2s6lJJnBjB5Y7RpxkAzGvyQ=", "narHash": "sha256-MuojlSnwAJAwfhgmW8ZtZrwm2Sko4fqubCvReqbUzYw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "bdbdb725d632863bdedb80baabf21327614dd237", "rev": "a6a3179ddf396dfc28a078e2f169354d0c137125",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -282,11 +282,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1728705812, "lastModified": 1729310596,
"narHash": "sha256-yPRI9ohNTrvqWzXtfCwdLCzIaA30T6VDksh7SSm1GTA=", "narHash": "sha256-O+g7eF0OTJKce30wTBHJBRSguAzaB9LkOkDEstksOVI=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "d615ae06e3f6aea0120a8df8d4efa8a983c807ef", "rev": "d6e0e74257ac513166c7ab4baa25f5335a6b7b5e",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -1122,11 +1122,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1728627514, "lastModified": 1729181673,
"narHash": "sha256-r+SF9AnHrTg+bk6YszoKfV9lgyw+yaFUQe0dOjI0Z2o=", "narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c505ebf777526041d792a49d5f6dd4095ea391a7", "rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1366,11 +1366,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728683649, "lastModified": 1729281086,
"narHash": "sha256-5pmVpS8iFTa85wtbr5C2Ydh001TdnZMpDQiwFWRnja8=", "narHash": "sha256-AoYOCLIcvqFaO3IXApZkLYjTItGrUr2yyiyBTTYi15w=",
"owner": "juspay", "owner": "juspay",
"repo": "omnix", "repo": "omnix",
"rev": "105b50e01c9398c5763da3363f6d42bfbd15328f", "rev": "be6ce4a0c31fc4cde860104baeb7af02ae924c73",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1391,11 +1391,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1728651332, "lastModified": 1729104314,
"narHash": "sha256-lm+asqDSTj0m6j1dtEte1/XG+uzZbwxS3tn7JLaBw84=", "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "06bb5971c139959d9a951f34e4264d32f5d998e7", "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1596,11 +1596,11 @@
"tinted-tmux": "tinted-tmux" "tinted-tmux": "tinted-tmux"
}, },
"locked": { "locked": {
"lastModified": 1728640680, "lastModified": 1728900372,
"narHash": "sha256-JH2+RXJNooFtZIN6ZhaGZWn2KChMrso4H7Fkp1Ujrdo=", "narHash": "sha256-hmG/u7qZEm7CTh1XPDi+pg4Oi0nNrv7sL8PgZDRe6wg=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "f95022bb6e74f726a87975aec982a5aa9fad8691", "rev": "33a2eff15181e557bb6dd9d2073b90f7d218975d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1784,11 +1784,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727984844, "lastModified": 1729242555,
"narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", "narHash": "sha256-6jWSWxv2crIXmYSEb3LEVsFkCkyVHNllk61X4uhqfCs=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", "rev": "d986489c1c757f6921a48c1439f19bfb9b8ecab5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1799,11 +1799,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1728492678, "lastModified": 1729070438,
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "narHash": "sha256-KOTTUfPkugH52avUvXGxvWy8ibKKj4genodIYUED+Kc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "rev": "5785b6bb5eaae44e627d541023034e1601455827",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -3,7 +3,7 @@
enable = true; enable = true;
settings = { settings = {
base_url = "https://vaultwarden.cleslie.uk"; base_url = "https://vaultwarden.cleslie.uk";
email = "cal@callumleslie.me"; email = "vw@cleslie.uk";
pinentry = pkgs.pinentry-gnome3; pinentry = pkgs.pinentry-gnome3;
}; };
}; };

View file

@ -11,5 +11,6 @@
./media.nix ./media.nix
./headscale.nix ./headscale.nix
./forgejo.nix ./forgejo.nix
./vaultwarden.nix
]; ];
} }

View file

@ -0,0 +1,29 @@
{config, ...}: let
domain = "vaultwarden.cleslie.uk";
in {
services = {
cloudflare-dyndns.domains = [domain];
vaultwarden = {
enable = true;
dbBackend = "sqlite";
config = {
DOMAIN = "https://${domain}";
SIGNUPS_ALLOWED = false;
ROCKET_ADDRESS = "127.0.0.1";
ROCKET_PORT = 8222;
ROCKET_LOG = "critical";
};
environmentFile = "${config.age.secrets.vaultwarden-env.path}";
};
caddy.virtualHosts.${domain}.extraConfig = ''
reverse_proxy localhost:${toString config.services.vaultwarden.config.ROCKET_PORT} {
header_up X-Real-IP {remote_host}
}
'';
};
age.secrets."vaultwarden-env" = {
file = ../../secrets/vaultwarden-env.age;
};
}

View file

@ -11,4 +11,5 @@ in {
"mesh-conf-cleslie.age".publicKeys = keys.c ++ allSystems; "mesh-conf-cleslie.age".publicKeys = keys.c ++ allSystems;
"forgejo-password.age".publicKeys = keys.c ++ [systems.hermes]; "forgejo-password.age".publicKeys = keys.c ++ [systems.hermes];
"cloudflare-api.age".publicKeys = keys.c ++ [systems.hermes]; "cloudflare-api.age".publicKeys = keys.c ++ [systems.hermes];
"vaultwarden-env.age".publicKeys = keys.c ++ [systems.hermes];
} }

View file

@ -0,0 +1,7 @@
age-encryption.org/v1
-> ssh-ed25519 /RyXeg FyWjw52mFlS8j8s0hZZvu1C1jy4kFNHEMDyMer7uQjw
5nZS6DoNscDHLmB77aRfOiG/CxRDpGmo/q+2D15MrZM
-> ssh-ed25519 aSaoJQ yuB2O/EitRDPlpIjTQT7lz+gLBnVTaHMgJ2enexvWnk
+2BXZOWHuIDoQfZoh5X1XIuy2HJP+tJQh7ZJ6uxI48k
--- u4zTk4QXTWj0SdzP/2aHnGsN6MHdyEAhGRzTgpIgCeE
t8€·XRƒT ØÒv`;©];u]ó6DRzú³zl¦×[…êˆé6O´Š3õÅ—f@ʦ•cEŒ‡X{õ ‡#[gb§¹G, ©ÀÉèîAÎp ±±nЭ<E280B9>ÁUƒ"ä†îøä÷ɺù_©°ØÉÉ”ó%™«ÖD<C396>LŽç,4Ù&ÆÅê<C385>êoNH‹¶&…<>!Pwz&¶¡ýÝÆÝ!¸S®H—(@~Ÿ~Þ{!