From e0f1f5b6fb919489784373221efff4d2badeccd5 Mon Sep 17 00:00:00 2001 From: Lukas Wurzinger Date: Thu, 9 Jan 2025 00:15:30 +0100 Subject: [PATCH 1/2] stuff --- classes/{desktop => headful}/clipboard.nix | 0 classes/{desktop => headful}/cosmic.nix | 0 classes/{desktop => headful}/devenv.nix | 0 classes/{desktop => headful}/flatpak.nix | 0 classes/{desktop => headful}/fonts.nix | 0 classes/{desktop => headful}/fs.nix | 0 classes/{desktop => headful}/gamemode.nix | 0 classes/{desktop => headful}/hardware.nix | 0 classes/{desktop => headful}/location.nix | 0 classes/{desktop => headful}/mullvad.nix | 0 classes/{desktop => headful}/networking.nix | 0 classes/{desktop => headful}/pipewire.nix | 0 classes/{desktop => headful}/printing.nix | 0 classes/{desktop => headful}/syncthing.nix | 0 classes/{desktop => headful}/wayland.nix | 0 classes/{desktop => headful}/xdg.nix | 0 classes/{server => headless}/fs.nix | 0 classes/{server => headless}/networking.nix | 0 classes/{server => headless}/time.nix | 0 common/documentation.nix | 11 ++++++++++- common/{puter => }/puter.nix | 0 hosts/{desktop => headful}/flamingo/hardware.nix | 0 hosts/{desktop => headful}/flamingo/system.nix | 0 hosts/{desktop => headful}/glacier/hardware.nix | 0 hosts/{desktop => headful}/glacier/system.nix | 0 hosts/{desktop => headful}/glacier/users.nix | 0 hosts/{server => headless}/abacus/acme.nix | 0 hosts/{server => headless}/abacus/backup.nix | 0 hosts/{server => headless}/abacus/forgejo.nix | 0 hosts/{server => headless}/abacus/fs.nix | 0 hosts/{server => headless}/abacus/hardware.nix | 0 hosts/{server => headless}/abacus/microbin.nix | 0 hosts/{server => headless}/abacus/miniflux.nix | 0 hosts/{server => headless}/abacus/navidrome.nix | 0 hosts/{server => headless}/abacus/networking.nix | 0 hosts/{server => headless}/abacus/nginx.nix | 0 hosts/{server => headless}/abacus/static.nix | 0 hosts/{server => headless}/abacus/syncthing.nix | 0 hosts/{server => headless}/abacus/system.nix | 0 hosts/{server => headless}/abacus/vaultwarden.nix | 0 hosts/{server => headless}/vessel/backup.nix | 0 hosts/{server => headless}/vessel/blocky.nix | 0 hosts/{server => headless}/vessel/fs.nix | 0 hosts/{server => headless}/vessel/hardware.nix | 0 hosts/{server => headless}/vessel/musicomp.nix | 0 hosts/{server => headless}/vessel/storage.nix | 0 hosts/{server => headless}/vessel/syncthing.nix | 0 hosts/{server => headless}/vessel/system.nix | 0 modules/musicomp.nix | 1 - 49 files changed, 10 insertions(+), 2 deletions(-) rename classes/{desktop => headful}/clipboard.nix (100%) rename classes/{desktop => headful}/cosmic.nix (100%) rename classes/{desktop => headful}/devenv.nix (100%) rename classes/{desktop => headful}/flatpak.nix (100%) rename classes/{desktop => headful}/fonts.nix (100%) rename classes/{desktop => headful}/fs.nix (100%) rename classes/{desktop => headful}/gamemode.nix (100%) rename classes/{desktop => headful}/hardware.nix (100%) rename classes/{desktop => headful}/location.nix (100%) rename classes/{desktop => headful}/mullvad.nix (100%) rename classes/{desktop => headful}/networking.nix (100%) rename classes/{desktop => headful}/pipewire.nix (100%) rename classes/{desktop => headful}/printing.nix (100%) rename classes/{desktop => headful}/syncthing.nix (100%) rename classes/{desktop => headful}/wayland.nix (100%) rename classes/{desktop => headful}/xdg.nix (100%) rename classes/{server => headless}/fs.nix (100%) rename classes/{server => headless}/networking.nix (100%) rename classes/{server => headless}/time.nix (100%) rename common/{puter => }/puter.nix (100%) rename hosts/{desktop => headful}/flamingo/hardware.nix (100%) rename hosts/{desktop => headful}/flamingo/system.nix (100%) rename hosts/{desktop => headful}/glacier/hardware.nix (100%) rename hosts/{desktop => headful}/glacier/system.nix (100%) rename hosts/{desktop => headful}/glacier/users.nix (100%) rename hosts/{server => headless}/abacus/acme.nix (100%) rename hosts/{server => headless}/abacus/backup.nix (100%) rename hosts/{server => headless}/abacus/forgejo.nix (100%) rename hosts/{server => headless}/abacus/fs.nix (100%) rename hosts/{server => headless}/abacus/hardware.nix (100%) rename hosts/{server => headless}/abacus/microbin.nix (100%) rename hosts/{server => headless}/abacus/miniflux.nix (100%) rename hosts/{server => headless}/abacus/navidrome.nix (100%) rename hosts/{server => headless}/abacus/networking.nix (100%) rename hosts/{server => headless}/abacus/nginx.nix (100%) rename hosts/{server => headless}/abacus/static.nix (100%) rename hosts/{server => headless}/abacus/syncthing.nix (100%) rename hosts/{server => headless}/abacus/system.nix (100%) rename hosts/{server => headless}/abacus/vaultwarden.nix (100%) rename hosts/{server => headless}/vessel/backup.nix (100%) rename hosts/{server => headless}/vessel/blocky.nix (100%) rename hosts/{server => headless}/vessel/fs.nix (100%) rename hosts/{server => headless}/vessel/hardware.nix (100%) rename hosts/{server => headless}/vessel/musicomp.nix (100%) rename hosts/{server => headless}/vessel/storage.nix (100%) rename hosts/{server => headless}/vessel/syncthing.nix (100%) rename hosts/{server => headless}/vessel/system.nix (100%) diff --git a/classes/desktop/clipboard.nix b/classes/headful/clipboard.nix similarity index 100% rename from classes/desktop/clipboard.nix rename to classes/headful/clipboard.nix diff --git a/classes/desktop/cosmic.nix b/classes/headful/cosmic.nix similarity index 100% rename from classes/desktop/cosmic.nix rename to classes/headful/cosmic.nix diff --git a/classes/desktop/devenv.nix b/classes/headful/devenv.nix similarity index 100% rename from classes/desktop/devenv.nix rename to classes/headful/devenv.nix diff --git a/classes/desktop/flatpak.nix b/classes/headful/flatpak.nix similarity index 100% rename from classes/desktop/flatpak.nix rename to classes/headful/flatpak.nix diff --git a/classes/desktop/fonts.nix b/classes/headful/fonts.nix similarity index 100% rename from classes/desktop/fonts.nix rename to classes/headful/fonts.nix diff --git a/classes/desktop/fs.nix b/classes/headful/fs.nix similarity index 100% rename from classes/desktop/fs.nix rename to classes/headful/fs.nix diff --git a/classes/desktop/gamemode.nix b/classes/headful/gamemode.nix similarity index 100% rename from classes/desktop/gamemode.nix rename to classes/headful/gamemode.nix diff --git a/classes/desktop/hardware.nix b/classes/headful/hardware.nix similarity index 100% rename from classes/desktop/hardware.nix rename to classes/headful/hardware.nix diff --git a/classes/desktop/location.nix b/classes/headful/location.nix similarity index 100% rename from classes/desktop/location.nix rename to classes/headful/location.nix diff --git a/classes/desktop/mullvad.nix b/classes/headful/mullvad.nix similarity index 100% rename from classes/desktop/mullvad.nix rename to classes/headful/mullvad.nix diff --git a/classes/desktop/networking.nix b/classes/headful/networking.nix similarity index 100% rename from classes/desktop/networking.nix rename to classes/headful/networking.nix diff --git a/classes/desktop/pipewire.nix b/classes/headful/pipewire.nix similarity index 100% rename from classes/desktop/pipewire.nix rename to classes/headful/pipewire.nix diff --git a/classes/desktop/printing.nix b/classes/headful/printing.nix similarity index 100% rename from classes/desktop/printing.nix rename to classes/headful/printing.nix diff --git a/classes/desktop/syncthing.nix b/classes/headful/syncthing.nix similarity index 100% rename from classes/desktop/syncthing.nix rename to classes/headful/syncthing.nix diff --git a/classes/desktop/wayland.nix b/classes/headful/wayland.nix similarity index 100% rename from classes/desktop/wayland.nix rename to classes/headful/wayland.nix diff --git a/classes/desktop/xdg.nix b/classes/headful/xdg.nix similarity index 100% rename from classes/desktop/xdg.nix rename to classes/headful/xdg.nix diff --git a/classes/server/fs.nix b/classes/headless/fs.nix similarity index 100% rename from classes/server/fs.nix rename to classes/headless/fs.nix diff --git a/classes/server/networking.nix b/classes/headless/networking.nix similarity index 100% rename from classes/server/networking.nix rename to classes/headless/networking.nix diff --git a/classes/server/time.nix b/classes/headless/time.nix similarity index 100% rename from classes/server/time.nix rename to classes/headless/time.nix diff --git a/common/documentation.nix b/common/documentation.nix index da6141d..26dfbbf 100644 --- a/common/documentation.nix +++ b/common/documentation.nix @@ -1,3 +1,12 @@ { - documentation.nixos.enable = false; + documentation = { + doc.enable = false; + info.enable = false; + nixos.enable = false; + man = { + enable = true; + generateCaches = true; + mandoc.enable = true; + }; + }; } diff --git a/common/puter/puter.nix b/common/puter.nix similarity index 100% rename from common/puter/puter.nix rename to common/puter.nix diff --git a/hosts/desktop/flamingo/hardware.nix b/hosts/headful/flamingo/hardware.nix similarity index 100% rename from hosts/desktop/flamingo/hardware.nix rename to hosts/headful/flamingo/hardware.nix diff --git a/hosts/desktop/flamingo/system.nix b/hosts/headful/flamingo/system.nix similarity index 100% rename from hosts/desktop/flamingo/system.nix rename to hosts/headful/flamingo/system.nix diff --git a/hosts/desktop/glacier/hardware.nix b/hosts/headful/glacier/hardware.nix similarity index 100% rename from hosts/desktop/glacier/hardware.nix rename to hosts/headful/glacier/hardware.nix diff --git a/hosts/desktop/glacier/system.nix b/hosts/headful/glacier/system.nix similarity index 100% rename from hosts/desktop/glacier/system.nix rename to hosts/headful/glacier/system.nix diff --git a/hosts/desktop/glacier/users.nix b/hosts/headful/glacier/users.nix similarity index 100% rename from hosts/desktop/glacier/users.nix rename to hosts/headful/glacier/users.nix diff --git a/hosts/server/abacus/acme.nix b/hosts/headless/abacus/acme.nix similarity index 100% rename from hosts/server/abacus/acme.nix rename to hosts/headless/abacus/acme.nix diff --git a/hosts/server/abacus/backup.nix b/hosts/headless/abacus/backup.nix similarity index 100% rename from hosts/server/abacus/backup.nix rename to hosts/headless/abacus/backup.nix diff --git a/hosts/server/abacus/forgejo.nix b/hosts/headless/abacus/forgejo.nix similarity index 100% rename from hosts/server/abacus/forgejo.nix rename to hosts/headless/abacus/forgejo.nix diff --git a/hosts/server/abacus/fs.nix b/hosts/headless/abacus/fs.nix similarity index 100% rename from hosts/server/abacus/fs.nix rename to hosts/headless/abacus/fs.nix diff --git a/hosts/server/abacus/hardware.nix b/hosts/headless/abacus/hardware.nix similarity index 100% rename from hosts/server/abacus/hardware.nix rename to hosts/headless/abacus/hardware.nix diff --git a/hosts/server/abacus/microbin.nix b/hosts/headless/abacus/microbin.nix similarity index 100% rename from hosts/server/abacus/microbin.nix rename to hosts/headless/abacus/microbin.nix diff --git a/hosts/server/abacus/miniflux.nix b/hosts/headless/abacus/miniflux.nix similarity index 100% rename from hosts/server/abacus/miniflux.nix rename to hosts/headless/abacus/miniflux.nix diff --git a/hosts/server/abacus/navidrome.nix b/hosts/headless/abacus/navidrome.nix similarity index 100% rename from hosts/server/abacus/navidrome.nix rename to hosts/headless/abacus/navidrome.nix diff --git a/hosts/server/abacus/networking.nix b/hosts/headless/abacus/networking.nix similarity index 100% rename from hosts/server/abacus/networking.nix rename to hosts/headless/abacus/networking.nix diff --git a/hosts/server/abacus/nginx.nix b/hosts/headless/abacus/nginx.nix similarity index 100% rename from hosts/server/abacus/nginx.nix rename to hosts/headless/abacus/nginx.nix diff --git a/hosts/server/abacus/static.nix b/hosts/headless/abacus/static.nix similarity index 100% rename from hosts/server/abacus/static.nix rename to hosts/headless/abacus/static.nix diff --git a/hosts/server/abacus/syncthing.nix b/hosts/headless/abacus/syncthing.nix similarity index 100% rename from hosts/server/abacus/syncthing.nix rename to hosts/headless/abacus/syncthing.nix diff --git a/hosts/server/abacus/system.nix b/hosts/headless/abacus/system.nix similarity index 100% rename from hosts/server/abacus/system.nix rename to hosts/headless/abacus/system.nix diff --git a/hosts/server/abacus/vaultwarden.nix b/hosts/headless/abacus/vaultwarden.nix similarity index 100% rename from hosts/server/abacus/vaultwarden.nix rename to hosts/headless/abacus/vaultwarden.nix diff --git a/hosts/server/vessel/backup.nix b/hosts/headless/vessel/backup.nix similarity index 100% rename from hosts/server/vessel/backup.nix rename to hosts/headless/vessel/backup.nix diff --git a/hosts/server/vessel/blocky.nix b/hosts/headless/vessel/blocky.nix similarity index 100% rename from hosts/server/vessel/blocky.nix rename to hosts/headless/vessel/blocky.nix diff --git a/hosts/server/vessel/fs.nix b/hosts/headless/vessel/fs.nix similarity index 100% rename from hosts/server/vessel/fs.nix rename to hosts/headless/vessel/fs.nix diff --git a/hosts/server/vessel/hardware.nix b/hosts/headless/vessel/hardware.nix similarity index 100% rename from hosts/server/vessel/hardware.nix rename to hosts/headless/vessel/hardware.nix diff --git a/hosts/server/vessel/musicomp.nix b/hosts/headless/vessel/musicomp.nix similarity index 100% rename from hosts/server/vessel/musicomp.nix rename to hosts/headless/vessel/musicomp.nix diff --git a/hosts/server/vessel/storage.nix b/hosts/headless/vessel/storage.nix similarity index 100% rename from hosts/server/vessel/storage.nix rename to hosts/headless/vessel/storage.nix diff --git a/hosts/server/vessel/syncthing.nix b/hosts/headless/vessel/syncthing.nix similarity index 100% rename from hosts/server/vessel/syncthing.nix rename to hosts/headless/vessel/syncthing.nix diff --git a/hosts/server/vessel/system.nix b/hosts/headless/vessel/system.nix similarity index 100% rename from hosts/server/vessel/system.nix rename to hosts/headless/vessel/system.nix diff --git a/modules/musicomp.nix b/modules/musicomp.nix index 0b70377..e78ed31 100644 --- a/modules/musicomp.nix +++ b/modules/musicomp.nix @@ -14,7 +14,6 @@ in { Compression jobs to run with musicomp. ''; default = {}; - # type = types.attrsOf (types.submodule ({name, ...}: { type = types.attrsOf (types.submodule { options = { music = lib.mkOption { From e4ef84b32ec67a002d6923b5e559cb8bef97751a Mon Sep 17 00:00:00 2001 From: Lukas Wurzinger Date: Sat, 18 Jan 2025 17:25:41 +0100 Subject: [PATCH 2/2] work --- classes/headful/cosmic.nix | 15 ----- classes/headful/networking.nix | 9 +-- classes/headful/plasma.nix | 27 ++++++++ classes/headful/syncthing.nix | 4 +- common/documentation.nix | 1 + common/nix.nix | 2 +- flake.lock | 110 +++++-------------------------- flake.nix | 7 -- hosts/headful/glacier/users.nix | 15 ----- hosts/headful/work/distrobox.nix | 5 ++ hosts/headful/work/docker.nix | 5 ++ hosts/headful/work/hardware.nix | 25 +++++++ hosts/headful/work/system.nix | 3 + pubkeys.nix | 1 + secrets/forgejo-admin.age | 18 ++--- secrets/forgejo-mailer.age | Bin 448 -> 558 bytes secrets/microbin.age | 21 +++--- secrets/miniflux.age | Bin 489 -> 599 bytes secrets/restic-abacus.age | 18 ++--- secrets/restic-vessel.age | 18 ++--- secrets/secrets.nix | 1 - secrets/user-guest.age | 15 ----- secrets/user-lukas.age | Bin 868 -> 978 bytes secrets/vaultwarden.age | Bin 757 -> 867 bytes 24 files changed, 131 insertions(+), 189 deletions(-) delete mode 100644 classes/headful/cosmic.nix create mode 100644 classes/headful/plasma.nix delete mode 100644 hosts/headful/glacier/users.nix create mode 100644 hosts/headful/work/distrobox.nix create mode 100644 hosts/headful/work/docker.nix create mode 100644 hosts/headful/work/hardware.nix create mode 100644 hosts/headful/work/system.nix delete mode 100644 secrets/user-guest.age diff --git a/classes/headful/cosmic.nix b/classes/headful/cosmic.nix deleted file mode 100644 index 3c3caf6..0000000 --- a/classes/headful/cosmic.nix +++ /dev/null @@ -1,15 +0,0 @@ -{inputs, ...}: { - imports = [ - inputs.nixos-cosmic.nixosModules.default - ]; - - nix.settings = { - substituters = ["https://cosmic.cachix.org/"]; - trusted-public-keys = ["cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="]; - }; - - services = { - desktopManager.cosmic.enable = true; - displayManager.cosmic-greeter.enable = true; - }; -} diff --git a/classes/headful/networking.nix b/classes/headful/networking.nix index 3fe1ecf..d7cd8c0 100644 --- a/classes/headful/networking.nix +++ b/classes/headful/networking.nix @@ -1,12 +1,9 @@ {config, ...}: { services.resolved.enable = true; - networking = { - networkmanager = { - enable = true; - dns = "systemd-resolved"; - }; - firewall.enable = false; + networking.networkmanager = { + enable = true; + dns = "systemd-resolved"; }; users.groups.networkmanager.members = config.users.normalUsers; diff --git a/classes/headful/plasma.nix b/classes/headful/plasma.nix new file mode 100644 index 0000000..e4a722a --- /dev/null +++ b/classes/headful/plasma.nix @@ -0,0 +1,27 @@ +{pkgs, ...}: { + services = { + desktopManager.plasma6.enable = true; + displayManager.sddm = { + enable = true; + wayland.enable = true; + }; + }; + + environment.systemPackages = [ + pkgs.kdePackages.sddm-kcm + pkgs.kdePackages.discover + pkgs.kdePackages.kate + ]; + + programs = { + kdeconnect.enable = true; + partition-manager.enable = true; + }; + + xdg.portal = { + xdgOpenUsePortal = true; + extraPortals = [pkgs.xdg-desktop-portal-gtk]; + }; + + programs.dconf.enable = true; +} diff --git a/classes/headful/syncthing.nix b/classes/headful/syncthing.nix index 0ec4025..89853f7 100644 --- a/classes/headful/syncthing.nix +++ b/classes/headful/syncthing.nix @@ -1,9 +1,9 @@ { services.syncthing = { enable = true; + systemService = true; + openDefaultPorts = true; overrideDevices = false; overrideFolders = false; }; - - systemd.user.services.syncthing.wantedBy = ["default.target"]; } diff --git a/common/documentation.nix b/common/documentation.nix index 26dfbbf..ac11bb9 100644 --- a/common/documentation.nix +++ b/common/documentation.nix @@ -6,6 +6,7 @@ man = { enable = true; generateCaches = true; + man-db.enable = false; mandoc.enable = true; }; }; diff --git a/common/nix.nix b/common/nix.nix index 75c911c..6b3bc34 100644 --- a/common/nix.nix +++ b/common/nix.nix @@ -10,7 +10,7 @@ nixPath = lib.mapAttrsToList (key: _: "${key}=flake:${key}") config.nix.registry; settings = { - trusted-users = ["@wheel"]; + trusted-users = config.users.normalUsers; experimental-features = "nix-command flakes"; auto-optimise-store = true; }; diff --git a/flake.lock b/flake.lock index 3d6c19d..da97c25 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1723293904, - "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", + "lastModified": 1736955230, + "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", "owner": "ryantm", "repo": "agenix", - "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", + "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", "type": "github" }, "original": { @@ -80,11 +80,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1735883199, - "narHash": "sha256-whedwR4P34Ne5xFLTdac3qMCiGTNiwME5U37M4wmisg=", + "lastModified": 1737028622, + "narHash": "sha256-O1QDc/KWWVf9BgWDoa7WKZa2cDMh5mNMb6BMNMxq2Q4=", "owner": "cachix", "repo": "devenv", - "rev": "d67d04ae2dd3bc3723e615003034ba752e8db8c3", + "rev": "4e5b00134bf03f16af6b25b80abb38c598cfe239", "type": "github" }, "original": { @@ -121,22 +121,6 @@ "type": "github" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1717312683, - "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", - "owner": "nix-community", - "repo": "flake-compat", - "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -164,11 +148,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1735774679, - "narHash": "sha256-soePLBazJk0qQdDVhdbM98vYdssfs3WFedcq+raipRI=", + "lastModified": 1736143030, + "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f2f7418ce0ab4a5309a4596161d154cfc877af66", + "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", "type": "github" }, "original": { @@ -229,11 +213,11 @@ }, "hardware": { "locked": { - "lastModified": 1735388221, - "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", + "lastModified": 1736978406, + "narHash": "sha256-oMr3PVIQ8XPDI8/x6BHxsWEPBRU98Pam6KGVwUh8MPk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", + "rev": "b678606690027913f3434dea3864e712b862dde5", "type": "github" }, "original": { @@ -312,27 +296,6 @@ "type": "github" } }, - "nixos-cosmic": { - "inputs": { - "flake-compat": "flake-compat_2", - "nixpkgs": "nixpkgs_5", - "nixpkgs-stable": "nixpkgs-stable", - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1735955646, - "narHash": "sha256-9KMkTtDYkZmqSZP6iKTY3zAcDK3xaD5gmiFG5siB8kE=", - "owner": "lilyinstarlight", - "repo": "nixos-cosmic", - "rev": "f8b8aa18abde0b84c84da69a86b7fb3761a4ddf7", - "type": "github" - }, - "original": { - "owner": "lilyinstarlight", - "repo": "nixos-cosmic", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1703013332, @@ -361,22 +324,6 @@ "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1735669367, - "narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1730531603, @@ -427,11 +374,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1735834308, - "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", + "lastModified": 1737062831, + "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6df24922a1400241dae323af55f30e4318a6ca65", + "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", "type": "github" }, "original": { @@ -448,32 +395,7 @@ "devenv-root": "devenv-root", "flake-parts": "flake-parts_2", "hardware": "hardware", - "nixos-cosmic": "nixos-cosmic", - "nixpkgs": [ - "nixos-cosmic", - "nixpkgs" - ] - } - }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "nixos-cosmic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735871325, - "narHash": "sha256-6Ta5E4mhSfCP6LdkzkG2+BciLOCPeLKuYTJ6lOHW+mI=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "a599f011db521766cbaf7c2f5874182485554f00", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" + "nixpkgs": "nixpkgs_5" } }, "systems": { diff --git a/flake.nix b/flake.nix index ef31959..381ee7b 100644 --- a/flake.nix +++ b/flake.nix @@ -3,16 +3,9 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - flake-parts.url = "github:hercules-ci/flake-parts"; - hardware.url = "github:NixOS/nixos-hardware"; - agenix.url = "github:ryantm/agenix"; - - nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic"; - nixpkgs.follows = "nixos-cosmic/nixpkgs"; - devenv-root = { url = "file+file:///dev/null"; flake = false; diff --git a/hosts/headful/glacier/users.nix b/hosts/headful/glacier/users.nix deleted file mode 100644 index 7947add..0000000 --- a/hosts/headful/glacier/users.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - config, - lib, - ... -}: { - age.secrets = lib.mkSecrets {"user-guest" = {};}; - - users.users.guest = { - description = "Guest"; - uid = 1001; - isNormalUser = true; - hashedPasswordFile = config.age.secrets."user-guest".path; - openssh.authorizedKeys.keys = builtins.attrValues config.pubkeys.users; - }; -} diff --git a/hosts/headful/work/distrobox.nix b/hosts/headful/work/distrobox.nix new file mode 100644 index 0000000..5b6e13b --- /dev/null +++ b/hosts/headful/work/distrobox.nix @@ -0,0 +1,5 @@ +{pkgs, ...}: { + environment.systemPackages = [ + pkgs.distrobox + ]; +} diff --git a/hosts/headful/work/docker.nix b/hosts/headful/work/docker.nix new file mode 100644 index 0000000..9dee2a5 --- /dev/null +++ b/hosts/headful/work/docker.nix @@ -0,0 +1,5 @@ +{config, ...}: { + virtualisation.docker.enable = true; + + users.groups.docker.members = config.users.normalUsers; +} diff --git a/hosts/headful/work/hardware.nix b/hosts/headful/work/hardware.nix new file mode 100644 index 0000000..24f1ac0 --- /dev/null +++ b/hosts/headful/work/hardware.nix @@ -0,0 +1,25 @@ +{ + inputs, + modulesPath, + ... +}: { + imports = [ + "${modulesPath}/installer/scan/not-detected.nix" + + inputs.hardware.nixosModules.common-cpu-amd + inputs.hardware.nixosModules.common-gpu-amd + inputs.hardware.nixosModules.common-pc-laptop-ssd + inputs.hardware.nixosModules.lenovo-thinkpad + ]; + + nixpkgs.hostPlatform = "x86_64-linux"; + + boot = { + initrd = { + availableKernelModules = ["nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod"]; + kernelModules = []; + }; + kernelModules = ["kvm-amd"]; + extraModulePackages = []; + }; +} diff --git a/hosts/headful/work/system.nix b/hosts/headful/work/system.nix new file mode 100644 index 0000000..a05de83 --- /dev/null +++ b/hosts/headful/work/system.nix @@ -0,0 +1,3 @@ +{ + system.stateVersion = "24.11"; +} diff --git a/pubkeys.nix b/pubkeys.nix index c0a572e..ef402fe 100644 --- a/pubkeys.nix +++ b/pubkeys.nix @@ -2,6 +2,7 @@ users = { "lukas@flamingo" = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAztZgcRBHqX8Wb2nAlP1qCKF205M3un/D1YnREcO7Dy"; "lukas@glacier" = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK4U9RzV/gVGBfrCOye7BlS11g5BS7SmuZ36n2ZIJyAX"; + "lukas@work" = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINjvkQeQhAlS+e5EJOXW9Lqd3/uG9qNLIO0NaMFCA0Ew"; }; hosts = { diff --git a/secrets/forgejo-admin.age b/secrets/forgejo-admin.age index 42485b0..c1310ee 100644 --- a/secrets/forgejo-admin.age +++ b/secrets/forgejo-admin.age @@ -1,9 +1,11 @@ age-encryption.org/v1 --> ssh-ed25519 SFHVrw AX7EqqMZLaetIHP2UX3tAah1sM62HC4Q6yQN+GfI/mY -ZjQ3rIVxjUKvH49WsQx5GH1Xrt5YhcQV1xGy1Ha0QVM --> ssh-ed25519 S+dwQQ srmW8YUI+usZdBng7/vYefhK8U7h8lhmZPnQBXIVyzo -PGwiccVGY9LXWwKjaNCNajYiqQeNftGdURSlU+7i6/w --> ssh-ed25519 ffmsLw sezlUhl2yIHgR6igudKrnRaYlowBNT1mTZPmJL83G0o -vBpTR6Rl4UGtFbdPKrl29QpzyQV2RkJJ5OF5a9TDlzg ---- gpOgzSPpqa4CN+2v7jBkc1CBHJblq1NHlr8bDNvM3Vk -.uc'߄ԒotiPrty ssh-ed25519 SFHVrw 9dH40GoNAJDxel8PMA1HvlveV7N7YL2pljFOFRt3pCw +VGoCzz+hMzEevY+oyNwqD0SBAszyFlDKE75vgDomnG8 +-> ssh-ed25519 S+dwQQ QK3rIe3qP0Q1bTNS5U66b6oNzBQ/sWHIosidrTPcQSA +FCmCsZQFg1NJr8ZkFtMq6xKnhCqCy9WlhnZ9UCwNzLQ +-> ssh-ed25519 bPbvlw aNQ8AJ44P2YL13lg4XTGus+bCc+QnixRSRUYYvZlShQ +mxYbEYod31eQPE6Q7RjeHLStyO1Lzgy6Uc5FOnfs+LU +-> ssh-ed25519 ffmsLw 0uqp9oR4s4tuaq8jD1zuRJxE0HD01bb0G0MXfwCiBGA +x7WHC+J1yT5uiXP6lBq/bZBwvmrRlSHt7UxKmyBEKKQ +--- zqNQjfCKC/l6wntS69NEHjuc1brikhaBTjFezL9vFL4 +C7%: 18 $~9@?Ÿhvyokn5 \ No newline at end of file diff --git a/secrets/forgejo-mailer.age b/secrets/forgejo-mailer.age index a20342c5ef87d7c7ccd2c1ce3fcbfe0e02e42721..8a99ce6bb63c5920a8a883bb9f403a39306ea7e2 100644 GIT binary patch delta 505 zcmX@WypCmpPJKvjQhre|V^0hg|wLUD11 zZfc5=si~o*La=s9d0?P|p>JYhRf)5AT5w=kYDv0@MSYTspQV#$VR%$zak-IOl4EGT zOF)@^dS<#KSAL*nxL-t4fJazpszG*Gut`Nprc1i1VW_uxMV6CEPI#(QZib0rUSvoz zx^+nbNo6_Z3RQll&S6fu#%ARnZf=2DE)}7f`GJ-0X&xzlNx8lr89`>IIe`|=mHwIK zp5CRMq(dE^zFnwh0(=UD~>=B8w4yG0aNgnCt_bCu_tgqemFCP#T? zc>4HdX1E6?dKQJGTBJHx87G>%R~nX-hZ#E?8wBMhbLr~pD&*&;`IeWYmPO?S8k<^V z8s%FQdwcmf>Kj^kB1xf hcC;1#Xdtoh&hdQTX`B7EzoyPKYS#@dSZ#LVApm)mt6~5E delta 395 zcmZ3-a)5b)PJO6ZMpa6NL4KLLajAuONnmAUgnm(gOSn%!RFp+xVNgMNiFs*Gs!Nuu z0atQFL}FD$eqv&AVq|!snQ2r=zKLmGq)Bq1aX^VlL8wVdTDV6_WnOux1(&X!LUD11 zZfc5=si~o*La=s9d0?PIshM#^mWgkKMU_REp|iffwp*!oRJd!QqhG4If4GymwnuWd zmrq4nzMH!NSE06( z-v#HhgX^yF|yZSO*Fv*aK@XA^&~w7~o{r{of^q=2NN%Bl!Yt^mUz zlfj5{tBBO)Bf0#~|EGt|s5Yu^RL;sa6qBXO=0|4IviHraM diff --git a/secrets/microbin.age b/secrets/microbin.age index 6fcba36..fc8f389 100644 --- a/secrets/microbin.age +++ b/secrets/microbin.age @@ -1,10 +1,13 @@ age-encryption.org/v1 --> ssh-ed25519 SFHVrw TkbWIX2yad67AIqSP0DUUzcpViFHifihErZwkzz3xFQ -YORNt67kj9l85z1hNTKQM6fAL/HtGcM3wzE5YZuFCs8 --> ssh-ed25519 S+dwQQ NkzIfNX9W9PixBFN9AfKc3a4GVcx5wNcrYjsJoknJ0M -XuWOXdC2oRruDeTd8iKieiJozsqgm0e9LaJh/VFRgjU --> ssh-ed25519 ffmsLw vxKLezBR2pJ5PAYmUUt+i+Lrr+RxmMhJBBBvcHfU4VI -qS7oUjBXaCQTHTeHzH4FjT1k1DPQVEMhuI+DcgtKIx8 ---- 1+KVV2W3RuOVgdM/9nfQifQVlyHW30Pom822E+W+N1Y -ԫ^p1QHQC4P1/d@.ڒUW7Úc}n9oBەI4sG/tdy#t 3w8Gsx'Qtk5b?W(oIMܚȕ||a-t&0?o - \ No newline at end of file +-> ssh-ed25519 SFHVrw tNbCa6mX5iKQVHYzH3zvY2G9WVH6XdrbznOH2Rk2vSY +SoHf0SobVw0xFhAR9fCVsARNTc77NNaJKJhXoVxuR08 +-> ssh-ed25519 S+dwQQ VNBre/TP6A4Wi3DikAtlS+R+Nd4qbA/3rCT43yDhC0I +G5IbJ1Qu5cqtwqXmhKXj29HjU7flaKTrVhuL6ZGsCwg +-> ssh-ed25519 bPbvlw Q9GIzAbJ4CKedyoIyvlWDy28dMxu96vJ6mo10YMFIik +/q1TMLjD24/px6Js3gJU/1yRh1vVXmKGzmgO5kHp2Sc +-> ssh-ed25519 ffmsLw TgwIrHo+kSs/UEl1KU+npeVaMItnMeP3NW8FByzHcTg +6DOj+9BQxf/UyRYBwds1pbZhjoeZW/YobJcwmNejpPE +--- xlK0luDTDWaLrv4RQN5w6QBKdcpjhMgDJ48DZ6FImZI ++,*HZtvp_G6~voFE{(r>7y) +\l jWL5V+u8'x;?^Yd} +y=ERnn݀ [yf:7llLH!% \ No newline at end of file diff --git a/secrets/miniflux.age b/secrets/miniflux.age index 898de759540922ad7482243a39a964c853fba5cc..fdf0fad6782774d05209fdeb2eca83d77842c9dd 100644 GIT binary patch delta 546 zcmaFKe4S;2PJOYjPj;cPg-4i4j(LWolaZrSXrXJ4Yq4cypkauGSEgm2ua{A_rBhIN zK9_!|c1nt&Poza=sb!RNUant6N?4{#qFGW=rnh%?M0in9Zo0O+X+c4-?ga%UuD->A;b~E(ZvKhB-ckNRdFGB4Rgor6o@I{i`r#4UjuStM*L#MU z7UzUymq$hwm+L!KI#m{hWcmbq1QZ8)lx3C$8r8;2Wa zmbfNnSNNA^2RWOC`X&~58>E;R7K9~Nq*fS5IQpAdaOvvmDn$C4<@lGGItG-am3X>Z z1O*zWX1Qd!ntQsZ=lPiU7MkW4CKdZ;d*=mvxpMum`Vn?*YxhGBm8aJEeL4qax$iXY zi_csrWzCx(`5>#?VBVwqMh{&nUlAng|?S|Wu8Uy ze6td->>@|Esw~3{eUr*UkFuo5w1NuP^ibd65|g~b-0aYDE?r$+1xK$Gch@{` z4`=r@KTkiWKogUYtjYjO<6K8=|6(%_vjY9VBoo5`Z};3%S1#$+ReJ&o(vz>PQqA1r zps6>Xsn8>fk$JHb-+{+dreDx%4=;YF>cx_5yX}R)V{(qon?GxkS`OA9KQ6g$+mAgV gPrO(C4qO-K8+d6?p2V^;*IT@^4WsjZU;Y~p0QUl#egFUf diff --git a/secrets/restic-abacus.age b/secrets/restic-abacus.age index ab6073e..bd2b50d 100644 --- a/secrets/restic-abacus.age +++ b/secrets/restic-abacus.age @@ -1,9 +1,11 @@ age-encryption.org/v1 --> ssh-ed25519 SFHVrw qAbBwykCd+ep5gMH5b3Q46DT6T7++8n/d5wsYK/A/yU -x5vVOXJkTOrgxeQv/rilnNSfbKNaXTqVXewpfo+t4dI --> ssh-ed25519 S+dwQQ 5IWRUJAkmEgncU8wNUWucnQsRw4+Pq+aGRFowTDi128 -1LWbLF92Q7kCh6udDygMfxV5SFqSDeLOJjVjeajw3JQ --> ssh-ed25519 ffmsLw d31xv9QtwoUsEiH8bOJwZfJOO+8TBiTEGFYMdHpAaUA -JjUmM4rBoz3xzCRMBpAc928T3IAnswy0VQ6DiskBmdU ---- NzON8ELsKnc8L8mqMZZlKLQ3jnw9Sli/eykkeemx080 -Y~Xx 7YϪXLL`)I,"P h;f"T \ No newline at end of file +-> ssh-ed25519 SFHVrw G1A9IO6ECBAnXKOjJwMlDjFSTLy9wuhQs+aj8PXuvwA +KoHzzO0Ph+/TEQzR7Q3vnboRHoye3hVdNiPacXEaNiE +-> ssh-ed25519 S+dwQQ A1M/dWIKWe19H+RwVqkvAaj1F3IOG2t4be76IReb1wk +fHpcQDg0heffeFbeclcY6p/nP2mcmNs+7s0TblrR1zk +-> ssh-ed25519 bPbvlw OBlQjH07EHcSIj2PP/niqgcJvraJjzSiaU9Mzdaixgk +s9iBEXPvrAG77xrEU/upbR82UXnHc0LwTwhpXJihAE0 +-> ssh-ed25519 ffmsLw ibz7P1bDTFcp67VjTaZDU3+fNguEz6H+dCVvMfEb6CE +rjUrjtSwNmh1HW0xI2SNNFBVSXF/qSBgnxDrEbgkn5c +--- rP2V1uNQoDB8MuZSsfje/Vms0N3G/cG98ouy3HbSdfg +'#gT4k' -ت1(T> ^gN \ No newline at end of file diff --git a/secrets/restic-vessel.age b/secrets/restic-vessel.age index 8646b01..c4911ee 100644 --- a/secrets/restic-vessel.age +++ b/secrets/restic-vessel.age @@ -1,9 +1,11 @@ age-encryption.org/v1 --> ssh-ed25519 SFHVrw T90IpkfLUbCrEQEOvErDVp/uv36oCPfZ5QthIEz1uG4 -6ge0ldLTgXJOgBabC2VzElNYg/CpWssd+smNo3JTgBA --> ssh-ed25519 S+dwQQ qJrUqmj66/eDDvYPbcohc+IA3YwhDDOyfCwxI4jLxUI -yDFBlLTSfJXzvvGhW2DbJVCIRYQDEL9WML1EaUAtXNI --> ssh-ed25519 Sm0lOA cEd39ojIF4yab0JWV/poybmF4kH6ub9/tTXRXLS0ghU -rA5GqgeruK6Tscay6EnBdHmM5edR0kF4cg+iGPAZuTc ---- 0CvvxtMR1IyIhsNNdwAuh5SWqwEbCtIVPi/K0yeheLM -okj2dBѿgez.K@rw{SzjW \ No newline at end of file +-> ssh-ed25519 SFHVrw VZLiEt6pLSeIDOm+284nFo2hD85Iyc0NpVn+Rey8FWc +4q3br1P7JM/PSlG6vCtJO/CiQqLVXLxtfK/lCY4HhZE +-> ssh-ed25519 S+dwQQ xOZrxWxz36yhKO0kAnJKcX3Y9mnoSULbw/UIxaBzO1I +dzuEybiRgrs81j7axLCsENjMVr/DTVhTmCypOJP+Q10 +-> ssh-ed25519 bPbvlw 2/vYkg/8kG9ifWC0TUzpnc9hN73PQJdZlxDU0lPr5FM +nj6eGaULzKlCyKk8IrvpFPk8tbIV7vldq5UooMOXJEg +-> ssh-ed25519 Sm0lOA 9nkSVidtXtGUp3QcfMIPFXbdyZnDslb2FRFANXon4RU +ChFong+DTCiRjgtIJdRJ6AfKCDZm/Ibm8SSysIYKTb4 +--- kQmvif7LH8dOS7KvYphgj2npxYxhpqhi7MGGVCWJiDg +EzwWj u?^`>Y0!\ zAC2 \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 111ffe9..5249bb7 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -1,6 +1,5 @@ with import ../pubkeys.nix; { "user-lukas.age".publicKeys = (builtins.attrValues users) ++ (builtins.attrValues hosts); - "user-guest.age".publicKeys = (builtins.attrValues users) ++ (builtins.attrValues hosts); "microbin.age".publicKeys = (builtins.attrValues users) ++ [hosts.abacus]; diff --git a/secrets/user-guest.age b/secrets/user-guest.age deleted file mode 100644 index 99525a3..0000000 --- a/secrets/user-guest.age +++ /dev/null @@ -1,15 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 SFHVrw 4jAZDtFvwOfUUK8LgLSCTElHNi+QilqWQyP4C/LNflU -qpvs//hyzk7nTOqc7pu/rFY4xAL9TVFzjle8l/gPveU --> ssh-ed25519 S+dwQQ DK4BzHpq8fupZaiyxh7VQ5qoSY5iSEyd4Kv8PNrz70I -TmbFc3XbyvLESnAkLqFSfRskExzRcPVP8MfKHr/IkNA --> ssh-ed25519 ffmsLw qY8W9fSy5UuhbeGoI1K+wgQvqrw9ttcNOYelmt71Kng -t2JX4gdYxn6OlKrqXqufwcRrUbOPAmjxXXZnDHkYlSw --> ssh-ed25519 d2fKsw 3rX4vasW2uHU+bC/YFE2xVvHOFCcz7vmlLPbVrmzt3I -pJFFn19v2dxKM9+6fwW7dBBqXGePHx4LPfBdTg67DHE --> ssh-ed25519 US6ATA +UHEcCtfoYaTs0U/hI7xLRfw/ZZAJRmqVfAXjgYh/Hk -Wr2HWbLJAvIRCuCeepwEVFCRRu1liER06ErCYHDCWgo --> ssh-ed25519 Sm0lOA smM2jccrg/AodVMaG8TAXmi+kRTY7Dn2C+50VObvVUg -TV08Asyq60sVfyiveWJ+29zf4kfJ/l0SAKm1otNSHKo ---- DWHY6OyVQuPAcCZWMTt8I2fjoino1r33Dx1Mrr8NqoQ -LWR҆\%^JxbסL(7v.⥈̍7 ""1|i'>6>R+֊DHƃ57X` \ No newline at end of file diff --git a/secrets/user-lukas.age b/secrets/user-lukas.age index 22f8fd97e97fb5cf4f061b3cc9127ea3bd842e8c..e70d73e5bc1c9a91e617dd9ec5c7de8b7f7d6d32 100644 GIT binary patch delta 891 zcmaFDc8Pt0PJKY8ldqF;iMf%xcTl!lXt;B6hG$BmPoaUANq(VmS$0UOr@mXIwqL$c zK37q3p;umLQE8GzKuKtRNV!{5c}YrSq;^tBWtfMFhf_eVxxcGHx`$;_GMBEMLUD11 zZfc5=si~o*La=s9d0?PIMqZg&MUa1Frhj2nZg7TMUVWZLmans=X=QGOv2#(BV^Nf^ zL9)NIXH<4RS42ffenFADTT+2`MTkLuNmWXaYkpWre!g#owtJXia$;a$c7S$BL6v(p zx^+nbNo6_Z3h5R;PT_u~?&fJxc|JL&M(&nLu11Er=9bO{2F3wduEt)bLHb4c`Q|}R zCR~AT2EL`~`kt8?{z;kUhRKm00p6uK&Q9TlX%-%)&Xs9-Wv<0}Rqo|Up%Xufhnu@= zM;7EJmm6glm-?2M2OEc_801FkJ5`n!JLd-%7DZO&N4l7q6}n`4a^-~-Wx9Kr7DSqa zWrP~$>N{lzxSJIFI=YzW6}pwW85=wLJLZ{$X1JFbOpa$14^Ij)E6k0sC^kzk3eO5p za|&|JNz5<_Elv#a4=wWy_jNQg4o&tB4Rm&Q<E>F_0 zjHpV~t~5%qv`EhiNU!uQb94%EoqU#2ygta;Gc{e`$ugzPJ-{iY+%h@Y(^T6(rOc~5 z*fh`FBE=}!G1b)BI4nD?oXaCTE#0NUEvwMmRlmeLC^;%M+b=06B)cfUFxxrNIV~tS z$K1@Lz|1E-6g>ula}9F*9TiMnk{!L03vvvq(u|y(Gt#{31AHxv%R)`fa`pW)OIALqc0}S&Eat%C6QZhZ=B9gi0 z91df(|GMi{z2|}kuSB`Na;7K3!6El_P9;xM?yd3LW@fwnmt*tPGtMjeetIR}+;X&* zb=^FbKg-<+!l)iySVo8B}c8F1KWm-mXdXAZ;t9E{Qc%*w^kXf4R zV>i=OzXFrga*s??qwtVSqfk>%3w_6Ou3)1g zkBGwZ0^_hi&&1sF@L;dh-Ce0qdbCA zG9p4vjExNQ3myIPLrOdY9V088O9M=@JhXEy0s?ZqEet{fxhmX33#vQ~Eewj&48qDw zO4BUDLV_#8yiFrRwF50ZOOq1wow6${bNu}*(1R&7*vv7+QNi5LDXYXdsxZAOw9vxR z&AqbTFQro3*gw%f-_gj})Urt5F|xodI62!VIGM}1q%zga)6hJy+$So-!re48*Pyi6 z*TdK^+r7dlJ2fOfJJBq>Al)b{JRRM-;9P?oe@BH(N0+QbQ=f{+fL--1_vaBDX-Jg1mCBlmd63!q8Bo!iu0Ww_wXa7hiMtT$hwEKNGk7 zDvRu-pv0g^XKmv^mlP8&U0q#;921wyV2`Nm0*ttekM){Hj2%l|7X+W}ez$Dx$}d{Yjmr#%sp6>kM6A&YmdjeIj@AZu@CtvCws7O&Nv& diff --git a/secrets/vaultwarden.age b/secrets/vaultwarden.age index e50d808fa712c4c1543dfa881e2728775806db2a..842007faba4ca764fad5bf17d3283fbcc2f36c21 100644 GIT binary patch delta 816 zcmey$`j~BkPJMZpv9@cNenqi&c}aeDP+nE0SE!k3s#j%5c5$#@rhbM;XjW*VezLiX z0avJTgh`NgSh90oXr^JHnMp==n2%9|SeRr*zae$K(k0haz1K}i=@*CR z<>i`01(#Tqq=)F|m$+w{WjW_$gqUX*6=a)b_?i}ba_Q>oDpZCSrkbUDc;&mgrF&*Y zMW*{@miiQC7&{uJW@hIam8Il5)mH{&24-njm~bWiJypDTRYp?i|0|aJRxMumsb=cG znx(mWwf4SS)Aeq_m*1RUmrPnv5^=fC$o_iC$)soEdeX8i+2wza#Vp8EI$iOjo`XZx zPLOTmi|2cG9gPz|xI;Gn*tuI$Ps?8be{+d$%bXw+_#;ogtn&k#k!DkHeC;V}Gc;xr$e=pBH<~j3M zLw3osX$&n5%9{eem%o#lwMbysjIjLE0sH=6HQ2hgKt|ss`O&#uZ`OTV#=tjMgQe{}Uxt~F3v3ru| zk2)CrdlGNPNsC);|@C>tD@8A;iRKJ`OOS3{#Lw}R(`ebuYUw;=PSFR5RrH2iczZY}4E4O$X z-{nFc+rR&qc7F2b-EiUeP1d>FruhjKzuGXf=hX2$PA9+b|8^Do-w}?T_fq@Sy3J>H zE6tGi-LzX=d-{UVeVMmU@K5W>liS}?b5UaJQpI~$KRK^yHN2zzQ9tE}>cdNV3PNi( ziEr8U|8Lis`iYM-0O54ct_=3g~)^mE#tBMWxdG)UP zu`8r_bz#T)+t(vRZeIJbhjsFscsJ<j!-bp>Kd*h(A~PbdGTc^` zV>eH}ec!W~XQK4V0>6@|C3hnZDv7P^Wo6vkUq>cGd+lQ$9R8 zDHp$W_w$RhcB(VY{C(Y|wyEfa;OVXpx5IrV+QnTwuk@J3dD9b@;G)E|&1?L=@tc2H HUZMd2?QSaC