From e4ef84b32ec67a002d6923b5e559cb8bef97751a Mon Sep 17 00:00:00 2001 From: Lukas Wurzinger Date: Sat, 18 Jan 2025 17:25:41 +0100 Subject: [PATCH] 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 literal 558 zcmZY4yRMU90Kjn*V@z0GOk9X7;ZUxHK@$pxaw(Lr1$x=Id|cXcDR9c=1&q5faWc-v z$#+l(cN61s9>BrD-7_Cw;Q!0tPaqD9upX*5D~qeLPKXPM;4jgpNpToaEK3ULT2Z~a zL!CUZ8J#ifHqfSoictsRoOx9-T5Dfjwj9_P1Yd#!y=4%?tC#u>7_}(l1}^MI>TrOZ zpYBuVTJVe_rh7@eWSZ|x{?o9i0{|sW-yd7ah}Xb_ZNl(@YzZ^%yxH%Xj#2{AEoJ*c zBv~RNB@i~&Hn3ICg_EPVX8Jah6P9$1X@8h8rwyFtDMJ=JC%mr(c5pd$=xDK$H_K_R zQxydqc$U7Sy79I<+vCt1p6*^JSy9!cl9wrx{~o& z?;P&+R9jeCItRX1JCKLcNc+?IK(?JnOY~%w-@V~DTIR9YweYep0L}6lRq~CYFGPam z)v&C1tJ6Uf?G}Azm57mjdjE$1{^jx2qh~)~W4Aw^KluGneDUPZ5e7=iZzmCm=7IZT4Q%t zn$EafP-HDi#CTn)BOJnM6bwP@xZQ|~+~VqO61@5I+gN7@H(T!V`|7Uw@a@)ky6yis Zy1W02eWafrKEL?+<@)c}N3Y-i`w!m%iHraM 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 zcmZ9_JB!l*003Y?r0`G~jz5=5Xq ztnjI(p#m)o)P`C`>BY1SgON%jG>&05?LoaZJqN_uIO)~dAeb^jEUEo2RuK(>>x#0! zNv4^OQniF+3#tZ^JAckBYYG;7ZFjDB<9UHvP>ZPT@U3byma2)9w4lT@z^cG14mAK~ zBR?S`6;X@Mlrh{?oVjwj)Det;gDkWdD81B95seg49LVSMIbA4uVuF#)X@6Q{a9Kj^ z5j|oyYwW=1Q6a=8p&1J<=eOz%aJY4-e0aG!s9yNKJ-NT}_WX&@H{V=yo}Ar2HPOG0 zR?y>bU*LnE!z)K_h&z|gos_TcZQXu#>-60p`=5TN>-+ES;CsT_>*Igl-+Q?B^wI9K N-PQB;i`QS+{{WYaz{vmr delta 436 zcmWN~F^`i_007{ecN2-OYFxV9pvVDt53Wtr2psU*M|(Ud_O2#g1WG9sXiK4mrHjVZ zL=y)G2NQ?J++=R*pwq2J6HQ!o(8M^KoF@AHf$#IikM+mb7rQa-=u3-myi~@N>zbIaxRPToYH~dY3frwcbntbTE!&Y8O9Z8nT{WZj&%o?sF!7&(otYq4J?N#>zW?9iZ}$CbpV>% zGa}n7k&P`H6!#60i4O`S_vTdu8OBfp)Zs=lk#8v0X(b~lYV!Q 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 literal 978 zcmZY5Nvqrh003YVija$fHxG}17cm`^NhZleTu3rmXGtd8yqS|(Cd*_`CdtfTMNrU- zJqYSWMDfy-#RV(xAcz&Aco3l!4}Boiiy%c%OO*$De*Fa>e0H$ztuwdU7uzV$p2@2K zZu>y*1+cEe-r7TPyib8TFIrUxsu43~uq}xSV=d;*1zU%bXHQB*9^@s~#>QHL`8_nt z(HyAiQqIh(afa&F%#DtBx~;cdLXNSw#DU1DDXDNsAX1L|fChQpd=7?LOYAgd87bu| z)k8kZhMOr%;rn!lvDJ#MR#U`PSZNjK!12z=i%Q^~0@@i!zCCyvms>`jPj`@D^<8^D zk5$Mh4nllhb5y5IIxrYcn8mCSNPm@05*!sMheP`*NwEcjsT&THHMq)iQey_doJXcj z083G*I1$-*m!dju5|&w%{!ql(y`QyQogIYEG0$thpVpHOBn4<$q;7}Cbu;Zc9kVT*-v36R)s-5rAK5|@(qt+v_fYCGZb3n zyyl_)xb8s5Aj zBZnTU(`%f?tk~)Rap4D}9lt5Z9K0QC?rI&+oWzJLwI8!K>uY*K5@JD2f(It`6iE~s z#78bIyG4Q=e3W5BUsk6>tTk~Wg_Woog%eMhHTuDDV-8qBt3i!8Hsk6GCrC*|S<~BS zQYscgNrMrcnEjb;m}$EHf3nvD>11v-tpo=fu^x6?SwjK?LLIl6MRKh6^CCsWtrtoB zu?xKat##qWzfOLWK73WSk1lr)-+5d&PA}eY-+l6}muFuR&tLn8e(jwf*ejRs%kIx# ze0S->Cm$STXP-XumEhj^`j@L8-`D){(Yjx@?&EkQLI+WRlrTW-@tA#zV;@lT4DyJJ}?I ztgx#Tw8e`;t)dqZEEIZb6+IP-uHvCyJbAJeK}A=}_Ex;F-yir)cix&uR@Nki7e^a$ z=EA!u(0UEb^F?cJV!pwxwbD$Y_AdR2EvEtFs3n_>|`))B&=)&f@}eJ(ahUCx+zt{ zbV2nd#Qd~foxw-n`_czJ4jnl!uFQ0y+ zfA#q1Q|~+T=^2ancXT>JaVH_skCqnv&6Yv$ViC;tINSS*PE diff --git a/secrets/vaultwarden.age b/secrets/vaultwarden.age index e50d808fa712c4c1543dfa881e2728775806db2a..842007faba4ca764fad5bf17d3283fbcc2f36c21 100644 GIT binary patch delta 816 zcmV-01JC^R1>**gEPr=aGb=?_FL-lHcXV%SQf_)_N>w&BWlDKeYjaahX)kCb4)ifa&2!4Y;tQ@G=F-mS&QgV1lR7FWpXfj!7O;bTdNHRl7 zRxf8kQ7{T(NkeT$G-@w%S8i@?G+I-1ICN)JFK={5YBp*^Y-m(BX>xFDHfT*Xb4dy< zEiE8tV*Sc< zqpE0PRsYmEzN(|4@_d#4e5Gx@D!uNkiteEF`w8`=lAv^0(|$5P*L2BZ<`*s-9RzE4 z{l;9NZX(Ng_!MGh?#?IOr<#*^|t!`8pXYw$`}v&o zBGaX+V6KRSr+(;77{lWyUl?L5_D)6mlz-)xY0QCY*AXdqFd9?LFmI6jLgB>wtN!WE z;|$FGC>^AxmH>o+BeGHVckUdTq7b^6R&UEtzW>!QwXJX*FGOSF&bsWb_ND+1ohauM zgCpPd?M6R@XM`vq6DjI{Z8Yrk`4_I>7@whR8}=(r^5v74HV>gLSMTt!YJqLcf>hg3 uvWt9^<{@Mb;vbY;aubY`mr6NvJmhcq(|7x{Yf8pC1(Bs(#OM01u5iypDpw}} delta 706 zcmV;z0zLiX2K5DyEPr}qax`#vYi??7YFcnoZb(y4HC1_dYj<*OQh8Bmc3Lz-QaErn zR6#gYa|&oHHh6hZb80nkabr<>Mp-puHf2geFF9pdNN#yGLPIxpWG`<~FL7EnX9_Jo zAaiqQEoEdfH8n9gAX6)3cTrIwG*3@(LU2T3S2#j;XHRugWkzpDH)u{#NJMK=cyU&D zQf)y+GjMfBGfQl93Ti7_YDP77YBo)3H8Vm=dO>7vH)J+!L|AigRBcUdVtH0qH%>5B zb4OxHlV1TBe|j%THF#-caYJlwSVm%TbY*RIT5m99R#h=rNildcWpY|FHCa|cR%BQ> z3O8+fbTUk3YjIU!XK7MqIY(uBFJVh_cXoJAZALFPWNLXfLNzf?cx5+53N0-yAb2@c zPgrwHOlV0{SX5S6S7E@=p!0(EHg1owk-v5_9UXnT*QEZV5t8_x`$bPuvq-p6M&T3gv;CT8u>|ALD5M3>F6Vl4F}_NTs`$E8bE|QP zuiMvH6xr7Jyaki&Uq&0CC7iv^Be6DJu$y*3&}>vrO1?W3m|4{T+a(?cH)Gr1NplR5 z8>w(kbXug{SivF|uMYtxFEQEFJt}ni{&a}SaG3@rE2YVTjj_z1nZ~UWSQ}DD=l(Zf z`deYbWZ#}YebZ@q4>b3@mrSZbRC=c80dnThFAP3Aa2%BI;>jLgwY%rhnz<(enfuo? oeS&i65zC73+gD7HK3>t!BI5)@vgAZla$#n(tWNe1H}t1;DD7@4+5i9m