From e7e33f90b1c14c995ac22dc2c9f40d83ce7fff0d Mon Sep 17 00:00:00 2001 From: Kat Inskip Date: Wed, 17 Dec 2025 06:54:37 -0800 Subject: [PATCH] feat: hyprland is back --- .sops.yaml | 2 + ci/secrets.yaml | 149 ++-- emacs/doom.d/config.el | 62 +- emacs/doom.d/init.el | 6 +- emacs/home.nix | 9 +- flake.lock | 759 +++++------------- flake.nix | 64 +- hardware-configuration.nix | 22 + home/environments/hyprland/hyprland.nix | 184 +++++ home/profiles/common/stylix.nix | 6 +- home/profiles/graphical/discord.nix | 79 +- home/profiles/graphical/secrets.yaml | 149 ++-- home/profiles/shell/tmux.nix | 28 - .../niri => profiles/tiling}/konawall.nix | 0 .../niri => profiles/tiling}/konawall.yaml | 0 .../niri => profiles/tiling}/noctalia.nix | 14 +- .../niri => profiles/tiling}/swww.nix | 0 .../niri => profiles/tiling}/vicinae.nix | 0 modules/system/host.nix | 3 +- nixos/common/nix.nix | 3 - nixos/common/secrets.yaml | 149 ++-- nixos/common/stylix.nix | 2 +- nixos/environments/gnome/dconf.nix | 3 - nixos/environments/gnome/packages.nix | 17 - .../gnome/profile-inheritance.nix | 9 - nixos/environments/gnome/xserver.nix | 7 - nixos/environments/hyprland/greetd.nix | 16 + nixos/environments/hyprland/hyprland.nix | 11 +- nixos/environments/kde/dconf.nix | 3 - .../environments/kde/profile-inheritance.nix | 9 - nixos/environments/kde/xserver.nix | 16 - nixos/environments/openbox/openbox.nix | 26 - nixos/environments/xfce/xfce.nix | 28 - nixos/profiles/dev/packages.nix | 8 + nixos/profiles/gaming/steam.nix | 4 +- nixos/profiles/gaming/vr.nix | 17 +- nixos/profiles/gaming/wine.nix | 10 +- nixos/profiles/server/secrets.yaml | 149 ++-- nixos/servers/continuwuity/secrets.yaml | 149 ++-- nixos/servers/grafana-stack/secrets.yaml | 149 ++-- nixos/servers/mail/secrets.yaml | 149 ++-- nixos/servers/monica/secrets.yaml | 149 ++-- nixos/servers/stream.nix | 4 +- nixos/servers/vaultwarden/secrets.yaml | 149 ++-- nixos/servers/web/secrets.yaml | 149 ++-- nixos/servers/weechat/secrets.yaml | 149 ++-- overlays.nix | 8 +- packages/wivrn-pacer.patch | 13 + quickshell/stylix.json | 1 - systems/goliath.nix | 140 ++-- systems/minecraft.nix | 155 ++++ tree.nix | 3 +- 52 files changed, 1695 insertions(+), 1695 deletions(-) create mode 100644 hardware-configuration.nix create mode 100644 home/environments/hyprland/hyprland.nix rename home/{environments/niri => profiles/tiling}/konawall.nix (100%) rename home/{environments/niri => profiles/tiling}/konawall.yaml (100%) rename home/{environments/niri => profiles/tiling}/noctalia.nix (94%) rename home/{environments/niri => profiles/tiling}/swww.nix (100%) rename home/{environments/niri => profiles/tiling}/vicinae.nix (100%) delete mode 100644 nixos/environments/gnome/dconf.nix delete mode 100644 nixos/environments/gnome/packages.nix delete mode 100644 nixos/environments/gnome/profile-inheritance.nix delete mode 100644 nixos/environments/gnome/xserver.nix create mode 100644 nixos/environments/hyprland/greetd.nix delete mode 100644 nixos/environments/kde/dconf.nix delete mode 100644 nixos/environments/kde/profile-inheritance.nix delete mode 100644 nixos/environments/kde/xserver.nix delete mode 100644 nixos/environments/openbox/openbox.nix delete mode 100644 nixos/environments/xfce/xfce.nix create mode 100644 packages/wivrn-pacer.patch create mode 100644 systems/minecraft.nix diff --git a/.sops.yaml b/.sops.yaml index 73f57cc3..cee8020d 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -12,6 +12,7 @@ keys: - &goliath_kat age1rjldv3fn3q686647exmcukthr32gmp6s3axs0lhyenvru9ajp9rs24ukvz - &syncthing age1p9v6xaujkdat2tsc2mc4gxpg9hjr4suvwryuat95z2c53xhsyfxq0gf594 - &rinnosuke age1rt0ngkum32wt6l2wnyr40hmwd9ulmzqfarg5vk62zqp0uvj4lyuqd2atgq +- &minecraft age1nxgmdahcjhmtrf7q66jep55cjdcw6tfpw722jr4gytaykgf89ugqxufgyd creation_rules: - path_regex: tf/terraform.tfvars.sops$ shamir_threshold: 1 @@ -35,6 +36,7 @@ creation_rules: - *goliath - *goliath_kat - *syncthing + - *minecraft - path_regex: ci/.*\.yaml shamir_threshold: 1 key_groups: diff --git a/ci/secrets.yaml b/ci/secrets.yaml index 18c218a9..55289942 100644 --- a/ci/secrets.yaml +++ b/ci/secrets.yaml @@ -6,123 +6,132 @@ sops: - recipient: age1n4kdchmkk3rfkaknxhveqr2ftprdpgwckutt23y6u8639lazzuks77tgav enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0RGluTXZCWlAzdlRNZElI - QnVmVnZnUkRuM1g2amJmQk1BTFF4M1ZiMTMwCjdLa2YreUI1SFJ3NTdnOXk1RFJW - eE5JYml0Tkk1d3hEYU1VdUtvT2R0MU0KLS0tIGIvdXVxZ3luUVBQZ2pFbi9BczVO - RHFnZEs3OWUwcmtZMjVtc242THp0M1kKTo7qcyCsSgDwnEObsNZMCNYPk3OZs2uU - ZfwbmwGjLohwT7I5FAUWaVe9j1ryyYi0KyE4jmsNtSV4DHv/ews2yg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0M2E5ak90MUlYSFhDSmxn + Nm5vUTN5RFMrZVJsZ0RqNitwVXhQczZXQ0M0Ci9KZ0ErRkRjbEkxdzBhd1d5d2Rt + UHIvaEhydlptQ2RMQ3NOZlN4cEN6UlUKLS0tIHJnQTFCRkgweGNGYnFYK053Skcv + c0IzaDFJK2d4L3RBVUFMcDE2Mi9sencKfg5eD1d90ukoXmTTg7FjGl89DyUE7JQs + 5mqWJ+3R5OJg9K/V5ixXY7eCWs9EQKMoRX8fJeREUA/zuknEhN4iQw== -----END AGE ENCRYPTED FILE----- - recipient: age1cnu37d5fqyahh9vvc4hj6z6k8ur9ksuefln7sr6g3emmn927eutqxdawuh enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvMVVpQThiUUxLQ25iRTJy - V0Y1WUc4SkVjYnFYZ0lxNzF2ZUdreStEbm5VClZpM3FHY1VtSlh5ZkZJNlZ4M1NM - WkFxWHB3NkYrNFNNb1hIaWxGMzBreDQKLS0tIHUyeVgvRHRFMXhYdGxCekZnOWNn - ZkZwcW9DenFYTWw4cXRndDFoR2VNR0UKDRSyrdbFmG/OVD1xGftJD1909jnsAKWU - 1fPNg975r0ZX+th0M+vsBxs8qpu8Utbs2t7IrexUPBOvowqBGhXpMw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiSHlxQlFtVGtibmhSN3Vj + QnhqUEFEQkpmcTNBdGpxaEJNcldmSDhHSVZBCmdjQXNCNDBWNzdpTWZtYjJZeDhq + YVpQYThGVUhnYUlrTFJWakM2UTdEb2sKLS0tIGhaRUtLSnoyeEZ0TWRHdy9VZkti + TG1PeGJubzh3RjM3WW1LeFg0dURWcTAK0hw9WCmFQebvcnZFklNsFpuaO02foFlN + tz9RJw/wmqDGsAuiNWv9OmcxyS5pXS+SfDFdO0W3OUtkG5vS4NgjeA== -----END AGE ENCRYPTED FILE----- - recipient: age1a0m73qr8hhuz8xemv4vymf4wmpghm2hst8wgrn3pn65ext5mf4ksk0vsdm enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArL1dzcDQzM0lZVjFPVkIr - MWFhdHIvMEQ1elgya1JMMytxMmhIWTFJWUNRCjJQRmk2eldTcVBXVlh1dTgwZ2xQ - a2VRWm5VMW80YTJTbldvbjFGdXJDajAKLS0tIDBDK1NFNjJwTE1QTWZRR3llbnBz - c3dmTjF2UEp4WUxpdFBmRFY1YVo0U0UKZYTcLBY55TCax0dwrDC299E2Hl34f4w+ - wjrXk8GQT3ZeKB2KOXuKP/D2EjgpVX2oRn9dfcdaP1CA/d1PpJkriw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPbDBhb09vQ0FmOEZpSmJP + SUpUVDJMTTErN1ZkSk8xbFpCV2NlQkhocWlrCnpGc0VmYk5KRllhbWtGaWhwS1Np + WWlKSlVnQUNZbk9JTnMwK2VHT3ByR1UKLS0tIC8vbXBCb09PUDhGb3Z5aGpjbnVi + ZUFSREgvclR0aWVxV1dSS05MRCt0MGMKb5X6hjuRAnVCLlDbCCk2/DUxkiCQjWoL + T5A/hxubOj3iLa4raWfaLujdOoyjje6zayTJga+wfAlqCwLWkSgHOw== -----END AGE ENCRYPTED FILE----- - recipient: age18hpxz0ghvswv9k30cle73prvnzrsuczqh87jjdk9fl50j3ddndmq9xae0n enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlblVzZEtlVEFmeXp5K0dD - TXVxT2hjSzdpdDRYZlc3OFRJdEVTY0lOMXp3CkkyUEdSRXJpSk5jZzNvWHJjQ0pX - b0d0cFZrZ1NxUkxTVVVLMzB1VjRYVG8KLS0tIDFxejN2enl3anhuVG0xV1Z1d3hu - cExlckc4alYyQkJPZTkrbjBLQWtDLzAKgLr93GIH4gn02gzoupezG9JeWz2BuFAU - oda82/+oIDLVe7HkwMJTtU6Z7LdqwAjy2ZxmdIHarp0N/+7FLRlkjw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLT2o3NTBDWFlGN0ZGSWg4 + KzhTekF1ZDVnaVFOVG5ZQkhHeTFnTnlwWmlNCjhjdm1zemg2ejg1d3dNRFBBUDYw + MjF0R25XbE9qSE42SE9LL3UzZ1J2bjQKLS0tIHBJc1pCbEpkSkNScXVzNUlUOWJ5 + MWx5R3NkNnVhQnlYYjljbjN4dzJUZXcKTDqF3YlBiRXbRILQDDGmn7Nb3gtGOU21 + NnI5VVl6kMiLGsQUharIguoXGtiuHu6u7fGm38T14GnShlV6/dMeZQ== -----END AGE ENCRYPTED FILE----- - recipient: age1xgy03g3vjydsxcl0qpdgm8rahjcjq95ucxfwlgr22zwjx3p7jf2s9jk6u5 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6QjBqcktwY3EwYUsxVDJH - d0EyRE1OOGtrUEVvdFNKYkptZU9wNUlzZjBRClRGVzZtUzg1bVRySEdLQ3gwZnFH - YkF2ZS91NFdRNWt4SjdCMmF4bndxU1kKLS0tIG9WUDdWMXRKWEtIRTNJQmhDNDZF - dHdqNmFZeVBGODhlZFV2U215eGJPRkUK2bfMMBOkKzT+LK4KAgCcsPn0z5WR0U90 - PvNlwe+fyDZCRQZPn1ZGVFstPCPMbAiQrBiLx1F4U6K/y2kS0psDCg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6YXlsbnlUZ2h0UHNJMS9i + NkU2YlNZaDg4VGFXZHNZOEUvNitnM1IyLzJ3ClJodEZBQjZlWnhRbDR2NGNhczQw + ano0MlZqbUk4UTcraUtnS3ZtZkllYzAKLS0tIGJFeDlMWXFNK3ZGalVZbGVQY1c2 + SEFJb2gvUHgrbHdLemM2V0NrdVQyNXMKwBbbQKzTdRIKlbvpDYhX3CTLmCr7AIK3 + yog7n1FOM1McBxhcoDKx3ub+P/zFhUltYCFTgX4BvTqxKIY0XwJv4g== -----END AGE ENCRYPTED FILE----- - recipient: age1fv5dafs4n3r5n83qm2hfz7xmnflsz0xf9r3saralrptpgf8mvuxq4t8k3u enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUOE1IeDI2RWIxdTdkUDNm - cTBvSkpzMi9WbW8va0NQZ3hHY2JzeDVGSVdJCjllOEJWcjkrSEF2VVhXcTRVelNq - R2tZWCtwcW5OV0pHajkzZ0srOHdqbWMKLS0tIENYUjUycVJFRzJFb3lDUUJYRDgx - YWp4UFBmNHZDZWJkeGd2WXIrcm1mMjgKCsZ0P0djxAMbbQKEczRryb8LrRRy+16G - H+fPdY1rF2BhDCIHZ+/n7skdSlzl/VdF/MoBH1oNDl3hwnTnuyhv0A== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQamtUemgzN1ZmY0sreDFr + cHpqZVB0VjB0ZXNYU2plSzdEcGg3elZ4aWw0Cm15QlFseW9pVm9ySXgwR0V5RUd2 + eW4rTGE1SEd0S1BBNGw3cExuOXJPUjgKLS0tIFhkNWV1MmpDRTFwRVY0YmpiTUhZ + QlZpNi9qTEUwNDlYT3NQQ0tHZ2lUQUkKvLJ8GLPdrt6FFDA8jT+8lq+uheAJyisY + UXV5HbnNjYVRQ2xv5ik3Ko2pS7VxKElGGlZN9xas67YbTqDsz7b6iw== -----END AGE ENCRYPTED FILE----- - recipient: age120530yclr75k6nrzp6k5jjftj8j4q9v3533guupzk4ct86mjxszqg9e5t5 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZM1NXVmNyZnRiR3c0TzRC - WGxpdXFzNG4vOG9KWDNiay9EVHFhdmxpRkRZCkFCTlZTRGVJUUNRQnNaMkFWNy8x - d3FPSmlORXVMSUNjZTIvN2ZsZEFCMmMKLS0tIEVaeHNVMzJsVjgxVkZobi9uVTdw - akxrVGVPM3Rmb2c3RHJBbURCQnJRZ28Krm9E2Ozm9OFnBcGUPGrRvZoP/qmYIuvs - uJx/3D2zr9dbE779mZBH4ehQtvpqrS1rYa89JQSzBgzXxPca3JuNEg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4aTZ6WWpDQm5uVEcrL25m + SUZzY2xPc0hXYy8rOWd2d3JDZ1dsb2cydW1rCmR4T0p1Y1lGclhqT1ZSR1huQysr + R2Nqem45bCtZczFGcVVYK2lsSUhkaG8KLS0tIFJiWFN0OGJsSGVKdGN5ekVmOGVH + bHRLWXFGbDI0eE51WTc4emp0eE1rUlEK+u9FOJGZDRuJ4oXNyB2TX45cm/bxaecb + XHrjFs3iFI2c9GAgI8S3pm06QYr1Hgwn3EfQi6fvyIeN0Yei1cJWxA== -----END AGE ENCRYPTED FILE----- - recipient: age1rt0ngkum32wt6l2wnyr40hmwd9ulmzqfarg5vk62zqp0uvj4lyuqd2atgq enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjemxJOWN3MHdNcW4xZEFE - eEZnRnljbnI3WVQzZU1EY2ttTkkzVHFlbUcwCi9jM0kzNmZHNUVVRzhybnRRZ0ZE - ZDZtQ3RFVUpSb2Zkd1ZvckwxSjZ3UVkKLS0tIHlDamtKSSsvS1FCZnEzTWNDbkZ3 - QzNxQmQzNHJYRXNzNnFibXo2UUhLLzAKVv7ObjoBbNh1fKEgK2Gcx9YcKlPRqIt9 - DeHZ8wUYUSFhXKrJAVs4liFJUlyWPVKZjOqHvURWH9w0rk0fxQ6qZQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxLzJrNjFWQVB5b3dGa1Ry + YitoanFHSjA0UFl6djFoR1dPYzJVTzBYRDN3CmNINlJTNlFvSkVaNnVRWFg3YzNF + c2RkSDhER3d2U2JSRGpWSElPZ1A2bncKLS0tIEtXcGk4ZnBXeksyblNrWWxqbDJC + TnQxeTFEeEZKOGNtSlZXb05zaHBYc2MK7Yf8qXciB/NFFfL2mZdpCEbWZxFyZ95Z + h8RluYWpNtBNt7hdtGOpzA/2xsacbHODNefVHlo38KZiOnibvldCcg== -----END AGE ENCRYPTED FILE----- - recipient: age1c4atxfp05u7zm875s6q8p82ve96rqqpq9smktxlur8pk2yc3qvgql46dp9 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzcHJtQmVaYnlLY3VWV1I1 - cWE0QVdBWTRWTDFwNEd3bC96SC83RHNYaVJVCmdxUk4rMmdXZWhKa2YrVWs3SXZ0 - Q25PckpZVFJMWENTT3VYNk90S1pDVVkKLS0tIGRhV3k0cFlZcjg4Z3J3Uks0RjFD - NkRsa0Y0bGtUbDJ0OU5aL2tVa0Y2bXcKNwlIokmq+QLEF5O0Cp4eYW/T52+b4RWE - JEpfLB0WpU1l/W3gaPQPDUeSbuU0hTFrbo78SkxhHz2D3oX+cOdKgg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArbmwvN0Z2bEdka1F1R0th + QzdMamJkaTBJcnRIeW9pQkdualliZi9jOEFrCkZmSHZKZjVRSlhraDczdnF6V1Rz + bmJNVzhIRjFUVG9zR2tZNDFMMHBHNVEKLS0tIFFXVTY1UmdGMHE5SnlMR2t0L0Zu + QVRaQlZJbUMxSDNXSUpjYmZSOWhnbGcKYR4j5QTuE8/rMvxFAtBUI/bm6LALw/Ai + v09Osj8XW/W5S+21NzrvCxVnvhelyn0QnrQLhXLpxM1B2D4B6pyz7Q== -----END AGE ENCRYPTED FILE----- - recipient: age1rjldv3fn3q686647exmcukthr32gmp6s3axs0lhyenvru9ajp9rs24ukvz enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXL0pmM3J4RUk2SXFJNkY0 - S3pZY09HSm9XYlFJZTBmT1UrNXFKOXRjSmk4CmE2aGNJUzN0aXdNNk9vZUdIaUdE - TFFKS0E0UzhDREN5T3Y4U2dwZGMrM2sKLS0tIDZuUTZSOEd0dDdJYzJtdjRDcUpl - Rm5HMk9HS2hrNHVlcGJpcmIzbW5RajgKzmh/YaylCOgR0heqfo3eSFf9CEQVObnk - oUfyTYO+sQYJIXfXq0kDwdHHbKy52UnNfWME31SLu+mvF4gSAzcGNQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZQ0J4amFPV1NzZGFCak5v + eVgybTRZQllPeFZRNzk1MWxFeG9Xell0cUI4CjQydnNQOXUxK3RpRXUzd25PeGp0 + b3hFWkU3VEN5NGJQbHYybDlqOVNDYzQKLS0tIDJlRkorWWxVRVpVaG1udEt4di9y + Q1JyRHZhc2xWK2hNTXB0QXE4NlVGNVEKFjK1XcKCvlByDc1kvfyE1D+pY5SNThhK + yIcDwN3o4A+b+vj0CJ/2+vIz6DQGr9JRqEnU3A3U7HZGEYa+uq79sA== -----END AGE ENCRYPTED FILE----- - recipient: age1p9v6xaujkdat2tsc2mc4gxpg9hjr4suvwryuat95z2c53xhsyfxq0gf594 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBURkVJTTg1UHY4MUFFeGRo - Q1d4WGt5UytyQkRWcmcvMXFuQnBMQzV6Uld3ClRrcVE1TmFVREduaEpBNFJRcHdC - STFwUy81b3FEcWhHVkFxWCs3N21nSHcKLS0tIE5MWGJUbFlPeVRhbkNtQm9tSlY3 - ak92MXlqUFJpYndRK2tIOEVsTzJxeVkK10mtUKsmhAy75WROgUIC1ftNiPcSAKbw - JC78iBUU4vH+NzuOY4BJhgQTv1CQPICL4U+Wb8PPMz+f0dt1Nu5AEg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhRENxelZxcE1uK1cyRHFy + MEd1WklpZ0doVXhzUXAydm10cTBhZDNPYnprCko4U0R4VG5sOGpic25FVUw5UnN5 + Z2VWbVVmQVh1U3VQZ3NLUTdxS2l3UVUKLS0tIG9hUnhxTFU0d2ZFdkRxZVhlTGNU + V2M1Yjg2dVlDQUljdFlObUJHTkI1RW8KwME/5hXbFBSSmc5M2Gilzd5d4M3FMxx4 + z0fShoFKiBujx3uFKc3IMhjizpQqwP+C56btWDzmyAV7b4ySl1buRg== + -----END AGE ENCRYPTED FILE----- + - recipient: age1nxgmdahcjhmtrf7q66jep55cjdcw6tfpw722jr4gytaykgf89ugqxufgyd + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqaHc4OWtNQ0Q2WWpmZ0NR + cnMyZUdZVjVTSnJMOC9EellxNXRuazE2ckVVCjJ1bXBsWU8yQXlTYUtyVFN5TGR3 + UTJxMi9MNmJGUGJwT20yQW9Qa2dqU0kKLS0tIHZnV09IQnZ5ZFdQRG9abHdleGJu + NFBOaHphK01odStQTGd2Uis3eTRZQjQKL8+BM6g78QTk0h4ym7waBQiDmzZyHbqv + gr2xs+Lq5VLnB2OuBiJlf+a7vM8iY9srkGkZvDSi1v4gYUfMlMQvVw== -----END AGE ENCRYPTED FILE----- lastmodified: "2024-07-13T20:01:47Z" mac: ENC[AES256_GCM,data:bXjy4R50FqQg7kXdFO7CoylAJYlGFFsgcIw6Wp63lD/MXChPyPrXdxaoDkZb8T3FmzfgWOjiiBn98tN5xSH3e/eOST3SAjlIp6vrI6oNw+I4NLoSJ6xOQcF3OLxErzuQLffK7Gn+EfjUmJjZpyuLced9jyRVPOYKoAweFeeRTuI=,iv:E9B2/HdSL7/56KU5A0HvGiJqDUGodfdN3YDpAlO0To4=,tag:Xr1XzjmCiePtdES6JliuCw==,type:str] pgp: - - created_at: "2025-12-04T04:57:59Z" + - created_at: "2025-12-15T12:48:57Z" enc: |- -----BEGIN PGP MESSAGE----- - hQIMA82M54yws73UARAAuoUHcm/RxRWfCgW6hk6cSSV04ikncQWbGaPDecxFifDR - +f0qQao4HjauWtoblf/BAxlW5H9bm0hPJgl/bciVmv3f22jTX36F2Bbkc21wxV4Q - 7WsZe0qlqRN7HOkiMF+WT8wADiJ/Dutv3w4XmAdkYlUO/c1aUs9ofX5dVLApsXMM - HuXelsmRlvrhXwo0odXlTZ93qrdS4FgCk5CawozEfBfSi4avNtl4e7Wt5X6tO3xk - EOFBEDUBFNTegjCpbM/HCie6T39iP9sW6dJNpwR2P7pim0MdhPApVdJskf21N5H5 - e7GvUM5zrcpHmAfWWlsPNTQNSgpJoUu1KYYPpJ8ZGfQANDXh9Eh8Mhop24bBYH5k - lnFDzWb6ie9RH/7sXx83dHGX1XCkpG9Lvt4rDu27txKW5fdFSUVCg/4HVvAM7U1q - zEnj9AsqLKZC+SLSI2OoHg3auUdLwWmZV/+URnlje5NccLKmY2V+2OjbA7rNifI4 - 3WoAlbPl81wL3knYh+a2iQ4aXBPe62N9N4zDCL+wwNSF7C0DbrJ9ZsAwnOM4aKho - N2rkjY+QuL7rvMaM0TPTX8dfMfX5t4GKN8MJPwuQModarV7oAeQ6ehqQIwdkJfwo - L1fE39NimXsg/DYTVrKzFOKtcHMTxPQ1nZ+sDwKRgzCdPMmsOywAHEkCEw1O5zvS - XgF2aw8UhIUlxNcfH8AWmWp8WaDosqa5GeXYozH0bJJmLQ+bZGBA1ArWQ0YkyAxn - F4VufdElS4wEQT/CpNZm3x0SNFd6yCKYCLu4yndg/xS+wUfZKAlXBZMTv8HCXjs= - =kJt7 + hQIMA82M54yws73UAQ//TaYWAK88UACTj9127XuKHMiG2ipmqYxLqUTpmP6KcxyW + UAcO9ARABFet/bjTfs/NZ5JGACH94zRhqOfQbwAISjF4G+Jx+5+591EsSCfTBXZ5 + HkwhdaCfrj3F51LC9bDo9y5aAHF18NuN6ZcN+LuttjecH8koVEXlhVCcdgFX+fCr + 7b66HfCL5J0/cmikqESGtVbIFyFkjiXBlXThrB6rTmC12vgJVsFTNmHuIlTFLFOw + s7qLa9bCKDhQh/g2phtJ8g4n4Obtfj9rd3hhWKy+lOmYNLRcDtfIpHswwd7tn9j4 + kH1ghn8JLURIXHfXTnyWHInoZiS5i8OUNXXfmwoEtDmlM7hfHK/Ij8YCOtMuyHJe + jy25W3UPaDxbqugbBgUBI38Rdj5dnoqVoOeVhP6/GOUNcmyfZv6Q+lROqO+vEkxY + b3mGXIuGP08Fy7+I2Y31g5iSKaWLcUwkqX+252wyBy5h/jegzF+aCfACS6PCg/L1 + VjZgsq5UNw7m+gOeZQBZiXMuQoyHDRWgidfXrttljO8nXBgUN6gxwPl06n0LOMR1 + vwmNJtMi5PH5k+Zu2cp79KGTmLT+PSDEtY3xq1lOdg0Vo7/EzeWOZ1EinJv5CSX9 + V9Z24SfhDmPTHbNwzKccoT7U4WLavwmCSEN965z4tXQ6bcSh7jZb63ydlVqwNXzS + XgFk6ICoMaAnvi5lm0fxLGXwl0ESErbyWBZBs9rfWgP2+ys7aRDKSkuoJEMABPFl + bTUowgeo2ZLyCeqM3IKWn6IhluqMGOpzYmdTEgkRb0OOnZVKz/cJSX5FX1p4NJw= + =CBP9 -----END PGP MESSAGE----- fp: CD8CE78CB0B3BDD4 unencrypted_suffix: _unencrypted diff --git a/emacs/doom.d/config.el b/emacs/doom.d/config.el index 010284e5..292629c3 100644 --- a/emacs/doom.d/config.el +++ b/emacs/doom.d/config.el @@ -32,7 +32,8 @@ ;; There are two ways to load a theme. Both assume the theme is installed and ;; available. You can either set `doom-theme' or manually load a theme with the ;; `load-theme' function. This is the default: -(setq doom-theme 'doom-dracula) +(setq doom-theme 'catppuccin) +(setq catppuccin-flavor 'macchiato) ;; This determines the style of line numbers in effect. If set to `nil', line ;; numbers are disabled. For relative line numbers, set this to `relative'. @@ -45,36 +46,31 @@ (add-hook 'prog-mode-hook #'rainbow-delimiters-mode) (setq elfeed-feeds '(("https://lobste.rs/rss" tech) - ("https://news.ycombinator.com/rss" tech))) + ("https://news.ycombinator.com/rss" tech))) -;; Whenever you reconfigure a package, make sure to wrap your config in an -;; `after!' block, otherwise Doom's defaults may override your settings. E.g. -;; -;; (after! PACKAGE -;; (setq x y)) -;; -;; The exceptions to this rule: -;; -;; - Setting file/directory variables (like `org-directory') -;; - Setting variables which explicitly tell you to set them before their -;; package is loaded (see 'C-h v VARIABLE' to look up their documentation). -;; - Setting doom variables (which start with 'doom-' or '+'). -;; -;; Here are some additional functions/macros that will help you configure Doom. -;; -;; - `load!' for loading external *.el files relative to this one -;; - `use-package!' for configuring packages -;; - `after!' for running code after a package has loaded -;; - `add-load-path!' for adding directories to the `load-path', relative to -;; this file. Emacs searches the `load-path' when you load packages with -;; `require' or `use-package'. -;; - `map!' for binding new keys -;; -;; To get information about any of these functions/macros, move the cursor over -;; the highlighted symbol at press 'K' (non-evil users must press 'C-c c k'). -;; This will open documentation for it, including demos of how they are used. -;; Alternatively, use `C-h o' to look up a symbol (functions, variables, faces, -;; etc). -;; -;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how -;; they are implemented. +(add-hook 'clojure-mode #'paredit-mode) +(add-hook 'emacs-lisp-mode #'paredit-mode) + +(after! paredit + (define-key paredit-mode-map (kbd "C-") nil) + (define-key paredit-mode-map (kbd "C-") nil) + + (map! :nvi + + :desc "Forward barf" + "M-" #'paredit-forward-barf-sexp + + :desc "Forward slurp" + "M-" #'paredit-forward-slurp-sexp + + :desc "Backward slurp" + "M-S-" #'paredit-backward-slurp-sexp + + :desc "Backward barf" + "M-S-" #'paredit-backward-barf-sexp + + :desc "Backward" + "C-c " #'paredit-backward + + :desc "Forward" + "C-c " #'paredit-forward)) diff --git a/emacs/doom.d/init.el b/emacs/doom.d/init.el index f80cea4e..622cc06f 100644 --- a/emacs/doom.d/init.el +++ b/emacs/doom.d/init.el @@ -62,7 +62,7 @@ ;;lispy ; vim for lisp, for people who don't like vim ;;multiple-cursors ; editing in many places at once ;;objed ; text object editing for the innocent - parinfer ; turn lisp into python, sort of + ;;parinfer ; turn lisp into python, sort of ;;rotate-text ; cycle region at point between text candidates snippets ; my elves. They type so I don't have to (whitespace +guess +trim) ; a butler for your whitespace @@ -119,7 +119,7 @@ ;;agda ; types of types of types of types... ;;beancount ; mind the GAAP ;;(cc +lsp) ; C > C++ == 1 - clojure ; java with a lisp + (clojure +lsp) ; java with a lisp ;;common-lisp ; if you've seen one lisp, you've seen them all ;;coq ; proofs-as-programs ;;crystal ; ruby at the speed of c @@ -157,7 +157,7 @@ ;;nim ; python + lisp at the speed of c (nix +lsp) ; I hereby declare "nix geht mehr!" ;;ocaml ; an objective camel - org ; organize your plain life in plain text + (org +roam2) ; organize your plain life in plain text ;;php ; perl's insecure younger brother ;;plantuml ; diagrams for confusing people more ;;graphviz ; diagrams for confusing yourself even more diff --git a/emacs/home.nix b/emacs/home.nix index 5b88165d..e193368b 100644 --- a/emacs/home.nix +++ b/emacs/home.nix @@ -1,8 +1,15 @@ { config, pkgs, ... }: { programs.doom-emacs = { enable = true; + emacs = pkgs.emacs-pgtk; doomDir = ./doom.d; doomLocalDir = "${config.home.homeDirectory}/.local/share/nix-doom"; - extraPackages = epkgs: [ epkgs.treesit-grammars.with-all-grammars epkgs.rainbow-delimiters pkgs.ispell ]; + extraPackages = epkgs: with epkgs; [ + catppuccin-theme + treesit-grammars.with-all-grammars + rainbow-delimiters + pkgs.ispell + pkgs.clojure-lsp + ]; }; } diff --git a/flake.lock b/flake.lock index 59a6ce89..ee8a5c65 100644 --- a/flake.lock +++ b/flake.lock @@ -23,51 +23,18 @@ }, "base16": { "inputs": { - "flakelib": [ - "flakelib" - ], - "nixpkgs": [ - "nixpkgs" - ] + "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1752473330, - "narHash": "sha256-HJZosSUcwX7HuGWyRkhBJQ1ToUkPzRzakM4ozoZmeTY=", - "owner": "arcnmx", + "lastModified": 1755819240, + "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=", + "owner": "SenchoPens", "repo": "base16.nix", - "rev": "dda216bd4d4bcd2460ae274cefb9584f9f7843d0", + "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6", "type": "github" }, "original": { - "owner": "arcnmx", - "ref": "flake", - "repo": "base16.nix", - "type": "github" - } - }, - "base16-data": { - "inputs": { - "base16": [ - "base16" - ], - "flakelib": [ - "flakelib" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1700769393, - "narHash": "sha256-45B4+NIjDCjKadNcgOXdUKQDJH3Ss9O6bHT/muwGBCs=", - "owner": "arcnmx", - "repo": "base16.nix", - "rev": "d95a3a49011e2e3c945e15feceaa973fa297cff8", - "type": "github" - }, - "original": { - "owner": "arcnmx", - "ref": "data", + "owner": "SenchoPens", "repo": "base16.nix", "type": "github" } @@ -75,17 +42,17 @@ "base16-fish": { "flake": false, "locked": { - "lastModified": 1754405784, - "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=", + "lastModified": 1765809053, + "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=", "owner": "tomyun", "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" }, "original": { "owner": "tomyun", "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" } }, @@ -122,24 +89,6 @@ "type": "github" } }, - "base16_2": { - "inputs": { - "fromYaml": "fromYaml" - }, - "locked": { - "lastModified": 1755819240, - "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=", - "owner": "SenchoPens", - "repo": "base16.nix", - "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6", - "type": "github" - }, - "original": { - "owner": "SenchoPens", - "repo": "base16.nix", - "type": "github" - } - }, "blobs": { "flake": false, "locked": { @@ -156,33 +105,6 @@ "type": "gitlab" } }, - "chaotic": { - "inputs": { - "flake-schemas": "flake-schemas", - "home-manager": [ - "home-manager" - ], - "jovian": "jovian", - "nixpkgs": "nixpkgs", - "rust-overlay": [ - "rust-overlay" - ] - }, - "locked": { - "lastModified": 1764847736, - "narHash": "sha256-FMYnfCH2TMNnTJvbc/mraZpRszIL7nc5YI6w/pWNyNs=", - "owner": "chaotic-cx", - "repo": "nyx", - "rev": "e3f8349d60d5daf58951b9ccd089fecb79ea5443", - "type": "github" - }, - "original": { - "owner": "chaotic-cx", - "ref": "nyxpkgs-unstable", - "repo": "nyx", - "type": "github" - } - }, "ci": { "flake": false, "locked": { @@ -224,8 +146,8 @@ "inputs": { "flake-compat": "flake-compat", "flake-utils": "flake-utils", - "nix-github-actions": "nix-github-actions_2", - "nixpkgs": "nixpkgs_2", + "nix-github-actions": "nix-github-actions", + "nixpkgs": "nixpkgs", "stable": "stable" }, "locked": { @@ -245,17 +167,17 @@ "cpu-microcodes": { "flake": false, "locked": { - "lastModified": 1763336161, - "narHash": "sha256-KDi9xyL57RQmAAJLB6Q2dSF9BMRjq/QBFri7SP9+LX4=", + "lastModified": 1765040770, + "narHash": "sha256-VFFFnQjay/sQbKU0hv8vcF++3BOeQx2vIijQ3UYsecc=", "owner": "platomav", "repo": "CPUMicrocodes", - "rev": "2bd1bd04b8af70805c3da1f0f36673d896ca7952", + "rev": "4b18748b5cfc10464e4c5c5d93ead73a29482fb0", "type": "github" }, "original": { "owner": "platomav", "repo": "CPUMicrocodes", - "rev": "2bd1bd04b8af70805c3da1f0f36673d896ca7952", + "rev": "4b18748b5cfc10464e4c5c5d93ead73a29482fb0", "type": "github" } }, @@ -281,11 +203,11 @@ ] }, "locked": { - "lastModified": 1764161084, - "narHash": "sha256-HN84sByg9FhJnojkGGDSrcjcbeioFWoNXfuyYfJ1kBE=", + "lastModified": 1765684049, + "narHash": "sha256-svCS2r984qEowMT0y3kCrsD/m0J6zaF5I/UusS7QaH0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "e95de00a471d07435e0527ff4db092c84998698e", + "rev": "9b628e171bfaea1a3d1edf31eee46251e0fe4a33", "type": "github" }, "original": { @@ -325,11 +247,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1765413096, - "narHash": "sha256-ADJNz84TCmcEScOeibny6/NmGXjV6BylbDD1xZnm7bE=", + "lastModified": 1765960743, + "narHash": "sha256-zR+EfDMcyAWPSkkXauzaEcbzsKUoDMwNVVtJvsQSXqo=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "008a539d628c8c4c4e895b8f5166b390e988dbfb", + "rev": "0dfb874b57690dbbddd8167792de5ea9ff9a7d76", "type": "github" }, "original": { @@ -348,11 +270,11 @@ ] }, "locked": { - "lastModified": 1765441709, - "narHash": "sha256-2LRXe8A779U0m1NTHAaCzNy7WngXFAQw4Gc5vBl33F8=", + "lastModified": 1765960293, + "narHash": "sha256-zxaB8rx4h2W4HEWzzChi4TPw2xgC+NffiiUthgef5sg=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "27ced263ed6b7a6968f9f449d66aa299cb0f14a7", + "rev": "5a8016eee85b6b4fbee1b11e144df8bdc7495513", "type": "github" }, "original": { @@ -376,28 +298,6 @@ "type": "github" } }, - "fenix": { - "inputs": { - "nixpkgs": [ - "naersk", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1752475459, - "narHash": "sha256-z6QEu4ZFuHiqdOPbYss4/Q8B0BFhacR8ts6jO/F/aOU=", - "owner": "nix-community", - "repo": "fenix", - "rev": "bf0d6f70f4c9a9cf8845f992105652173f4b617f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "firefox-gnome-theme": { "flake": false, "locked": { @@ -484,11 +384,11 @@ ] }, "locked": { - "lastModified": 1763759067, - "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", "type": "github" }, "original": { @@ -533,20 +433,6 @@ "type": "github" } }, - "flake-schemas": { - "locked": { - "lastModified": 1721999734, - "narHash": "sha256-G5CxYeJVm4lcEtaO87LKzOsVnWeTcHGKbKxNamNWgOw=", - "rev": "0a5c42297d870156d9c57d8f99e476b738dcd982", - "revCount": 75, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.5/0190ef2f-61e0-794b-ba14-e82f225e55e6/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz" - } - }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -602,24 +488,6 @@ "type": "github" } }, - "flake-utils_3": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flakelib": { "inputs": { "fl-config": "fl-config", @@ -641,23 +509,6 @@ "type": "github" } }, - "freetype2": { - "flake": false, - "locked": { - "lastModified": 1723459814, - "narHash": "sha256-4l90lDtpgm5xlh2m7ifrqNy373DTRTULRkAzicrM93c=", - "owner": "freetype", - "repo": "freetype", - "rev": "42608f77f20749dd6ddc9e0536788eaad70ea4b5", - "type": "github" - }, - "original": { - "owner": "freetype", - "ref": "VER-2-13-3", - "repo": "freetype", - "type": "github" - } - }, "fromYaml": { "flake": false, "locked": { @@ -739,11 +590,11 @@ ] }, "locked": { - "lastModified": 1763988335, - "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=", + "lastModified": 1765911976, + "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce", + "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27", "type": "github" }, "original": { @@ -884,23 +735,6 @@ "type": "gitlab" } }, - "harfbuzz": { - "flake": false, - "locked": { - "lastModified": 1747068667, - "narHash": "sha256-VxN0lsFnW0vHnIXZ806Lg2NU0/ESnE6z249mXPhfas8=", - "owner": "harfbuzz", - "repo": "harfbuzz", - "rev": "33a3f8de60dcad7535f14f07d6710144548853ac", - "type": "github" - }, - "original": { - "owner": "harfbuzz", - "ref": "11.2.1", - "repo": "harfbuzz", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -908,11 +742,11 @@ ] }, "locked": { - "lastModified": 1764839789, - "narHash": "sha256-QCgaXEj8036JlfyVM2e5fgKIxoF7IgGRcAi8LkehKvo=", + "lastModified": 1765860045, + "narHash": "sha256-7Lxp/PfOy4h3QIDtmWG/EgycaswqRSkDX4DGtet14NE=", "owner": "nix-community", "repo": "home-manager", - "rev": "d441981b200305ebb8e2e2921395f51d207fded6", + "rev": "09de9577d47d8bffb11c449b6a3d24e32ac16c99", "type": "github" }, "original": { @@ -1003,56 +837,6 @@ "type": "github" } }, - "ixx": { - "inputs": { - "flake-utils": [ - "nixvim", - "nuschtosSearch", - "flake-utils" - ], - "nixpkgs": [ - "nixvim", - "nuschtosSearch", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1754860581, - "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.1.1", - "repo": "ixx", - "type": "github" - } - }, - "jovian": { - "inputs": { - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1764746434, - "narHash": "sha256-6ymFuw+Z1C90ezf8H0BP3c2JFZhJYwMq31px2StwWHU=", - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "rev": "b4c0b604148adacf119b89824ed26df8926ce42c", - "type": "github" - }, - "original": { - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "type": "github" - } - }, "konawall-py": { "inputs": { "flake-utils": [ @@ -1063,11 +847,11 @@ ] }, "locked": { - "lastModified": 1764853849, - "narHash": "sha256-0J2wo7WLd5uRD769MXsCJqu1VwAhuA2hmIKr2+ltb6s=", + "lastModified": 1765969786, + "narHash": "sha256-zsep/m+AkY5sucQzm2q5n3Uaf4R+m9YAUudGsXw6YH0=", "owner": "kittywitch", "repo": "konawall-py", - "rev": "fcbf702ab31286231ef71e0a7260e99cd7bbab86", + "rev": "4b8c0b2785e8a704a669415766dd35c18a2042e4", "type": "github" }, "original": { @@ -1108,23 +892,6 @@ "type": "github" } }, - "libpng": { - "flake": false, - "locked": { - "lastModified": 1726173884, - "narHash": "sha256-gBfHgGaqVYdmhWXoNKZzPyGzyw2rr3zp+DjWmfC41jk=", - "owner": "pnggroup", - "repo": "libpng", - "rev": "f5e92d76973a7a53f517579bc95d61483bf108c0", - "type": "github" - }, - "original": { - "owner": "pnggroup", - "ref": "v1.6.44", - "repo": "libpng", - "type": "github" - } - }, "mewtris": { "inputs": { "flake-compat": [ @@ -1160,11 +927,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1764625594, - "narHash": "sha256-RwtPzq4rqDCLki3oOLuUUkKcuaZPy4IDUBb5tAWl4Xk=", + "lastModified": 1765456745, + "narHash": "sha256-vJ6Ikk9tV7HuDsn/I90y14w+sNtLmAYfdm5S+yBzrCA=", "owner": "microvm-nix", "repo": "microvm.nix", - "rev": "6dab9a797f262a352eed55078597582ed2ded336", + "rev": "f5c1bbfd4cf686ec1822ccaeb634a8b93ee5120f", "type": "github" }, "original": { @@ -1187,11 +954,11 @@ ] }, "locked": { - "lastModified": 1764813963, - "narHash": "sha256-Vs7Mamto+T8r1evk9myHepgHGNJkS2Kr0BF64NIei94=", + "lastModified": 1765937121, + "narHash": "sha256-maweGZo3MDkmLwkBsBpRLMa0sqrg98jTn62c3m4/H0o=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "491200d6848402bbab1421cccbc15a46f08c7f78", + "rev": "d6b615e2c84e49174b4c2021ba4369a9af0fae62", "type": "github" }, "original": { @@ -1200,27 +967,6 @@ "type": "github" } }, - "naersk": { - "inputs": { - "fenix": "fenix", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1763384566, - "narHash": "sha256-r+wgI+WvNaSdxQmqaM58lVNvJYJ16zoq+tKN20cLst4=", - "owner": "nix-community", - "repo": "naersk", - "rev": "d4155d6ebb70fbe2314959842f744aa7cabbbf6a", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "naersk", - "type": "github" - } - }, "neorg": { "flake": false, "locked": { @@ -1255,11 +1001,11 @@ ] }, "locked": { - "lastModified": 1764822595, - "narHash": "sha256-jrdFN3XUzMBw/0P3lwIrPW7BnLcObme6f+0PlaCM/fE=", + "lastModified": 1765941546, + "narHash": "sha256-t0gYytVndBarYm9uZNIRpXN5VPc9xVQj165Uz+wMs2E=", "owner": "nvim-neorg", "repo": "nixpkgs-neorg-overlay", - "rev": "d927a72cd6a7aba73bfab548f4663de93aaf92c2", + "rev": "475ec03713cdd318a40d82212aeea2a90abebbfd", "type": "github" }, "original": { @@ -1291,11 +1037,11 @@ ] }, "locked": { - "lastModified": 1764847908, - "narHash": "sha256-f8ah6zXS+6nO0lYZMvpo/wvqJwMN54I3y/+TM8oyWDE=", + "lastModified": 1765855387, + "narHash": "sha256-lDJLQqwxUxv7fRYrEkV0Rx/tw+Ka1hzdzneQ4tdj7hg=", "owner": "nix-community", "repo": "nh", - "rev": "c8be4dfc00e92e6062f69c98cea06575f1199f5b", + "rev": "0edf96100b5f25194ad544e40a698d0f4c4e5c7f", "type": "github" }, "original": { @@ -1318,11 +1064,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1764796736, - "narHash": "sha256-JMSsWdmmzLtwVV8Z9x2mDjgA5i7DkJYnYQwkJWeHE40=", + "lastModified": 1765961589, + "narHash": "sha256-F1JFGtVQl4s9eiVrdM8MuAgMcU13CgARZiVADIzEqto=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a482ee6c7423ff90771958cd4bab95e4410b0381", + "rev": "bc56353a046ec01379f0bf971c99946a613b43b3", "type": "github" }, "original": { @@ -1351,11 +1097,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1764678181, - "narHash": "sha256-TMs2Px19UAG06zITXAH7efl7X8G7BDyMCy1ilX/8wy0=", + "lastModified": 1765861551, + "narHash": "sha256-1Bo86J/7nm8sndZz9gGW0agydYzLYimdz9aQEhnf1zY=", "owner": "YaLTeR", "repo": "niri", - "rev": "f874b2fce50e0f7ba21e270c86cfa168a1506b82", + "rev": "2641356d41199a40ccc9a2e9f61bd34d7e7c8220", "type": "github" }, "original": { @@ -1372,11 +1118,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1765529275, - "narHash": "sha256-U6lMX7a9Ey7Bui1PquCrTuhd61tQd3M8y8OuzrvDo+s=", + "lastModified": 1765961268, + "narHash": "sha256-RMv6MfWK0cQ3vIqH0Z2RYFvFPg/2CuWzHC3MqZ2dPfk=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "5650168db49bc6c252437542a87f4b9f925a9ef6", + "rev": "66e03930dcdb3b871ff46023455b1e1641b3c240", "type": "github" }, "original": { @@ -1390,14 +1136,14 @@ "flake-parts": [ "flake-parts" ], - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1764900011, - "narHash": "sha256-iG5HqIzZ12qzTi3xCwBinw/PR0xNlJNXLLQyV2En1OY=", + "lastModified": 1765937051, + "narHash": "sha256-JBbnxGZDzLtYoqragAnTrpLMAEWMJoQAMpAx2k0hIYg=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "e1829ce2d33b1e289b3ecca7530dee84da8d9e85", + "rev": "64cbe149f26ca2c6687ca5ab4f294d0b87c6ffb8", "type": "github" }, "original": { @@ -1407,29 +1153,6 @@ } }, "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "chaotic", - "jovian", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729697500, - "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=", - "owner": "zhaofengli", - "repo": "nix-github-actions", - "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "ref": "matrix-name", - "repo": "nix-github-actions", - "type": "github" - } - }, - "nix-github-actions_2": { "inputs": { "nixpkgs": [ "colmena", @@ -1457,11 +1180,11 @@ ] }, "locked": { - "lastModified": 1764475780, - "narHash": "sha256-77jL5H5x51ksLiOUDjY0ZK8e2T4ZXLhj3ap8ETvknWI=", + "lastModified": 1765267181, + "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "5a3ff8c1a09003f399f43d5742d893c0b1ab8af0", + "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f", "type": "github" }, "original": { @@ -1523,6 +1246,32 @@ "type": "github" } }, + "nixcord": { + "inputs": { + "flake-compat": [ + "nixpkgs" + ], + "flake-parts": [ + "flake-parts" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1765958588, + "narHash": "sha256-Hxl5BEobkuhVX9wv12nrBDIjY82fMMEQ3a9jUwEawu8=", + "owner": "kaylorben", + "repo": "nixcord", + "rev": "0414bccc71602321539dbd6c30a459f61a3f5cca", + "type": "github" + }, + "original": { + "owner": "kaylorben", + "repo": "nixcord", + "type": "github" + } + }, "nixos-cli": { "inputs": { "flake-compat": [ @@ -1537,11 +1286,11 @@ ] }, "locked": { - "lastModified": 1764166022, - "narHash": "sha256-XbNIwsvHC/suEFjHGDMa9hL8H2kT+V70J8iU/uIXl4g=", + "lastModified": 1765423663, + "narHash": "sha256-ToKVLDYAzKyStJgCA7W+RZObvwABK9fQ8i1wLUUOdLM=", "owner": "nix-community", "repo": "nixos-cli", - "rev": "a49b9aae0866eced219198b7f4e559c8b4f05c27", + "rev": "a2019789319c1678be8dc68ecf34c83f948e7475", "type": "github" }, "original": { @@ -1567,11 +1316,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764667669, - "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", + "lastModified": 1750134718, + "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "418468ac9527e799809c900eda37cbff999199b6", + "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", "type": "github" }, "original": { @@ -1598,11 +1347,11 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1764465291, - "narHash": "sha256-jJ/E4B9Hp7U2ZmT3E0tD1LtAfATw/xjVf8sueNyeYmc=", + "lastModified": 1765674936, + "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "e9537535ae8f4a2f78dbef0aaa0cbb6af4abd047", + "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", "type": "github" }, "original": { @@ -1659,11 +1408,11 @@ ] }, "locked": { - "lastModified": 1764811995, - "narHash": "sha256-uZqaBX9/a2wpAgtW5ib6xP8nvC/OQLddhQQ3Udq5HJU=", + "lastModified": 1765935045, + "narHash": "sha256-nppx66CXo7GpJnvpjrlNdNBvi/bFhVpc8sk09rtysfA=", "owner": "nix-community", "repo": "nixpkgs-xr", - "rev": "028e82c0597ed3fdef99c1756d43aead2c0bbd0d", + "rev": "cefcf3998f426c7b3d956ac7bd8360dddd724e33", "type": "github" }, "original": { @@ -1674,27 +1423,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1750134718, - "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", + "lastModified": 1765457389, + "narHash": "sha256-ddhDtNYvleZeYF7g7TRFSmuQuZh7HCgqstg5YBGwo5s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1764384123, - "narHash": "sha256-UoliURDJFaOolycBZYrjzd9Cc66zULEyHqGFH3QHEq0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "59b6c96beacc898566c9be1052ae806f3835f87d", + "rev": "f997fa0f94fb1ce55bccb97f60d41412ae8fde4c", "type": "github" }, "original": { @@ -1704,13 +1437,29 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1765779637, + "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_4": { "locked": { - "lastModified": 1764642553, - "narHash": "sha256-mvbFFzVBhVK1FjyPHZGMAKpNiqkr7k++xIwy+p/NQvA=", + "lastModified": 1765772535, + "narHash": "sha256-aq+dQoaPONOSjtFIBnAXseDm9TUhIbe215TPmkfMYww=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f720de59066162ee879adcc8c79e15c51fe6bfb4", + "rev": "09b8fda8959d761445f12b55f380d90375a1d6bb", "type": "github" }, "original": { @@ -1742,15 +1491,14 @@ "flake-parts" ], "nixpkgs": "nixpkgs_4", - "nuschtosSearch": "nuschtosSearch", - "systems": "systems_4" + "systems": "systems_3" }, "locked": { - "lastModified": 1764803799, - "narHash": "sha256-94SMf4Uw5iSoX37ui6LAdcadCUHUDfrvggGay0uWkis=", + "lastModified": 1765961056, + "narHash": "sha256-RCPRBIqKkwngttpcOhRVMbsCjnKYpc6Q5W7gwp36RN0=", "owner": "nix-community", "repo": "nixvim", - "rev": "5d1c27e53c96e2c94e69f2e2d083ef147b3a3ccb", + "rev": "51bbde565a7538bb4e75defee13b3e951fb0ba81", "type": "github" }, "original": { @@ -1766,11 +1514,11 @@ ] }, "locked": { - "lastModified": 1764813214, - "narHash": "sha256-+iMnWX2IWN5tqZm0gqvSCqp31wOoFGisxKMhhTnwz/g=", + "lastModified": 1765969510, + "narHash": "sha256-MToYWuaVSIP77klo+HV7rmPKRsvx3EBAIFqJyF6pMG8=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "c070b0051f44c1f4a5ba8f6dff68b1f80f338741", + "rev": "299e9423d8750457afc891b0992d025946a5527c", "type": "github" }, "original": { @@ -1843,11 +1591,11 @@ ] }, "locked": { - "lastModified": 1764840168, - "narHash": "sha256-xxuRwGH7U/dLfTs5LFBvn43Ik215buaXYhfPjfNucBA=", + "lastModified": 1765963779, + "narHash": "sha256-jJm8Anja7hB9V1t7FzcgUqQTfRsP5lXEr5CvlcITnxM=", "owner": "nix-community", "repo": "NUR", - "rev": "3485c8f55f1844dfa0b73bebbc5c4045bd390a62", + "rev": "690367ae14b5f5ab3640185ccb1e7a43e59e1f01", "type": "github" }, "original": { @@ -1856,29 +1604,6 @@ "type": "github" } }, - "nuschtosSearch": { - "inputs": { - "flake-utils": "flake-utils_3", - "ixx": "ixx", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1761730856, - "narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=", - "owner": "NuschtOS", - "repo": "search", - "rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -1906,6 +1631,26 @@ "type": "github" } }, + "proton-cachyos": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1765555917, + "narHash": "sha256-WL/rWdp7uU3+iv6m3OwhjNyIP0vlFV73NM5ku/jnOAU=", + "owner": "powerofthe69", + "repo": "proton-cachyos-nix", + "rev": "72585b05f8e8c3ef172d9b770c6c5a0a2e705b75", + "type": "github" + }, + "original": { + "owner": "powerofthe69", + "repo": "proton-cachyos-nix", + "type": "github" + } + }, "qml-niri": { "inputs": { "flake-parts": "flake-parts_3", @@ -1916,11 +1661,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1763154417, - "narHash": "sha256-EMMGP1HRbEcJ1lD/bx7Hv2938l9A3FjADwXM+pBJA2k=", + "lastModified": 1765446572, + "narHash": "sha256-jbtRlMH5LINSUfWu5tysk3+QHY4GfAFrktjeCOID1lI=", "owner": "juuyokka", "repo": "qml-niri", - "rev": "448f27c815f9af550e595c33a1c40d50ba705159", + "rev": "070cedda15467d8a715656ba2a2cabc709e9c3b2", "type": "github" }, "original": { @@ -2001,9 +1746,6 @@ "root": { "inputs": { "arcexprs": "arcexprs", - "base16": "base16", - "base16-data": "base16-data", - "chaotic": "chaotic", "ci": "ci", "clipboard-sync": "clipboard-sync", "colmena": "colmena", @@ -2025,7 +1767,6 @@ "mewtris": "mewtris", "microvm": "microvm", "minecraft": "minecraft", - "naersk": "naersk", "neorg-overlay": "neorg-overlay", "nh": "nh", "niri": "niri", @@ -2034,12 +1775,10 @@ "nix-index-database": "nix-index-database", "nix-search-tv": "nix-search-tv", "nix-std": "nix-std_2", + "nixcord": "nixcord", "nixos-cli": "nixos-cli", "nixos-hardware": "nixos-hardware", - "nixpkgs": [ - "chaotic", - "nixpkgs" - ], + "nixpkgs": "nixpkgs_3", "nixpkgs-lib": "nixpkgs-lib_2", "nixpkgs-xr": "nixpkgs-xr", "nixvim": "nixvim", @@ -2047,6 +1786,7 @@ "norg": "norg", "norg-meta": "norg-meta", "nur": "nur", + "proton-cachyos": "proton-cachyos", "qml-niri": "qml-niri", "quickshell": "quickshell_2", "rbw-bitw": "rbw-bitw", @@ -2055,20 +1795,18 @@ "simple-nixos-mailserver": "simple-nixos-mailserver", "slimevr-wrangler": "slimevr-wrangler", "slimevr-wrangler-src": "slimevr-wrangler-src", - "snowfall-lib": "snowfall-lib", "solaar": "solaar", "sops-nix": "sops-nix", "spicetify-nix": "spicetify-nix", "std": "std", "stylix": "stylix", - "systems": "systems_5", + "systems": "systems_4", "tree": "tree", "treefmt-nix": "treefmt-nix_3", "ucodenix": "ucodenix", "vicinae": "vicinae", "vicinae-extensions": "vicinae-extensions", - "vicinae-rbw": "vicinae-rbw", - "wezterm": "wezterm" + "vicinae-rbw": "vicinae-rbw" } }, "rust": { @@ -2091,23 +1829,6 @@ "type": "github" } }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1752428706, - "narHash": "sha256-EJcdxw3aXfP8Ex1Nm3s0awyH9egQvB2Gu+QEnJn2Sfg=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "591e3b7624be97e4443ea7b5542c191311aa141d", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, "rust-overlay": { "inputs": { "nixpkgs": [ @@ -2115,11 +1836,11 @@ ] }, "locked": { - "lastModified": 1764816035, - "narHash": "sha256-F0IQSmSj4t2ThkbWZooAhkCTO+YpZSd2Pqiv2uoYEHo=", + "lastModified": 1765939271, + "narHash": "sha256-7F/d+ZrTYyOxnBZcleQZjOOEWc1IMXR/CLLRLLsVtHo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "74d9abb7c5c030469f90d97a67d127cc5d76c238", + "rev": "8028944c1339469124639da276d403d8ab7929a8", "type": "github" }, "original": { @@ -2192,50 +1913,21 @@ "type": "github" } }, - "snowfall-lib": { - "inputs": { - "flake-compat": [ - "flake-compat" - ], - "flake-utils-plus": [ - "flake-utils-plus" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1736130495, - "narHash": "sha256-4i9nAJEZFv7vZMmrE0YG55I3Ggrtfo5/T07JEpEZ/RM=", - "owner": "snowfallorg", - "repo": "lib", - "rev": "02d941739f98a09e81f3d2d9b3ab08918958beac", - "type": "github" - }, - "original": { - "owner": "snowfallorg", - "repo": "lib", - "type": "github" - } - }, "solaar": { "inputs": { - "flake-compat": [ - "flake-compat" - ], "nixpkgs": [ "nixpkgs" ], - "snowfall-lib": [ - "snowfall-lib" + "utils": [ + "flake-utils-plus" ] }, "locked": { - "lastModified": 1764670272, - "narHash": "sha256-nzbjvav3wEC9gUgl5XH/VRnlNN4P2bLxK4Senz0uaVU=", + "lastModified": 1765533253, + "narHash": "sha256-uqslimZxAt7KtpxKXWBANdOT40/iHKULoEnA8yp/GbI=", "owner": "Svenum", "repo": "Solaar-flake", - "rev": "8e70e50873b756ee2e721b907677dfcb4be25a6b", + "rev": "c78dd3ce38b71225d1f9f6255ad8270598734106", "type": "github" }, "original": { @@ -2251,11 +1943,11 @@ ] }, "locked": { - "lastModified": 1764483358, - "narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=", + "lastModified": 1765836173, + "narHash": "sha256-hWRYfdH2ONI7HXbqZqW8Q1y9IRbnXWvtvt/ONZovSNY=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5aca6ff67264321d47856a2ed183729271107c9c", + "rev": "443a7f2e7e118c4fc63b7fae05ab3080dd0e5c63", "type": "github" }, "original": { @@ -2290,11 +1982,11 @@ ] }, "locked": { - "lastModified": 1764698597, - "narHash": "sha256-4f0y9Fo3AChngd/qRQ7wbcy6FH33NFZbyFXn7IeUI14=", + "lastModified": 1765687197, + "narHash": "sha256-5aJgT+lEC7ypuAGE3DQLj3LzYDQ+kRG6MnkVr3ZF9RU=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "1da6ebbbcf0301ff773e9c43bdd4c051af9523f7", + "rev": "fa6a5dde9d95bf7b8f075ff5aceeb1d97fa9043a", "type": "github" }, "original": { @@ -2359,7 +2051,7 @@ }, "stylix": { "inputs": { - "base16": "base16_2", + "base16": "base16", "base16-fish": "base16-fish", "base16-helix": "base16-helix", "base16-vim": "base16-vim", @@ -2384,11 +2076,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1764798099, - "narHash": "sha256-IIwR5ZWo7tjxjRpkz0tViF9KFbQ1YXs9Wkan46WQbfk=", + "lastModified": 1765897595, + "narHash": "sha256-NgTRxiEC5y96zrhdBygnY+mSzk5FWMML39PcRGVJmxg=", "owner": "nix-community", "repo": "stylix", - "rev": "4b9e0e7ba3cccb86fe2bf0f4a2dd18256bef1cc6", + "rev": "e6829552d4bb659ebab00f08c61d8c62754763f3", "type": "github" }, "original": { @@ -2457,21 +2149,6 @@ "type": "github" } }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tinted-foot": { "flake": false, "locked": { @@ -2643,11 +2320,11 @@ "cpu-microcodes": "cpu-microcodes" }, "locked": { - "lastModified": 1763395895, - "narHash": "sha256-Ws+pqV0QxJ6oNU8sEwok8JQRkj4mAFOIwTMaA/K3G/Q=", + "lastModified": 1765323566, + "narHash": "sha256-YWs6ZlUGBRYLWxRXy9SB184qwPCEnfQqepmSmTw7cFM=", "owner": "e-tho", "repo": "ucodenix", - "rev": "ae4840d921c77482f30e45a849025ad436e65521", + "rev": "98f3557566919631c392b87a9734a5aa6319552c", "type": "github" }, "original": { @@ -2692,11 +2369,11 @@ ] }, "locked": { - "lastModified": 1765122409, - "narHash": "sha256-CR4yU44yKqQHOuS5i/ca+05K90sKfcZ+7uoARjrOOJo=", + "lastModified": 1765275178, + "narHash": "sha256-jhlWZ6WfFBjS7CXbUOreZ2zEnYiVYfeqKOaZguFFslA=", "owner": "vicinaehq", "repo": "extensions", - "rev": "6e0c6e9eec288a577183998fb24bc8134b236e5d", + "rev": "b698ce7ecb58dec1efe297f87370253d8f6ba9d5", "type": "github" }, "original": { @@ -2708,11 +2385,11 @@ "vicinae-rbw": { "flake": false, "locked": { - "lastModified": 1765285656, - "narHash": "sha256-ncZmIQw89KRof41ZrgAvt2L+UjIHGy11EMq767Nw5yg=", + "lastModified": 1765286183, + "narHash": "sha256-NUOZDJT2vbUTE1GajOEPTQeviyoprZObK3pFzKx3xDE=", "owner": "kittywitch", "repo": "vicinae-rbw", - "rev": "ae004193b80bf38a0bd66dae37a82c8308191163", + "rev": "a982b19b9017e746dcca1155515043767f5a82bf", "type": "github" }, "original": { @@ -2721,39 +2398,6 @@ "type": "github" } }, - "wezterm": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "freetype2": "freetype2", - "harfbuzz": "harfbuzz", - "libpng": "libpng", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": [ - "rust-overlay" - ], - "zlib": "zlib" - }, - "locked": { - "dir": "nix", - "lastModified": 1764575867, - "narHash": "sha256-P2ASskcmdsYLMCkpc7xncHMVxBs+GtwLEZ9jfg+fSwM=", - "owner": "wez", - "repo": "wezterm", - "rev": "d3b0fdad453e8b5f12b583c5d6849b33d975c19c", - "type": "github" - }, - "original": { - "dir": "nix", - "owner": "wez", - "ref": "main", - "repo": "wezterm", - "type": "github" - } - }, "xwayland-satellite-stable": { "flake": false, "locked": { @@ -2774,11 +2418,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1764721075, - "narHash": "sha256-ChH4nq0cMEEkzkHqKlQt5Z7wxrk8ybcEHuA1YKAYmV0=", + "lastModified": 1765935116, + "narHash": "sha256-lNyckAdrhNKXsi9pNOBYajntNFlWs+BITVoIZuNuwX0=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "1b918e29b419e89910014054e8b71d54c9235ea5", + "rev": "979eab242e60cf481a31d9de508a1bdaf2dcf7d4", "type": "github" }, "original": { @@ -2786,23 +2430,6 @@ "repo": "xwayland-satellite", "type": "github" } - }, - "zlib": { - "flake": false, - "locked": { - "lastModified": 1705948357, - "narHash": "sha256-TkPLWSN5QcPlL9D0kc/yhH0/puE9bFND24aj5NVDKYs=", - "owner": "madler", - "repo": "zlib", - "rev": "51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf", - "type": "github" - }, - "original": { - "owner": "madler", - "ref": "v1.3.1", - "repo": "zlib", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index cb86ee8c..25c35cdd 100644 --- a/flake.nix +++ b/flake.nix @@ -73,6 +73,14 @@ nixpkgs.follows = "nixpkgs"; }; }; + nixcord = { + url = "github:kaylorben/nixcord"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-compat.follows = "nixpkgs"; + flake-parts.follows = "flake-parts"; + }; + }; vicinae-rbw = { url = "github:kittywitch/vicinae-rbw"; flake = false; @@ -105,8 +113,8 @@ empty.url = "github:input-output-hk/empty-flake"; # self-explanatory nixpkgs = { - follows = "chaotic/nixpkgs"; # TODO: replace follows - #url = "github:nixos/nixpkgs/nixos-unstable"; + #follows = "chaotic/nixpkgs"; # TODO: replace follows + url = "github:nixos/nixpkgs/nixos-unstable"; #inputs.nixpkgs.follows = "chaotic/nixpkgs"; }; qml-niri = { @@ -128,6 +136,10 @@ treefmt-nix.follows = "treefmt-nix"; }; }; + proton-cachyos = { + url = "github:powerofthe69/proton-cachyos-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; infrastructure = { url = "github:gensokyo-zone/infrastructure/main"; inputs = { @@ -157,14 +169,6 @@ nix-options-doc.follows = "empty"; }; }; - chaotic = { - url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; - inputs = { - #nixpkgs.follows = "nixpkgs"; - rust-overlay.follows = "rust-overlay"; - home-manager.follows = "home-manager"; - }; - }; flake-utils-plus = { url = "github:gytis-ivaskevicius/flake-utils-plus"; inputs = { @@ -177,16 +181,7 @@ #url = "https://flakehub.com/f/Svenum/Solaar-flake/0.1.2.tar.gz"; inputs = { nixpkgs.follows = "nixpkgs"; - flake-compat.follows = "flake-compat"; - snowfall-lib.follows = "snowfall-lib"; - }; - }; - snowfall-lib = { - url = "github:snowfallorg/lib"; - inputs = { - nixpkgs.follows = "nixpkgs"; - flake-utils-plus.follows = "flake-utils-plus"; - flake-compat.follows = "flake-compat"; + utils.follows = "flake-utils-plus"; }; }; quickshell = { @@ -226,20 +221,6 @@ nixpkgs.follows = "nixpkgs"; }; }; - naersk = { - url = "github:nix-community/naersk"; - inputs = { - nixpkgs.follows = "nixpkgs"; - }; - }; - wezterm = { - url = "github:wez/wezterm/main?dir=nix"; - inputs = { - nixpkgs.follows = "nixpkgs"; - flake-utils.follows = "flake-utils"; - rust-overlay.follows = "rust-overlay"; - }; - }; ci = { url = "github:arcnmx/ci/v0.7"; flake = false; @@ -368,21 +349,6 @@ url = "github:arcnmx/nixexprs/master"; inputs.nixpkgs.follows = "nixpkgs"; }; - base16 = { - url = "github:arcnmx/base16.nix/flake"; - inputs = { - nixpkgs.follows = "nixpkgs"; - flakelib.follows = "flakelib"; - }; - }; - base16-data = { - url = "github:arcnmx/base16.nix/data"; - inputs = { - base16.follows = "base16"; - nixpkgs.follows = "nixpkgs"; - flakelib.follows = "flakelib"; - }; - }; nur = { url = "github:nix-community/NUR"; inputs = { diff --git a/hardware-configuration.nix b/hardware-configuration.nix new file mode 100644 index 00000000..b921059e --- /dev/null +++ b/hardware-configuration.nix @@ -0,0 +1,22 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = [ ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "rpool/data/subvol-103-disk-0"; + fsType = "zfs"; + }; + + swapDevices = [ ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; +} diff --git a/home/environments/hyprland/hyprland.nix b/home/environments/hyprland/hyprland.nix new file mode 100644 index 00000000..3de7ac87 --- /dev/null +++ b/home/environments/hyprland/hyprland.nix @@ -0,0 +1,184 @@ +{ pkgs, std, lib, config, parent, ... }: let + inherit (std) list; + inherit (lib.meta) getExe' getExe; +in { + home.packages = with pkgs; [ + grimblast + wl-clipboard + wlr-randr + wl-screenrec + slurp + grim + swww + pavucontrol + hyprpicker + brightnessctl + playerctl + glib + pcmanfm + ]; + services = { + swww.enable = true; + hyprpolkitagent.enable = true; + hyprpaper.enable = lib.mkForce false; + }; + wayland.windowManager.hyprland = { + enable = true; + xwayland.enable = true; + settings = let + noctalia = "${getExe parent.services.noctalia-shell.package} ipc call"; + vol = "${noctalia} volume"; + bl = "${noctalia} brightness"; + term = getExe config.programs.alacritty.package; + in { + # TODO: break it up + windowrule = [ + "suppressevent fullscreen, class:steam_app_default" + "workspace 2, class:steam_app_default" + "suppressevent maximize, class:.*" + + "tile, class:battle\.net\.exe" + + "renderunfocused, class:discord, initialTitle:Discord" + + "unset, title:Wine System Tray" + "workspace special:hidden silent, title:Wine System Tray" + "noinitialfocus, title:Wine System Tray" + ]; + "$mod" = "SUPER"; + input = { + kb_options = "ctrl:nocaps"; + accel_profile = "flat"; + sensitivity = 1.0; + scroll_factor = 1.0; + }; + cursor = { + use_cpu_buffer = true; + }; + workspace = let + commonOptions = "gapsin:0,gapsout:0,rounding:false"; + in + ["1,${commonOptions}"] + ++ (list.map ( + workspace: "${toString workspace},${commonOptions}" + ) (list.range 2 10)); + + env = [ + "MOZ_ENABLE_WAYLAND,1" + "XDG_CURRENT_DESKTOP,Hyprland" + "GDK_BACKEND,wayland,x11" + "CLUTTER_BACKEND,wayland" + ]; + render.direct_scanout = false; + #debug.disable_logs = false; + exec-once = [ + "${pkgs.swww}/bin/swww init" + "${pkgs.dbus}/bin/dbus-update-activation-environment --all" + "${pkgs.networkmanagerapplet}/bin/nm-applet" + "${pkgs.udiskie}/bin/udiskie &" + "${getExe' pkgs.systemd "systemctl"} restart konawall-py --user" + ]; + group.groupbar = { + # TODO: see if font necessary + }; + xwayland = { + force_zero_scaling = true; + }; + bindm = [ + "$mod, mouse:272, movewindow" + "$mod, mouse:273, resizewindow" + "$mod ALT, mouse:272, resizewindow" + ]; + bindl = [ + ", XF86AudioPlay, exec, ${getExe pkgs.playerctl} play-pause" + ", XF86AudioMute, exec, ${vol} muteOutput" + ", XF86AudioMicMute, exec, ${vol} muteInput" + ]; + binde = [ + ", XF86AudioRaiseVolume, exec, ${vol} increase" + ", XF86AudioLowerVolume, exec, ${vol} decrease" + ", XF86MonBrightnessUp, exec, ${bl} increase" + ", XF86MonBrightnessDown, exec, ${bl} decrease" + ]; + bind = let + uwsmCmd = lib.optionalString parent.programs.uwsm.enable "uwsm app -- "; + uwsmApp = cmd: uwsmCmd + cmd; + uwsmSingleApp = cmd: "pgrep ${cmd} || ${uwsmCmd + cmd}"; + in + [ + ", XF86AudioPlay, exec, ${getExe pkgs.playerctl} play-pause" + ", XF86AudioNext, exec, ${getExe pkgs.playerctl} next" + ", XF86AudioPrev, exec, ${getExe pkgs.playerctl} prev" + + "$mod, D, exec, ${getExe config.programs.vicinae.package} toggle" + "$mod, RETURN, exec, ${uwsmApp term}" + "$mod, W, exec, ${uwsmApp "librewolf"}" + "$mod, E, exec, ${uwsmApp "pcmanfm"}" + ", Print, exec, ${uwsmSingleApp "grimblast"} copy area" + "CTRL ALT, DELETE, exec, ${uwsmApp "hyprctl kill"}" + "CTRL ALT SHIFT, DELETE, exec, loginctl terminate-user \"\"" + + "$mod SHIFT, E, exec, pkill Hyprland" + "$mod SHIFT, Q, killactive," + "$mod, F, fullscreenstate, 2 -1" # dont inform + "$mod SHIFT, F, fullscreenstate, -1 2" # do inform + "$mod, G, togglegroup," + "$mod SHIFT, N, changegroupactive, f" + "$mod SHIFT, P, changegroupactive, b" + "$mod, T, togglefloating," + "$mod SHIFT, T, togglesplit," + "$mod SHIFT, X, pseudo," + "$mod ALT, ,resizeactive," + "$mod, Escape, exec, ${noctalia} sessionMenu toggle" + "$mod SHIFT, Escape, exec, ${noctalia} controlCenter toggle" + "$mod, L, exec, ${uwsmSingleApp "${noctalia} lockScreen toggle"}" + + "$mod, left, movefocus, l" + "$mod, right, movefocus, r" + "$mod, up, movefocus, u" + "$mod, down, movefocus, d" + "$mod SHIFT, left, movewindow, l" + "$mod SHIFT, right, movewindow, r" + "$mod SHIFT, up, movewindow, u" + "$mod SHIFT, down, movewindow, d" + "$mod ALT, left, movewindoworgroup, l" + "$mod ALT, right, movewindoworgroup, r" + "$mod ALT, up, movewindoworgroup, u" + "$mod ALT, down, movewindoworgroup, d" + + "$mod, P, exec, ${pkgs.hyprpicker}/bin/hyprpicker -na" + + "CTRL, Print, exec, ${uwsmSingleApp "grimblast"} --notify --cursor copysave output" + "$mod SHIFT CTRL, R, exec, ${uwsmSingleApp "grimblast"} --notify --cursor copysave output" + + "ALT, Print, exec, ${uwsmSingleApp "grimblast"} --notify --cursor copysave screen" + "$mod SHIFT ALT, R, exec, ${uwsmSingleApp "grimblast"} --notify --cursor copysave screen" + + "$mod, bracketleft, workspace, e-1" + "$mod, bracketright, workspace, e+1" + + "$mod SHIFT, bracketleft, focusmonitor, l" + "$mod SHIFT, bracketright, focusmonitor, r" + + "$mod SHIFT ALT, bracketleft, movecurrentworkspacetomonitor, l" + "$mod SHIFT ALT, bracketright, movecurrentworkspacetomonitor, r" + ] + ++ ( + # workspaces + # binds $mod + [shift +] {1..10} to [move to] workspace {1..10} + list.concat (list.generate ( + x: let + ws = let + c = (x + 1) / 10; + in + builtins.toString (x + 1 - (c * 10)); + in [ + "$mod, ${ws}, workspace, ${toString (x + 1)}" + "$mod SHIFT, ${ws}, movetoworkspacesilent, ${toString (x + 1)}" + ] + ) + 10) + ); + }; + }; +} diff --git a/home/profiles/common/stylix.nix b/home/profiles/common/stylix.nix index 7e7f168b..f29838ed 100644 --- a/home/profiles/common/stylix.nix +++ b/home/profiles/common/stylix.nix @@ -17,9 +17,9 @@ package = pkgs.morewaita-icon-theme; }; opacity = { - desktop = 1.0; + desktop = 0.9; applications = 1.0; - terminal = 0.9; + terminal = 0.8; popups = 0.8; }; polarity = "dark"; @@ -38,6 +38,6 @@ }; }; autoEnable = true; - base16Scheme = "${pkgs.base16-schemes}/share/themes/dracula.yaml"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-macchiato.yaml"; }; } diff --git a/home/profiles/graphical/discord.nix b/home/profiles/graphical/discord.nix index c7cfcb26..5f0a03fa 100644 --- a/home/profiles/graphical/discord.nix +++ b/home/profiles/graphical/discord.nix @@ -1,18 +1,73 @@ {pkgs, ...}: { stylix.targets.vesktop.enable = false; - home.packages = [ - (pkgs.discord.override { - withVencord = true; - }) - ]; - programs.vesktop = { - enable = false; - settings = { - autoUpdate = false; - autoUpdateNotification = false; - notifyAboutUpdates = false; - disableMinSize = true; + programs.nixcord = { + enable = true; + equibop.enable = true; + config = { + frameless = true; plugins = { + # Shared + betterFolders = { + enable = true; + }; + callTimer = { + enable = true; + }; + dearrow = { + enable = true; + }; + fakeNitro = { + enable = true; + }; + forceOwnerCrown.enable = true; + gameActivityToggle.enable = true; + memberCount.enable = true; + mentionAvatars.enable = true; + messageLatency.enable = true; + messageTags = { + enable = true; + clyde = false; + tagsList = { + }; + }; + mutualGroupDMs.enable = true; + pinDMs.enable = true; + platformIndicators = { + enable = true; + }; + relationshipNotifier.enable = true; + spotifyCrack.enable = true; + typingIndicator.enable = true; + userMessagesPronouns.enable = true; + vcNarrator = { + enable = true; + volume = 0.5; + }; + viewIcons.enable = true; + youtubeAdblock.enable = true; + # Equicord + amITyping.enable = true; + anammox = { + enable = true; + billing = true; + dms = true; + gift = true; + serverBoost = true; + }; + betterUserArea = { + enable = true; + }; + channelTabs.enable = true; + equicordToolbox.enable = true; + globalBadges.enable = true; + moreKaomoji.enable = true; + noNitroUpsell.enable = true; + recentDmSwitcher.enable = true; + statusPresets = { + enable = true; + statusPresets = { + }; + }; }; }; }; diff --git a/home/profiles/graphical/secrets.yaml b/home/profiles/graphical/secrets.yaml index f9ddcc33..2890f384 100644 --- a/home/profiles/graphical/secrets.yaml +++ b/home/profiles/graphical/secrets.yaml @@ -5,123 +5,132 @@ sops: - recipient: age1n4kdchmkk3rfkaknxhveqr2ftprdpgwckutt23y6u8639lazzuks77tgav enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFbVVOdTRVMUptdnFjbUtB - Z3VuM3Z3Ylh4aWxGVGw5SEpCelhXUTJtTFRVCnpqRVVXSEQ2emJ3RmdCWldkaVRT - YUhFNTJ6NVZHMjhvbEJpQ3hBclNJNTQKLS0tIHRFa041aE5rVjFOTE9Hb3V1ZXRL - TmV6SjhoMm9rZkNNSGxjOEs0bFFJOEUKG97/46aRMNXYu4DG8tO4rgdkl72DHHha - 496jMdtyTczcGAiv4Jn1RrCA0kcCeYrjJuyh8XY6mc2wDH428SI7jg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4Z3JwUnRIMWRKYjJWYjBH + b1JGMk4zT3kwOTRVakc5OHZybGc3QkJWb3hnCkpGTnZxQ0paTW9FeTVxVjVibEhW + Z0JiU1daNVN1L21RSURKNkJmUFN0YkEKLS0tIEVEZlg4MEtwaDIvVS93WVRBYVpQ + QXg0RlV6TGFqNlpjaW5zRUpac09hRW8KP6BE0fQOoawMjXJcNMA1ELE6c+5bmdg8 + e1/+/CUqTry9Mdl/vGcqBb9y53gEp//gaHcTwMzWn7VykyD0yu5mIg== -----END AGE ENCRYPTED FILE----- - recipient: age1cnu37d5fqyahh9vvc4hj6z6k8ur9ksuefln7sr6g3emmn927eutqxdawuh enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOSUJEY3daNUxHQjg1djN6 - cTNUdmNlR2RJcTNwL2NSaVlhZ2dLYVp0MDJFCjhHLzFQeldFS0YzaytENmdnMzRC - U0didHlqcGZBRzdMUzJIWjdQaDN5Z0kKLS0tIFZmV3hrQ1FyOWlWbFJjTFBXVmox - YnZhVURnZEpHZ3ZkZTVLZUV4bUplZ00KsvT18oRAQ+/Aq3de+qo/BlXEBa7KpScN - eKBNxxN8KEWYW8YBYT9VPHKRL3OU6BE/vjea4sRh9KLmOkRz9X+xAA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBicFVCelQ3TFQyWjkyYjlu + Vmd1NHBPT0REUWNpRndiR2wrM0hrUWFoOGhJCmlPTkZlNWMxdWIzdzNabnJvVjlB + N0RudXg1bG5RNzg5Y3QrTnBwUGZtY0UKLS0tIG1NU2V1WFJYSUtvRlJDVm92Nysz + aHdUdXNqbVFBV0ltUkpCWFZoNFMyUUkKtK0Fri59RiGKMJBKSIcMvfJShC4AM6va + 9c3kz+khQxrDtN0hrgBQSTPzrmA7hhck5h+AMyO/TPWk1tHhkcF3+w== -----END AGE ENCRYPTED FILE----- - recipient: age1a0m73qr8hhuz8xemv4vymf4wmpghm2hst8wgrn3pn65ext5mf4ksk0vsdm enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0ZXJmamxBQ05LWC9YcEcv - YmowM3c0SVVZc29kK3NQYXpEMktob1I2UEEwCncvM080K28wd09aT1U3M2h2U0tN - eTZ5WlVzWk1mOFpOVUU3QmdHYnFDSHcKLS0tIFY4MFZtK0REZHJDREVQNG5rRFRq - d1JDaFhTZEhyUyt5bCs0ZjZqNy9CV1kKl0opBF8V7yuTQiNmF4CBn5DbRKTjIj79 - 1DD9zXMpCd7jKBOvko8TQkayUoH4+qY+If/IXJJCkXy8ALQNY2Z/GQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4WFdnSWdQUXgzRVQyQ05H + amJHRTJBV1k0WGE5Sm5NSU90Y2owSWd4SEZBCitJQW0rNXZYTHpNTFR2OFFLdGJy + WEJtc0FjVThvanlmbnFpLy90a01QOUUKLS0tIEZoeGlNWWk3cU1UNHBzYVlVY3d3 + bjV6RER4VkVBZ0lEV1VoZlpiTGlDeDgKCGz2HrPVDZ3DWZfjyLX0rqRWNf5bXtrK + 37eu9mjzz5ewlOmbXfDn+A6qDGgkBgTsP5Ataa5Qi2mII67ctNOLhw== -----END AGE ENCRYPTED FILE----- - recipient: age18hpxz0ghvswv9k30cle73prvnzrsuczqh87jjdk9fl50j3ddndmq9xae0n enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBselVRVnlKOFl1bnFZSDN5 - a0VTa3VOaUsyeXhOQ3FNUzlZeDlZM0w2RkYwCkZmZGpSSkVkVkEydXdFaHk2WjZC - VlB4QUxaSHNtUFJ5RlRwV0hCUzZtY00KLS0tICtjWGZwNXBkelhGSTNHNGVjdXVr - TTJ5OXBBVW5HQjZjUVdCMmdiYysxUG8Kaviohi0P4qU+oiJL7d6tiFVVcGgseUeL - 2CUpSZvxpe6ZF0a7VUgQjKqquShOHg3yEU+pf/fG0fIMSmqb5eu7bQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRTzVYWVV6NElObVdjQ3h1 + bllNVnErRHpHUEJ4M2dTZDZ0Z1JVU0xSZkNZClV2bFlvOUZsUTByWjNaczQ1NWFv + QUVJZjEvS3hqQ1lxYk1USjJSSnFJQUUKLS0tIHpFdjUwTXZKcjdoVHNGRmlnY2hV + Wmc1aG1pVG81eDVlTjdvUU1lMkZNUG8KB8sXdY70XHvYA84s8kHYlOniJm9xg04E + iYwDiC51R6hrjmXf3QqjRbHifrOzo/6SbdbLX0FwsorYolL9bgIvtA== -----END AGE ENCRYPTED FILE----- - recipient: age1xgy03g3vjydsxcl0qpdgm8rahjcjq95ucxfwlgr22zwjx3p7jf2s9jk6u5 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxOW50S2tPZUtUcGRlUW1U - OFYycmdOVFRqc3BUc0hxZ2hrZ2hxbkZXU0RVClZSc3EyNXRHdEtxVEFsL015UEdR - MnUrelhEYlc4anV4N0FERnk0SExUK2sKLS0tIHNIQ1dNMVZlb05wTnZueVRrdFMr - RFRBZlMyQ0UxajQ3MnQ1RUc0QVczTFEKOV6n5e2+WfCr/MgX42nDlPWSXCgFXxEy - NHVoct4F8NzqxCJ+IeNbxuZkpFd4BDsg82WCQT7sBI2RcRANWT7frQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoSUphR2tXVGw5dUQxZ3lu + Y25DRHRXOWhvUmxkYjVLQ0JjWEJ2VkVOVEZzCkFtWjJkVU5abWRCdFd4K3k2UzBq + TW1rYTJncmR4TmxzVFo3ZmtQOWxvUmsKLS0tIGg2blhEcitWc0dxUTdqTVh0azBL + WGY1NGQwQWlRTWNZZ0J0V0RVQkxqSVkKx/89/rc7uTSbU+eD3Ubkpst3zeqFtova + aDaXNYM9TwiWCMmun4k/b5A8/XkoR6Vw8Vwj780hdcPjuSUoBjpNpQ== -----END AGE ENCRYPTED FILE----- - recipient: age1fv5dafs4n3r5n83qm2hfz7xmnflsz0xf9r3saralrptpgf8mvuxq4t8k3u enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB1azNCeVkrZThUY0w0ZEFT - RzdPVHJSdXlhd3djOVFrMXM0VzdWbFVEOFdJCmx4OTg3QzhweWV4MmFNTjI3UFN2 - ZUxkNmJjb0JqTThNTDE1YXJtdDcxSFEKLS0tIG9VazFxL2hpU1hyeGlzbm5HTXlH - Q1FRR1d3Qzc1eUxSQWxWWkdPeVkxMmcKwd61DX0BhZ/CynCOOO7oq99Ytvii9z0R - y5qEl8v9iTKmJERin/xYeh1pwV6qz0CYkwKYMPq2++5+aH3BF0l6tg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4b1lZbWZkOTVnL1NtZTd3 + WlFtNzhrWUwzYWxTZ2xSbzBqNEd1bnRDUm5NCmY0WTljNkx3MXNFNzNGd0lSY2Np + bmFvZlJZcHFUVGJuZ0hZSWo1MkkvcjQKLS0tIG54VzJldW5xNnpCZExobEcva3po + WDdCNVlWTWViYW51K2llUmJKejkwR28KKZ3pt1FnKdPtl7nPaA0CO7Q+S7VxeJ9Q + MyKs8a4MaDScYSHlGuAxzOJkspRYk8EYgeQhJMFjJOVNwaWudzLNOQ== -----END AGE ENCRYPTED FILE----- - recipient: age120530yclr75k6nrzp6k5jjftj8j4q9v3533guupzk4ct86mjxszqg9e5t5 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEUkJCcUJmZ1ErdHVXVFYz - WklBU3dVa1l4bXA3VEs0Z3UxcmI2MnVGZ3kwCjFud0c5amswaGdFb2lmNU1INkhR - d2ZEUTRrNkNmTTJJd2syL2l5RkZpeFEKLS0tIC92L3VmQXkvMFpwZHg1elUrNmJr - Zk9YVmtQaFcrL2hSSXlwcllVbXRSakkKXHUhfnD4haIzktc3UeOerWycwUDw9BK6 - 5/6rIldi0JYS//4W6DRo6pB84Xc59M0yWN3M6g3qMld2019ohsTmcg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5cFo2NmZVMkp3ZGN6cEZJ + dklPbW1SMnYzUEdKMVRGTkNHWC9HVGFQQkJJCkVZR09MdDFReDRSaGh0YkwyeUxZ + cFdHV3RPa0wyaVZlUEVRSTVxQnprY0UKLS0tIEMwSGk5dlBsUGpRM3RyS2hKZEF0 + Ly9kNnl3MUpXZW01WlBkaFNnSzZmTWsKPp1tw3iMDRLL1A/l3LiecOsGwzbO3yxV + hNuKy07vL/U1Jl77hb9pycUfD6vowvPVfIXGBaSrjti4gj5STlEbAg== -----END AGE ENCRYPTED FILE----- - recipient: age1rt0ngkum32wt6l2wnyr40hmwd9ulmzqfarg5vk62zqp0uvj4lyuqd2atgq enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqanJOTjJRS3lZQVV3UFFa - cmN0NkxmeS80aXpKZVVjZEl0OWJLMHJSOHlnCm5LM002QVdQUWl4dmhYUVQvR2Zz - ekR3SzBNR2krOWJyVHQwSzV6VUd1eG8KLS0tICt1NjVvWk1Xby96UkhxdFRYQU85 - aVFUNUJEeS9kVUxhcEJ0YkFlOWM4eEUKtdW7FJUEQkxTyfZsvmQ34jQCpHnT5FOm - +3uKArpPamaIkAsR5SUe0+GXLShnTxexsJ6W9ezz7kvrJ7b4Bjx+qA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWeEhWSlUraEZIWFkvWjVF + b3NQMnZHbGFzbHlHVVFXRHJiTzZ4SkVtTEdBCk9ZVndVTWthNjZNTitGa1ZwajdO + ZjluZytDME5ZMDJqeVVQWEc3Qk9mYVkKLS0tIFZRSTZFL09QUFMzd2tjYTl3bkhJ + V0RFVVZINGpjS1hSTys2TVBSTEM3Rm8KFZnIKaU142dFDgU1afVUtnsZQ/9HARMT + kwbgYJjvXk2LBbxLcGN4U15J43Ywrs2n3sh2T3nHWTMGVum1za27kA== -----END AGE ENCRYPTED FILE----- - recipient: age1c4atxfp05u7zm875s6q8p82ve96rqqpq9smktxlur8pk2yc3qvgql46dp9 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJZlJ0VE50NHJkMnJiL1Rm - OWVPSDJ4RmhXZ3RvbVJhVTRycUsvbjZleVZnCkJRYUpMOXI4QjlKYmJ6d1JJRXVr - S3JhUFRQMnEvQnJGNCthczRkYll3VEUKLS0tIDF2Q3pSSzlLTnEwSzY1THhkNHlL - N2ZlTGI4TnRZbUN4RUFqK0xwME9YZ0UKmkomcUw777OLT+5/WWibhz0QaRtMpyeu - /70t/Djw4dx05RoFBRmoIBKxZgBqWuTml5vGxmiZwGkAIsRWK4s/xQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGcWdTSmlCbGVXQ3NpNVFB + QVNCQ0pXR29Db0ViK3NYYnJXL0xKdEFla1dJCmF4NFcrUWlhNFkrMWIxYStsL1ZJ + ZVFJM1FmcE5zalpNRmRDSDJnaUIwSVkKLS0tIE5ua1V2MGFJU0M2YWdBT2M2UjhJ + NTd1aWQxRGo3blloWURYRHFDbi9acEkKuIKIblhOSjbi0/RxuuVOJdmY7TzgFHQ6 + JJOjywD7mu+luzR4hmy8dLZtq/UlaA/8fWhhqvCuz6vp+SBwBkIloQ== -----END AGE ENCRYPTED FILE----- - recipient: age1rjldv3fn3q686647exmcukthr32gmp6s3axs0lhyenvru9ajp9rs24ukvz enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjNWkrSHJjeVR5WjAwQTFu - U1B5d0NLU25nckRITjJFbXQ2Z21WR1NjMUc0CktBaGpvTWVEYU1MMTk2bFNsZUVq - cDZuRWVnbHBzY2ZwaHVPYkk3dnM3SDQKLS0tIEVEQXZ4ZWZ5WENQeTBIWTFKOGlY - UUJuTFU4TDhrTkUvL1hCK09LRkxTazgKjI1L+wZLXaNfKQSW28u+9HU2irRXfxvI - ugtO4dvjzowamoxdjT/jTu4fm8pkuYNInKnPuOBvRt8RWlzsKn3Zxg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPa00zOERhOWhSRk5pcWM4 + ZUw0NzBxOVlHV3NFS0xORm81R1BjdFBlSEJVCjREdXZFMTcxMWoyZUNHaklub2Rq + bDh3dG13eGZUeWNyVDJXQjNObWs5b2cKLS0tIHVJd0NFS3VNNEN3dkpqdHFhSEtx + S09GTzdVZVhSSENObmVmcHRUZklzcUkKTqskyvIkLbQr2PliyIdnLOgC4s+DfCt4 + ctJhwOj/kKvtHMf1gzPGijRD2oV+5cQ+jt3dAhLLXOwp6bcY8dgZ6A== -----END AGE ENCRYPTED FILE----- - recipient: age1p9v6xaujkdat2tsc2mc4gxpg9hjr4suvwryuat95z2c53xhsyfxq0gf594 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBsL3lGOGdGR2l5UDZwT0p1 - bzd4Nnd2QkI5eElEYWllRWZCWTZPcHk0ZHhNCkNBaVE5MERWdnN0aWd6TUVsaEg2 - YWZUblRSWDk2eU56cHF2OVhqMFVaNzgKLS0tIFQ4K1plU1pjcE5oYllqTnRwS2dD - WXRJYThMRzJtc1VqUTJOVmEzSXZINkkKMzPp33Nv18X0CSeWXRSffzYZxXUjg61T - pPkAFaiZcBDJIMDcKX0tX+cAoPBO/cTrye34XNlN/E06qOT8GKs+xg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzY0puQkZQa2xFdDhVQzRn + RGF6LzlZV051SndCRHd4cGg2SXFvK05FUFdJCkYxRmJsVUl6cEY5T2lwYVVlTmNR + STEyOFlKRWR2d0Rrcjg4YzdFTzcxSzAKLS0tIGxsUTJ3aDJrbSszMUtkWk1mY3ph + dUFpZW9EWWhpTDcwc2NrS2hCNSsxczQKFBwheeNBYuk0S7UYud/PkVVXvXqDNKgj + XD3FEFIsk8qK+mvf1pRoYave/elELT06Hx1Wqg7WAVVwpYH4vVeqvg== + -----END AGE ENCRYPTED FILE----- + - recipient: age1nxgmdahcjhmtrf7q66jep55cjdcw6tfpw722jr4gytaykgf89ugqxufgyd + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiNHNFbEVxamU4N09SMjNJ + d0xtU29YR3NobGJuRm5LZWYxTlE2bWUyTm5zCi84czRSZ0VOVDJXQWtvNkg5emFE + YVlhN3hNdVpuZkpsd2VsZDlYZk51Y2sKLS0tIHhxMUw3YUloYWM4elhRdm1LQkdW + Uit1SS9DRXVxTUJWRnRCemV2Rkl3Um8KOekBBXlhhC8E1BXpvGQuwSApjBocUTdR + /9K5v3PFafIaSj1pvPvxFeN5VcJALBtrj8IMrCxgIqdJ417DqRrpYA== -----END AGE ENCRYPTED FILE----- lastmodified: "2024-07-13T18:22:26Z" mac: ENC[AES256_GCM,data:k9ml5lzn3OYlJVXFMtJ71dj2FaOZ27BSBPqtLr2ExUKDZUc9AkMTt1DOxQAOIpVmzJdWicVkqFTszfqi03+oPQ11/WZnNFC8FzF4v96LTQ4/OCgVm+ZQhovPV0haw3oZEYHi6tKbtM5BDW++ibjawWOyWQGKL4ZLF+MQEjB0GMU=,iv:w0U2bwC9Th6y24AQBeYx/IaJXROItBPbfPRtWrYEYr0=,tag:92QiGpY2jwszXffW4V9hBw==,type:str] pgp: - - created_at: "2025-12-04T04:58:01Z" + - created_at: "2025-12-15T12:49:02Z" enc: |- -----BEGIN PGP MESSAGE----- - hQIMA82M54yws73UAQ/6Aqi3ccb/oR6TPu/VhRgsE6sK5talWCFE3Vz5BhuZdhhy - edzQ6CkI1md4ThZxytmJz4CKKkg5GYvRj3IIx2rr+4TO/JTjXB62KBF8BzBIKE9y - shO3vSbECAs2nHmkK46e8RLRFHxqFK3PPXwbXNzxuZ/BmnL7T/Ajeu7Wb+pcDnll - rs92PYM0reues4JdgwcFKmIw49Oow4CZJr18PeXy3vrHpQ5c25HC+dnhrT5xb5iq - vbHKUyvc2bnF8BN5qSMd8mis42fVFEXJDA6z1UOwmqPWCLBcERIspou/+MZp6QwU - 3Z1qvB/BlPZloLSLEOAouykzQ+cFB4ZT+H50nCvcPnDHPGgx9+SRC8mkRI+iGJko - ZH3cgdqcF6Tgs7hIqyi3ufKROLeBDQcPga+Pxk7Qqzhnb5HeVCKZ14OS94W+HbEe - LZgCVZK51oyYRO7ZDdLWZZpmsQu3tegFCUFkxlEYupxxBR7S/7WqVFp8C+yd/vlQ - DQ7Ud/vXzQC4nJxACkylWJw6SXgyo/43ojUAScenSsXNI8mkYiApKa+8sOjlCRd5 - bO7w4MsDgu47JN2Z7vIkIU1skFVjh9MuKO1bmf8x6DG2F6aLM6TwVNZlxGXPzq8S - P55Y728YwntPqqKWvg4v38SqtHN1Rz/G1t3pgRtJIe/cCxr3UVZyq2yUrcGdbSTS - XgEFdzdjWv8QAaZk1gERDwCuoKaV5BRWbUxPoRLivdz+9GIsNsXPmpVsS/7etlve - STD8Be/2h+wPBGQFSK8p2dFnNano/t2JvQB1FamUzJqBv8C9/QV9okGPm9dGvS8= - =h1sR + hQIMA82M54yws73UAQ//VJ3RqmIM4x0Y3gHLWHYiPIZZjFUx7GlHT78j+jv0YZEV + y6dp2YsR+UKyBXFm43zUliC/f+wYYnrGXdfXjIGlcKgJfq94NlWQvceQgruwN7D4 + ++pG+IgPohCDX2nM2C/eGWQAM7YFn5A0OmYW8FjYNmEIicBt+iWJ96QEMEKNvhMi + 1sSnAchbjGdDYjmf2mTHOZCKF42B4l7FbFk90Eq36X3RNpURmyyOSgvowu/lYGVp + 0Fa1vNBiOo8AuiMFg/4FJ+wuLcEcaLRdDiqKHM1SZ4+OjnrKKMaOoA4zIb2h+47a + +f4WOxWkly2tJLGmhnlBz+ere+BiyPRTUxcm51YR6aCuEelaVuOrklLE1xLfk5zk + xUzFQySJxfDmqFnmrHO8P1DXJkRk61a8OlGzTPxeSY9AsfzCZbjo+ntePMPGCObh + ArZRCkUOLzR3/4O0W6eAxoEM61jIlrkL5uCZpo4i8B0gWldXlo0WS42twwKoSH4K + swwqcaEHeCnQq/kzlskWISIHYwKDOGFG/7A0dZ/hUEhF8/1p0jUjLPV7IAb8t+mg + 9QRlwmlZZdPkxT/Umw+NQSxLWMvGfZPibF0G3HWkZR0gEVTnBHN7EVnJHEb+YWTb + jhQE4uJ8TDOd/K3s2ZE7P5LUiSWi4q5RgArmaa36/ccbjsUjTkRMN0K7vX2OTlnS + XgGr/b8VK2jIEx4hdg4T29LyHvXaJ6Xww71D2gIkAI6JbjaURcNyTBpZaU6UvrDG + mlWc06jwQpXX6xP80vPoYdZDFIyQm/CpyHRJwt8LqOESa/UeNfX3AiXorNo3W/U= + =n9HR -----END PGP MESSAGE----- fp: CD8CE78CB0B3BDD4 unencrypted_suffix: _unencrypted diff --git a/home/profiles/shell/tmux.nix b/home/profiles/shell/tmux.nix index 347b6887..7b9ecd7f 100644 --- a/home/profiles/shell/tmux.nix +++ b/home/profiles/shell/tmux.nix @@ -19,34 +19,6 @@ in { set -g set-titles-string "#T" set -ga terminal-overrides ",xterm-256color:Tc" - # modes - setw -g clock-mode-colour colour8 - setw -g mode-style 'fg=${base07} bg=${base02} bold' - - # panes - set -g pane-border-style 'fg=${base06} bg=${base02}' - set -g pane-active-border-style 'bg=${base0D} fg=${base07}' - - # statusbar - set -g status-position bottom - set -g status-justify left - set -g status-style 'bg=${base00} fg=${base06}' - set -g status-left '#[fg=${base06} bg=${base01}] #S@#h ' - set -g status-right '#[fg=${base07},bg=${base01}] %F #[fg=${base07},bg=${base02}] %H:%M:%S %Z ' - set -g status-right-length 50 - set -g status-left-length 20 - - setw -g window-status-current-style 'fg=${base07} bg=${base0D} bold' - setw -g window-status-current-format ' #I#[fg=${base07}]:#[fg=${base07}]#W#[fg=${base07}]#F ' - - setw -g window-status-style 'fg=${base06} bg=${base03}' - setw -g window-status-format ' #I#[fg=${base07}]:#[fg=${base06}]#W#[${base06}]#F ' - - setw -g window-status-bell-style 'fg=colour255 bg=colour1 bold' - - # messages - set -g message-style 'fg=colour232 bg=colour16 bold' - # mouse set -g mouse on ''; diff --git a/home/environments/niri/konawall.nix b/home/profiles/tiling/konawall.nix similarity index 100% rename from home/environments/niri/konawall.nix rename to home/profiles/tiling/konawall.nix diff --git a/home/environments/niri/konawall.yaml b/home/profiles/tiling/konawall.yaml similarity index 100% rename from home/environments/niri/konawall.yaml rename to home/profiles/tiling/konawall.yaml diff --git a/home/environments/niri/noctalia.nix b/home/profiles/tiling/noctalia.nix similarity index 94% rename from home/environments/niri/noctalia.nix rename to home/profiles/tiling/noctalia.nix index df9eb04e..bfcb9320 100644 --- a/home/environments/niri/noctalia.nix +++ b/home/profiles/tiling/noctalia.nix @@ -17,11 +17,11 @@ in { settingsVersion = 15; bar = { position = "top"; - backgroundOpacity = 0.9; monitors = []; density = "comfortable"; - showCapsule = false; - floating = true; + outerCorners = false; + showCapsule = true; + floating = false; marginVertical = 0.25; marginHorizontal = 0.25; widgets = { @@ -132,7 +132,6 @@ in { appLauncher = { enableClipboardHistory = true; position = "center"; - backgroundOpacity = 1; pinnedExecs = []; useApp2Unit = false; sortByMostUsed = true; @@ -165,8 +164,8 @@ in { }; }; dock = { + enabled = false; displayMode = "auto_hide"; - backgroundOpacity = 1; floatingRatio = 1; onlySameOutput = true; monitors = []; @@ -201,10 +200,6 @@ in { preferredPlayer = ""; }; ui = { - fontDefault = "Atkinson Hyperlegible Next"; - fontFixed = "Atkinson Hyperlegible Mono"; - fontDefaultScale = 1; - fontFixedScale = 1; monitorsScaling = [ { name = "DP-2"; @@ -219,7 +214,6 @@ in { }; colorSchemes = { useWallpaperColors = false; - predefinedScheme = "Dracula"; darkMode = true; matugenSchemeType = "scheme-fruit-salad"; generateTemplatesForPredefined = true; diff --git a/home/environments/niri/swww.nix b/home/profiles/tiling/swww.nix similarity index 100% rename from home/environments/niri/swww.nix rename to home/profiles/tiling/swww.nix diff --git a/home/environments/niri/vicinae.nix b/home/profiles/tiling/vicinae.nix similarity index 100% rename from home/environments/niri/vicinae.nix rename to home/profiles/tiling/vicinae.nix diff --git a/modules/system/host.nix b/modules/system/host.nix index 1dfd504c..d571ee02 100644 --- a/modules/system/host.nix +++ b/modules/system/host.nix @@ -161,7 +161,8 @@ in { nurpkgs = pkgs.${config.system}; }; machine = name; - system = config; + system = config.system; + #system = config; }; }; } diff --git a/nixos/common/nix.nix b/nixos/common/nix.nix index 606a6fb8..b5c671d1 100644 --- a/nixos/common/nix.nix +++ b/nixos/common/nix.nix @@ -12,7 +12,4 @@ _: { }; #package = pkgs.lixPackageSets.stable.lix; }; - system = { - rebuild.enableNg = true; - }; } diff --git a/nixos/common/secrets.yaml b/nixos/common/secrets.yaml index 9eec9692..a984d278 100644 --- a/nixos/common/secrets.yaml +++ b/nixos/common/secrets.yaml @@ -7,123 +7,132 @@ sops: - recipient: age1n4kdchmkk3rfkaknxhveqr2ftprdpgwckutt23y6u8639lazzuks77tgav enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRNlJNaEUvdmpjNW05OG5D - RWxtb1JobUdKSWZ5SjB3WDFaUUJFOHEwTVFNClUrZStUK2xMVzVxZjF1aUtBMnVp - V1dZK1RDV0NBajdMM1MyUlVRcmpFOXMKLS0tIHlBNFZPVHlDdEhFL2YxTWIrcVhS - KzJXRjQwUTZDR05aZ2luNy9vT2ZFa1kKO0sfxaGVaAUoJEnpQ/OppE/TcGqYbiuY - 3y1fNlFVOOYwqxvnSaqiBn2Dlfq6ugyf/AxW5HKLzp3gtkY0Cd9SxQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1Y2kveFBqNHBvQUZxNUxm + SjFkc2s5azdCY2NWMEYwQnV2eDBkMVFqbUgwCk1LY3g5RGlWR2V4SXNWbjA0RTJo + UnEra24xc2dFQnhNRzRwV1hVbTZqNEkKLS0tIDYyMyszOUtSQlgvYW9iSUtFL3Fr + aVhNVmhFTEZQc1R6S0FVcFhhWWtyVjgKiZgS/g7u44c4eNfBB5JnJh4QDdVErmiD + kpee0Og2/Z8egLCjzXFmZXT9P0DPHITIKfkJoS5TYoirAA5XZNbmxw== -----END AGE ENCRYPTED FILE----- - recipient: age1cnu37d5fqyahh9vvc4hj6z6k8ur9ksuefln7sr6g3emmn927eutqxdawuh enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFaGYvbzNuUUtSM1VEdHAv - T0ZhSWtJOUNjL2ZtTVQyaFd5NmtBSlo1T1ZvCkZROHZpN010R0w3MU9veWlVQS83 - QVZYcmtyTlVMRTBBUzhLaVYxcUFyb2cKLS0tIGhwa2FkZy9YeDFpZnpad3hZQmQ2 - TUFyNXdsYlFRV3lnUi9ON3FXZlMyNlEKRT1o5RV5gtiuuyxM2hLUxlVzhck2Nqz6 - DvyZUsdjitw7RpMZbS/verDBelO5fbXqVDrdWm7YnIQKc4SJdIn9fA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPdlhINzFkWEdscjB0bng1 + NUlFUDZ6QUY1UmNaS05CQlpaUGZYdW4yR3l3Cm95WEFMOENjQmNMUXpLRXM0cGxo + RGhzQTZoWGtBNnc4Q1FsN2R2c0JQU3MKLS0tIFlVc0hjMW1ERkhOWjJZbEUveDRs + WUJKVTVydGlNbzZhcEtVY0FKeUFzb3MKRjRCOiY1u+y3Tz496IzwSyQBy9CRfbeJ + 87NA17iL6DBwJFc7y++1LDIcL4xMPcBokfvjo/TBGBVbwBFm6YV33g== -----END AGE ENCRYPTED FILE----- - recipient: age1a0m73qr8hhuz8xemv4vymf4wmpghm2hst8wgrn3pn65ext5mf4ksk0vsdm enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlQU4rS1o2NDkzTndXa3Jo - RG5XQ1FFeG1RV0YySHB5dmtjQ0RxWG5aN0VRCjhBUWVOeWxzZnlPYzRJZFd2cXZa - OXp6TUNWdEhoVVdnWFV1bjc3VkxocU0KLS0tIHF3QkJNZTRseEFqN2Vkc1cwZE1k - UlRpQU15RDRUSmNnaFN3OGw5YmFNd1EKMlJqQPHAtJ55LSNV9vksuTpZD6G//Pll - BaYDlXdwBB72BVrC0Q2C73OtwCmbRhbBS7nnNXhgdzzl3qlGW75IcQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYRFpzV05GMHJ1WlRhblZU + bEV4TEl4blNDa09CcHBrQW1zRk5YZ0V6M2lFCjFBTHpMdW1ZWHlJcHRtVVViWU5G + bEJXd0drNXY0VktQSzJKRFRIMlloMkEKLS0tIDg0MVhXOEhvRUVaQVhwRnZoSnRJ + RkZWVDRsc0dmaGlBT0dWYzc3TEVadlkKRwHdye1+PQY6M7x7Tt6mynil3nx1tCPo + DVJCnl1EhMP+gKa2nwMTlerMsC7n5WMXSqEXtf05Iy/UtBCBdkeHPQ== -----END AGE ENCRYPTED FILE----- - recipient: age18hpxz0ghvswv9k30cle73prvnzrsuczqh87jjdk9fl50j3ddndmq9xae0n enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBsc2UrSkdsK3pBM0NCWVdr - S1pNWGVndjEwWGt2aFMzYnRyTDdUMXdINXdvCkVRTVovbnVWc0JCNGdHZFB3Q0V5 - SUFmR010azhXUjExUHVLMnZhblZFU1UKLS0tIEh4TE94TnVKZHMxdkRRcHVLbnRP - K0tncHpLeHVZU3hXSjZKSVVxbWFDMHcK20aUuOsR7/mDOPPpg0mLLa9SkWBnCJb1 - 6hcQ7FtrdxHGEoq6TzduvHnIaUV6fo1jBr0DfKIEIeEjS8gova4B7A== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwSGZyL2syb1haK1V4RDVI + cjJyby9zSStNVEQyKzNOS05pZzlnM0JScUJnCkhqanBodlExVWY3Y0I4eVY2OWRO + cWZrMFRoOVZJZHV3eEFHYk9pYkk0a0kKLS0tIG9HclJDMFJGb2gzQmZnN3F5WHF5 + SkpRbWxRek4zZ0dUTVduaFl1T2FWNHMKohrX3ezrj120CvoZ3CcMcKvw/h0r98vy + 8xKV0psRmJ8rEDF0/IkdKKsRE3QfkF6+liCyXdk08mEIsPk71CWZwg== -----END AGE ENCRYPTED FILE----- - recipient: age1xgy03g3vjydsxcl0qpdgm8rahjcjq95ucxfwlgr22zwjx3p7jf2s9jk6u5 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFMlFjM3hHeDg5aU1mU2F2 - N3IxTW9wZlhabUdZL1h3RjZuY25ENW1IOWhVCkNIYmFPTHpuUkhpaFVpcUpZQzEv - aXlJTDM1aXZWeTBqakk4cEVOOUdrTEkKLS0tIEIvM04wdG5Zdit4eTBBbDNoVVR6 - MUw5WTF4RUMxU0Q1QlJkZDE5RHpneDAKyAVph0YZf6JmxRplQtRuBwFOc0GsjpsE - 7wiRaNzPra1M//Mv4L8SbYURqWWmQ3WCpXs1CypT8mMV6iCSu/yQDg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5NUlHS2tmQ0NxT0FZVWp3 + NUhnSHJrbFBGNWwwWjN1b3UydTlOVkJCOWprCmZDekdLRDdjeTZWY3NUWkMxUDlr + THlObTV0UnRhbm1DOE5iaGNDYVNuN28KLS0tIG5FRmpRc1NOdmVQQUMydERHYmZx + aHZiNUFpUnJpZDF6SkRNd0tNZGFZcEEKoaKH3ovO2x7Ie7OCqsqJNRbZqQpblv1T + IvWwGEUifLGeVXGSs9v5k92H4nzDgZVOFKyLDzqBFK8iUloTjGZlgg== -----END AGE ENCRYPTED FILE----- - recipient: age1fv5dafs4n3r5n83qm2hfz7xmnflsz0xf9r3saralrptpgf8mvuxq4t8k3u enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2L0xQZjVJVHZrUTREMitN - eVc2ZmZTbnhCL2lQQXdWa0JSY292MUtYN0QwCmpWMVg2N3ArUHhsNEtac1poMHpw - dTg5aUFvbFo4VURqNmVYbDNhM09ISVUKLS0tIGVUMEVxZzZGRHkrSTFWRjh0alM3 - aUpYa2VOaDUyQ1ZzdE1NMVZEREVZczQKN3qJqD23yo6jx2soyGet1KsuZSUw5UXG - 5u5FriLsUXqpBHeEDwap5SUtf+8gTh+HTtcuLmecZ2kf6BtMQr5BpA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnVkR3dnhoRncvTVc1SE50 + Q2lkRmZ1cTY3WklIYjFwRm1Jem13RGJaM0JFCkVvK0hwa2dCY2ppSnVPUGdvQVJS + YXFLZmlGc2svVVhCNmNyeEk4S1YxcXMKLS0tIDlhdEF0QnZvY1JBaEtVMjhEWkpt + V3YwWVlkYms5REVtVWUxMmZHNkNueGcKswJj1Zw+9v8MuB16uYb6oUZjwCg6rkpx + V+xFm0kMRmcq23/4KZpX28nGSJQ9uw5fwleCyqjs7FgpkbAHHHfJfQ== -----END AGE ENCRYPTED FILE----- - recipient: age120530yclr75k6nrzp6k5jjftj8j4q9v3533guupzk4ct86mjxszqg9e5t5 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2Zm9OcUlSQjZvR0xwQWQ5 - N2Y0U1Zsc1hsaUJ6RDNzT2JTVFdxK0tLWkNvCmlCcFNJdUZoaTZPM0dYYjlZalBx - VGszZ2c5bFFtL2hEQ3VkK3dtR2QzK3cKLS0tIGlVNmlsSzlUSjh4SVE4d3I1OGVJ - MHM5bkxoOE03Y2lRVUp1YzBVcFFPRWcKdMIuBIdh1Kq238KG/izDjGb3FR0volZc - bUhkAG1b3/S9SrsIXYRYMfig+UCb6jvTDwCf16DdkDJk40eFMbncxw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhODRQeVFJRzljR3pvTldh + MDRaQnVrdzNETzh1YStydFJDQ1l4Q293ZG5FCjJpQXR2L1R6eUhWcUlkcThIb09L + RXVSL0FBQkVVeWtqSkgwMThCRTE2L1UKLS0tIHlTSjh3Z2M4ZUlHS2Q0Z3Y1RjRZ + S25aMFVZbjlNYU52YVFWSk5lT3JXaFUKoa86zKM/qBzm+cv6Ep7hg1ZnOFDlWgqz + D0ay8fre5KvugaemrDxfMFJjj/rOf9AAdknEleNyUSKoHk88weebYA== -----END AGE ENCRYPTED FILE----- - recipient: age1rt0ngkum32wt6l2wnyr40hmwd9ulmzqfarg5vk62zqp0uvj4lyuqd2atgq enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxUEo1TGp2NGlMSHZERytl - UHNoVW5EMEk0aE1wdDVxbHYzQkhsZTJtandzCndNL3VpWkJwZE1JRWtUeWMzSTlI - YlRMTHdyNzBtNy84bDViMGN3NWRRa3MKLS0tIHVXQ0NsU0dLZk1VRjB1UEUzZEUx - cHpxNkxZTElrdjM5eVBiWDdKQkxSSEEK0sc3YKo9LQmlJD5AgZcAX3w4WaPPSK69 - QCV/2ArWMk5dn0ViqVnakWHCry1Ye70v2BEp7qPJ3bvEmj7KUcR4Fw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5T2svMHpQbFdiVXNtOUs1 + aU5SdGxhd2RIZnh5SzFyOUl6RjNhbzlHd1JVCjJsSmVkbWN0cnVVOW1NQnBCMEdC + cmJZalpTU0RhOHBmMGpsRlhaRFdUVWsKLS0tIG41MW1NcytMZEhUU3A4QXd0SmpI + SDliemx6MjJoRmd1clgzNURxSjRRYzgKTlZUVsZmsgikEUVkEOGpZH2hwU+9yTuQ + KwftGn84G9oxWHy6PX91enhyhs47lljL+Zc8bBwW5Tbh3CSl2p4lJg== -----END AGE ENCRYPTED FILE----- - recipient: age1c4atxfp05u7zm875s6q8p82ve96rqqpq9smktxlur8pk2yc3qvgql46dp9 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBodHNmSld1SFJ3NVdsb2Uy - b2YvVW53RFNUUnJjRk00MmhiNE1Fa2VhRXlRCmpQMmRXR3ZKZXg2NXJyQXFJS3Zr - cXBMRGFMdkx6ZnRYMUxBamd6WWdtM2cKLS0tIGgrbGQvVENHdXA2OVhrWkdqdG9Y - T1pqaUFxMDNpbzFtTVNISi9iNzRNbkkK2KU2I+9f9f+fzbGalboMgEFrCfLlqTVa - SIJk3L06kRM2NdbCRFhisGy0wWrWIwkJyHTFtjj+Dhue2JyUN86uAw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3b2RZSWN3aDJ1Z1RGUkFV + emxTbUNVdy91ajdhbnp6ZFl0UWtRSDhFTFY0CjUxUXJxYldkNStsb0NVRU5PZDFQ + UHBqN3dIaVo0SFhaVVNTeUw1aFBTbDAKLS0tIGQ1Umh6RENGSDRscS9EZ0FFeUlP + VGY3NndXWnVONkNPVkJLbTZiL2FDNDAKliDLiW8YpjM+mWs9hWic2OineCZ6lFVJ + S+EB/FZdNfgQHTCWpbFKqY7cEJL4faaAP+5knCU3oubtFnQ0Iko4YQ== -----END AGE ENCRYPTED FILE----- - recipient: age1rjldv3fn3q686647exmcukthr32gmp6s3axs0lhyenvru9ajp9rs24ukvz enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQT21zd3ZZY0NuNE5vaVBm - QXMvV0FZVktJZXVEdjNQSWo4QS8yZ1lCSmgwCmJHd1J4R2VNSjZtUy9PaS95a0V1 - MmtrNjJVVEovSWtsdjNTMWMrL1JsSE0KLS0tIHFIRVIyYjRUNm55UHRDYzVXSWtW - UzBNWmJJK1FVVHVVMkdEMXhtNGVSZncK0ffIz5JzyiAMNtMB65JbOZkyxklw3F0o - 67KA74McNqSIjsijzkj2pTKSZguSlkqfFzSe7GwfZ3xVK3A87zFPqQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQUFRqdHo0OFlCcGpScnlE + RHYvYWFMMXYxb3hraE01Tk4vMlhiRW1abjBVCkpqUnkyT1AweVN2WlY1bU9WdzlO + Q0I3R1BJaGdodjRnbFVNZkVzOXhWTTQKLS0tIHliOVorV3pYcW1ZUG9mdlBWTU1z + TzhoOHBCZzliWGNmZlZyc3pScjl2ZkkK47mgMSMvUQ1WxNc7rkxnm+OX6P8BhuXN + O44yampnhB1tXNY/MKc+PMl0baCoscuk5VOW4EC1WDbC6dUFA03vlw== -----END AGE ENCRYPTED FILE----- - recipient: age1p9v6xaujkdat2tsc2mc4gxpg9hjr4suvwryuat95z2c53xhsyfxq0gf594 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnNCtkZWNibTZYcEZ5Qms0 - MHZkS0NuSWQ0bE9aVmpraGJyN3pqTC9JZ1hNCnFBMUtkVjhkOGFkcitVVDVQblF5 - RkJFbGs0QXJqSE1SVld1TUNGelJHVGcKLS0tIFRYUlgxOEF6NGJWNlRMeXc2WC9H - Z2ZzczE1a3BIRWJmUjBKTmNITFAwOTQKzz1JBnD5vb9wuY1tyyZL84MMLKwVH/y/ - lUHYwC+XJEYXOa+pM4nH0Cuq70ybof4LYY9dIt9zUSmSCE0MAS6H7Q== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXSmc4QUlxN2poNDRyOVNF + M2k4WEdCRjFodGpCV1RBNkY4dzdqemF2dTE4Cmcwek9WbDgvNGNJS2R0UjJnY09u + ejV4TDVBWnljUE96T2pNVGp2UnU1NGcKLS0tIG9TYVVoSTNYQzZoZzV3NlduYitj + WlJZbUQxU256WlFkbWVyOE8vMzgzV2sKUxPrigMR6qzWcqDE4n9vyEXhw8Jrery2 + S6NW61F2MfitvFQRfLErB3BzsO0n6R0QVNyM0y7NvJOWELzEaLwLow== + -----END AGE ENCRYPTED FILE----- + - recipient: age1nxgmdahcjhmtrf7q66jep55cjdcw6tfpw722jr4gytaykgf89ugqxufgyd + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiNmN1OVRWcUp1WGlMUGRR + WEZtaXIzRElSUk5XQ3pNNWtrbjM4dk9NNUJFCnNhMGtJYm1UWmJFR3hENXl5eTR5 + cWF1dExSOGZBTWV0djI4NEV1Ykk5QTgKLS0tIEdPY2dLcTAwTnZUWW1hcXh5Zmg5 + ZExBMDR0dlNpV2QvdnQrQi9EOXEvVk0KbsklfM8a7cXkMrJCbI9HWrCQ8OCjVEic + N20a4meOZYnEOXJaUorrF1+9Z6inxRIJCURjX59UIHNOB9h4NWxfcw== -----END AGE ENCRYPTED FILE----- lastmodified: "2025-10-28T11:05:18Z" mac: ENC[AES256_GCM,data:OGYjjVtNUxiGIwYPc5S6eEhAAEhqZC7oWo0lH+egfpojlpFkaswoj2LhvNoehfUGuedw5hed+B3vXuKT5Cs7m+9cQWCF4wneDDikUB+j+H9L1Nfzpni/b1/xfo0sQN7p48mqRKKz3a79hefGcAbx3ntrBK2Na9aSxzS70bMuKBg=,iv:impbp557hKM5dUPvYTVtaUZ/uy7+p6tNPDewfzc195o=,tag:HfxGX6QSkdr5UMWvcL1N/w==,type:str] pgp: - - created_at: "2025-12-04T04:56:24Z" + - created_at: "2025-12-15T12:49:04Z" enc: |- -----BEGIN PGP MESSAGE----- - hQIMA82M54yws73UAQ//Tme82Kw+yo1KsCm/SRsek3O7wWnTdzUJr3f/bYZds6fQ - eeuMJgtPPGs5ai/tHbCDJJ9FAIrSDtOy4lsNDC0O1SzyVF4FGyIj19zV46WHBJEe - nLIZOAYzfSwKY4plz3f81JQ7ehvn8jQFtRFg/3Z1Cl7QYDJueKp/MCy20269zE5n - Moefu3HyN6BDfc0+zKbz8v7xWEslmLTqacybvtzH5nSG3cHN2KvnkZvubVwWYGVJ - 29Q2SRyVBZx5wWbopPFth4rYaed0HNBR+JCmoEAXhS9QgOLE0XZuyjWHu3Ki9hbu - G9qG3DucM9APThnTd4Z1lynZmKw2wg2ZZK7hBSdyxemq1yRViDH0QVD4UwI826/Y - JBi4OKdVpyltZyiM1HRarVef/qEcpJ10ajQVWlcU/8h0Ax9VoZMuOc2Tp9QVWNCr - eGbIT4mRC0jKuSxfkv1+/Zuq3ygEVeHvC++FElPVZumq3h/RgDlZEVS6Q9iIVh0d - 5LzDE+/efRrxJzXTI/ng1AMJXGvyFzu9z2KrQwCC46dcmBV1babhtOD943IPR6b9 - ychI2aw8zwnvzppI0WFkfuDCOV2s6z0g/MkflO5HWtNJZ0FRI9aBf3vb9VsduFqh - rb1Tuhs0BmtHQWTTBiuYhQ9tpGrDoOks4IohpwKDyKpDnsjNCkIn3zlWAyC/BLLS - XgH5cK54l8W6l+M/O59H+tD00IuKP3GqT2OjPiK4igOEALt8182yUheG+BgTiJ3L - vZIr6SG71AVscONh8ooMjSUR1lK1JzCGrXUJtNxXygzhxvRJGjVPZRH+G0C9ZJQ= - =ZZjd + hQIMA82M54yws73UAQ/9E4DnaQsuvvnedl/XpsiR7rgG+dwd7+5PUliwRK36nhev + rONfquFQi659uxeoNK2C2RPWkOEF52exoAD3xTdj5Y2ZwGCrwkYPCkNfclpEhqXp + Q4cgIK5ETG4IPOdR0V94SmIrRHdcp8leD+54vFMVB3lhKwYRdbIHM9Ee1MwUW0gN + lnnDjtt3d8cVeA+rN6S9fX5G/3dFqRxkpcOozLkK8U1RRBjS+OJndcG8My3vJXjQ + yQ5kweKOoel6kVdXPzW5p/D4XKvctqzDUZGp+Oz2fvwwkicoyK4Qw8gSIhfK0Xmp + twIAtin6YcE6VPDc2PqtcBTTY1OO9o/HmAUxOE0PsqdLg3UxK3W2mUzDtn2UHkny + oPhJOBLWv7Kpg90QefrNFehOMCmxpVsJzpkzyhnCiejq2pjAv9h4u1JrhssVkXzb + JLDUdG0n5CzAX32sYf27HnS5/uk6J4r0M5St4zTc5Ab5WY9Mu3evav7j7l6arK57 + kCzLy4/CkaKd03WZtcDvROiKcEReUWWEAxDpWqlNAUuobBmFo0hIZla1PMXmdJfM + tbKjuRQTQ6SVMK95lG1YOeoIrrmz45wWR4keswfxg9vigM5PW19Khkc88cEL++w2 + cCsk8ZiuAkie+WEP0dcbuBFkZM5Csoqz3vVAMZXPtNU3ypBHQgmgyBcli2xGLHPS + XgH3Ordyu8dKICZ9HKzIWAjsBVgYd28hBa/Py7mzN7OmPTt7D/b2hRNjtLIUPIMv + zG2V1hFqNXwmj4DZ6rNQiUgEZXmA9MtF3LWrTb1iSdDeVQeN6TprrbxnFUCiT4s= + =rHVj -----END PGP MESSAGE----- fp: CD8CE78CB0B3BDD4 unencrypted_suffix: _unencrypted diff --git a/nixos/common/stylix.nix b/nixos/common/stylix.nix index 7d34a6a9..ba19f5e9 100644 --- a/nixos/common/stylix.nix +++ b/nixos/common/stylix.nix @@ -39,6 +39,6 @@ }; }; autoEnable = true; - base16Scheme = "${pkgs.base16-schemes}/share/themes/dracula.yaml"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-macchiato.yaml"; }; } diff --git a/nixos/environments/gnome/dconf.nix b/nixos/environments/gnome/dconf.nix deleted file mode 100644 index 7b53db51..00000000 --- a/nixos/environments/gnome/dconf.nix +++ /dev/null @@ -1,3 +0,0 @@ -_: { - programs.dconf.enable = true; -} diff --git a/nixos/environments/gnome/packages.nix b/nixos/environments/gnome/packages.nix deleted file mode 100644 index 163c659d..00000000 --- a/nixos/environments/gnome/packages.nix +++ /dev/null @@ -1,17 +0,0 @@ -{pkgs, ...}: { - environment.gnome.excludePackages = with pkgs; [ - gnome-photos - gnome-tour - cheese # webcam tool - epiphany # web browser - geary # email reader - gnome-characters - gnome-contacts - gnome-initial-setup - ]; - environment.systemPackages = with pkgs; [ - gnome-tweaks - gnome-extension-manager - ]; - services.udev.packages = [pkgs.gnome.gnome-settings-daemon]; -} diff --git a/nixos/environments/gnome/profile-inheritance.nix b/nixos/environments/gnome/profile-inheritance.nix deleted file mode 100644 index 7b615f32..00000000 --- a/nixos/environments/gnome/profile-inheritance.nix +++ /dev/null @@ -1,9 +0,0 @@ -{tree, ...}: { - imports = with tree.nixos.profiles; [ - graphical - ]; - - home-manager.users.kat.imports = with tree.home.environments; [ - gnome - ]; -} diff --git a/nixos/environments/gnome/xserver.nix b/nixos/environments/gnome/xserver.nix deleted file mode 100644 index 8b4ac196..00000000 --- a/nixos/environments/gnome/xserver.nix +++ /dev/null @@ -1,7 +0,0 @@ -_: { - services.xserver = { - enable = true; - displayManager.gdm.enable = true; - desktopManager.gnome.enable = true; - }; -} diff --git a/nixos/environments/hyprland/greetd.nix b/nixos/environments/hyprland/greetd.nix new file mode 100644 index 00000000..4475e565 --- /dev/null +++ b/nixos/environments/hyprland/greetd.nix @@ -0,0 +1,16 @@ +{ + config, + lib, + ... +}: let + inherit (lib.modules) mkForce; +in { + programs.regreet = { + enable = true; + theme = mkForce config.home-manager.users.kat.gtk.theme; + }; + stylix.targets.regreet.enable = true; + services.greetd = { + enable = true; + }; +} diff --git a/nixos/environments/hyprland/hyprland.nix b/nixos/environments/hyprland/hyprland.nix index f5d190fd..0c459acd 100644 --- a/nixos/environments/hyprland/hyprland.nix +++ b/nixos/environments/hyprland/hyprland.nix @@ -6,8 +6,8 @@ programs.hyprland = { enable = true; withUWSM = true; - package = inputs.hyprland.packages."${pkgs.system}".hyprland; - portalPackage = inputs.hyprland.packages."${pkgs.system}".xdg-desktop-portal-hyprland; + #package = inputs.hyprland.packages."${pkgs.system}".hyprland; + #portalPackage = inputs.hyprland.packages."${pkgs.system}".xdg-desktop-portal-hyprland; }; # auto launch hyprland on tty1 @@ -16,8 +16,11 @@ exec uwsm start hyprland-uwsm.desktop fi ''; - - services.clipboard-sync.enable = true; + + services = { + noctalia-shell.enable = true; + clipboard-sync.enable = true; + }; /* services.displayManager.sddm = { enable = true; diff --git a/nixos/environments/kde/dconf.nix b/nixos/environments/kde/dconf.nix deleted file mode 100644 index 7b53db51..00000000 --- a/nixos/environments/kde/dconf.nix +++ /dev/null @@ -1,3 +0,0 @@ -_: { - programs.dconf.enable = true; -} diff --git a/nixos/environments/kde/profile-inheritance.nix b/nixos/environments/kde/profile-inheritance.nix deleted file mode 100644 index c6333ff4..00000000 --- a/nixos/environments/kde/profile-inheritance.nix +++ /dev/null @@ -1,9 +0,0 @@ -{tree, ...}: { - imports = with tree.nixos.profiles; [ - graphical - ]; - - home-manager.users.kat.imports = with tree.home.environments; [ - kde - ]; -} diff --git a/nixos/environments/kde/xserver.nix b/nixos/environments/kde/xserver.nix deleted file mode 100644 index 6b8d0220..00000000 --- a/nixos/environments/kde/xserver.nix +++ /dev/null @@ -1,16 +0,0 @@ -{pkgs, ...}: { - environment.systemPackages = with pkgs; [ - xclip - wl-clipboard - ]; - services = { - displayManager.sddm = { - enable = true; - wayland.enable = true; - }; - xserver = { - enable = true; - }; - desktopManager.plasma6.enable = true; - }; -} diff --git a/nixos/environments/openbox/openbox.nix b/nixos/environments/openbox/openbox.nix deleted file mode 100644 index 07f106f5..00000000 --- a/nixos/environments/openbox/openbox.nix +++ /dev/null @@ -1,26 +0,0 @@ -{pkgs, ...}: { - services = { - gnome.gnome-keyring.enable = true; - xserver = { - enable = true; - libinput.touchpad = { - tappingButtonMap = "lrm"; - clickMethod = "clickfinger"; - }; - windowManager = { - openbox.enable = true; - }; - displayManager.defaultSession = "none+openbox"; - xkbOptions = "ctrl:nocaps"; - }; - colord.enable = true; - }; - programs.xfconf.enable = true; - - environment.systemPackages = with pkgs; [ - menumaker - xclip - obconf - numix-gtk-theme - ]; -} diff --git a/nixos/environments/xfce/xfce.nix b/nixos/environments/xfce/xfce.nix deleted file mode 100644 index b6564a3e..00000000 --- a/nixos/environments/xfce/xfce.nix +++ /dev/null @@ -1,28 +0,0 @@ -{pkgs, ...}: { - services = { - gnome.gnome-keyring.enable = true; - xserver = { - enable = true; - libinput.touchpad = { - tappingButtonMap = "lrm"; - clickMethod = "clickfinger"; - }; - desktopManager = { - xterm.enable = false; - xfce.enable = true; - }; - displayManager.gdm.enable = true; - displayManager.defaultSession = "xfce"; - xkbOptions = "ctrl:nocaps"; - }; - - colord.enable = true; - }; - programs.xfconf.enable = true; - - environment.systemPackages = with pkgs; [ - xfce.xfce4-pulseaudio-plugin - xfce.xfce4-whiskermenu-plugin - xclip - ]; -} diff --git a/nixos/profiles/dev/packages.nix b/nixos/profiles/dev/packages.nix index b4dc4c69..2e451e81 100644 --- a/nixos/profiles/dev/packages.nix +++ b/nixos/profiles/dev/packages.nix @@ -7,5 +7,13 @@ jwt-cli silicon tokei + clojure + clojure-lsp + babashka + clj-kondo + polylith + leiningen + neil + jet ]; } diff --git a/nixos/profiles/gaming/steam.nix b/nixos/profiles/gaming/steam.nix index 60a8d78e..e974d000 100644 --- a/nixos/profiles/gaming/steam.nix +++ b/nixos/profiles/gaming/steam.nix @@ -7,8 +7,8 @@ enable = true; remotePlay.openFirewall = true; extraCompatPackages = [ - inputs.chaotic.packages.${pkgs.system}.proton-cachyos_x86_64_v3 - inputs.chaotic.packages.${pkgs.system}.proton-ge-custom + pkgs.proton-cachyos-x86_64_v3 + pkgs.proton-ge-bin ]; }; } diff --git a/nixos/profiles/gaming/vr.nix b/nixos/profiles/gaming/vr.nix index 0d61c33c..84ca66f5 100644 --- a/nixos/profiles/gaming/vr.nix +++ b/nixos/profiles/gaming/vr.nix @@ -20,22 +20,7 @@ in { monadoEnvironment = { XRT_COMPOSITOR_COMPUTE = "1"; }; - package = pkgs.wivrn.overrideAttrs (_old: rec { - cudaSupport = true; - #version = "84e5203be3019278925ac03708567f2982360f8a"; - #src = pkgs.fetchFromGitHub { - # owner = "notpeelz"; - # repo = "WiVRn"; - # rev = version; - # # This will throw an error when evaluating and give you the correct hash - put that here - # hash = "sha256-2s3j6vRtIRf6x+lQPobcuT1vzlCh1lMA54EUiCnxoFI="; - #}; - #cmakeFlags = - # old.cmakeFlags - # ++ [ - # (lib.cmakeBool "WIVRN_FEATURE_SOLARXR" true) - # ]; - }); + package = pkgs.wivrn; defaultRuntime = true; config = { enable = true; diff --git a/nixos/profiles/gaming/wine.nix b/nixos/profiles/gaming/wine.nix index e72e33be..aecbc78a 100644 --- a/nixos/profiles/gaming/wine.nix +++ b/nixos/profiles/gaming/wine.nix @@ -19,13 +19,13 @@ in { createDesktopItems = true; inherit gameStorage; runnerVariants = { - PROTON_CACHYOS = "${inputs.chaotic.packages.${pkgs.system}.proton-cachyos_x86_64_v3.out}/bin"; - PROTON_GE = "${inputs.chaotic.packages.${pkgs.system}.proton-ge-custom.out}/bin"; + PROTON_CACHYOS = "${pkgs.proton-cachyos-x86_64_v3}/bin"; + PROTON_GE = "${pkgs.proton-ge-bin}/bin"; PROTON_EXPERIMENTAL = "/games/Steam Library/steamapps/common/Proton - Experimental"; PROTON_HOTFIX = "/games/Steam Library/steamapps/common/Proton Hotfix/"; - PROTON_VRC = "/home/kat/.local/share/Steam/compatibilitytools.d/GE-Proton10-20-rtsp19/"; - WINE_TKG = inputs.nix-gaming.packages.${pkgs.system}.wine-tkg; - WINE_CACHYOS = inputs.nix-gaming.packages.${pkgs.system}.wine-cachyos; + PROTON_VRC = "/home/kat/.local/share/Steam/compatibilitytools.d/GE-Proton10-26-rtsp20/"; + WINE_TKG = pkgs.wine-tkg; + WINE_CACHYOS = pkgs.wine-cachyos; }; pathPackages = with pkgs; [ mangohud diff --git a/nixos/profiles/server/secrets.yaml b/nixos/profiles/server/secrets.yaml index ca5baba8..69c608ff 100644 --- a/nixos/profiles/server/secrets.yaml +++ b/nixos/profiles/server/secrets.yaml @@ -5,123 +5,132 @@ sops: - recipient: age1n4kdchmkk3rfkaknxhveqr2ftprdpgwckutt23y6u8639lazzuks77tgav enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKOTFWL1FwR1FLYTViOWVN - NmNTNnkvQ0JCTDVvWmFLODRWQTh5NGFlS2cwCmN4dUkzSVA4U3RJNVhNb3lKQ2JZ - Q3UyVzRuazJ1Z2srUTZIRkUydU1ISGcKLS0tIHN5Tk1DMm9QeENRdndpaDBsK1U0 - S3pZaDEzeURYcmhiUEVwNm1kNGZ1MkkKeflVOmj3bGe7BLndIHsrHDOOEm1rllZZ - Oj3kL/cTbh8ul/eWB8W9TCZEEAjWeKYiehOBcyTvYAlc+6QBIFT6jg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvbTNXRUdkbTQ1K2w1MWgv + aHArdnhOeFMyY3lNRHhseEF5QVp1eUc4WWhzCnFlN3g1bVlUd216azh2MGtuTWpy + cjVYRDNqMmhHbDhVbmRVajNGNHpESncKLS0tIE5xMzZBN1dIVlgzcm9VRnZFL1FX + cjVITG5Xekp2ODA5Z2huOW45a1BJUHMKwczC4gHx/k9b9XfQmmC2412WStXoJ7gI + aicnUaVy/K7Qr/dP4IAO0RskepNle+Nb/yI6YeNCJMjkgzrMzebSrA== -----END AGE ENCRYPTED FILE----- - recipient: age1cnu37d5fqyahh9vvc4hj6z6k8ur9ksuefln7sr6g3emmn927eutqxdawuh enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBReHM2R1JjQXRiK0xEZDhP - bGJ6d0xDL2xDblNRbGhlRGdyWTFzZzVVeUdvClVHUzJ0VS9QdG5qck11VzI1UlM5 - dG0rblhDdHByN2p6eHRXUG5jV2lSZnMKLS0tIGhRWVZNTEJKRTBjaG1aYXBBbTA0 - N3FoQnRxckFqYUZDR09KMFhFeitCS2sKEIk9JG1HXiBvMWrLp10w81qL66m6CbQa - JF0U5JhACzqGzYe+pUuBqXg9QHAxmRqgV4ymIRHgDQEfNSXuiqgUUg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBN0RLUU9tOTlIVXVnUnQw + UmlvYmJaM0w2SUIwTnRxMDYzUFA0RUZTTXhjCnF1VEdXTzNDMkkvUTFBalZFZS9J + dXFYcHM4cFYrbldKNElnZW81TklWdkkKLS0tIHpiczRoNmJ0cGtGc2sxSEFaUnJ1 + bXpLbjEyQ3MrY1hxMTJoRFZqYUJMN2sKs3DT+IAlud4Hhs5lndbbwLGzSxxNzRMQ + m43PwB6UY80szG1Z89Yl0fMxT+aoXr0TUaKc8kJ3srYpDqOVviz7Hw== -----END AGE ENCRYPTED FILE----- - recipient: age1a0m73qr8hhuz8xemv4vymf4wmpghm2hst8wgrn3pn65ext5mf4ksk0vsdm enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3ZkZlUjJTcDlpMXlIeGRm - eUlTQ3hZcXRZOExtc21RM3R6Q2xPUFU4UFRBClRkSEJPNVM4dzh2T05XWjhCakhT - SWQvTkZIek5MUzJORGVkS2xMUTQ2N0UKLS0tIEc3bks4dWNXc0JaWFNMazJENEFl - Qjl6NzVZT0VteVJDa2lqbUFUdHNHQnMKgBspVzhRyIjMnah65YX/Yjw2taHFpfoj - 0EegEb/jjCinY8kKrPWKMkP9p0/K/SpU9bg7RiomkY4ktO2ROi9ISA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArS2Mxa3Q2dFgxT1ZsOG5B + NVlPNFFNZmJVM1AvS210REs0TlVpN2Y1cUg0ClRVdC9OaVp1TnRONHM4Y0FGOHox + UDczQlV1Nk5Sd0EvaytMQVVQQ2s5U0kKLS0tIE9NaXhPZ29tSGljM003TWtWcDhq + TTdaVTR1YjYzMnRyUXYxS3NsOHdEUncK+jd3N3hnyd5jxlK89wkfkaQWxHU4dBEx + 7MdKVJLY6W1VKw7uL3GfXTqO/cIoYCuw9i26uorLsDNHRJxUK58RSQ== -----END AGE ENCRYPTED FILE----- - recipient: age18hpxz0ghvswv9k30cle73prvnzrsuczqh87jjdk9fl50j3ddndmq9xae0n enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBaaGpPYU1USG9IbkJIRUFQ - c1dDSGdQTFV4eWR1aVIwSTJCNVZGdjdPMWxvCkFnNEl5VmFaYTgrQkp5cUZrQ2tq - bmRwdlA4TjRJUEFodXFCeTc4c2dxWDQKLS0tIEd1N1ZvOUVMZEUwVUtUc3plbVJz - UU44STU3aTlqMEdCR2x4ZlFZNi9hTHcK8USaDAZZG8Dj0KVK1YO57EziGFD/Yan4 - oEfXr5B4CbVgAXn3K0YBvtdfzGn+Kt8pJ++/P4ipkswqMNClmNgzvQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1RnRwUzgybHNBNElSN1py + VlhhMitZL2JxSjlncGswSmdYbzhyTEdjNDFrCmp2cHZHUmxjMlVKSHZVVWtadnRF + dTlhK29JVmw2V0w3dmVyUHROYXZzSFUKLS0tIHFWZnRma2k4WC9mNENyd25yZWp6 + YjJRY2cvN2Jmek5GT0FrZnNXZ3luOHcKA8jR4mRd4MxrbofgA/+Qu09ZAaEk480x + xkjH1Ckmi7+90Cr5pmzF98VLVTi6kZNO2jv5dLPfIdLuUKB6+hwz5g== -----END AGE ENCRYPTED FILE----- - recipient: age1xgy03g3vjydsxcl0qpdgm8rahjcjq95ucxfwlgr22zwjx3p7jf2s9jk6u5 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiNk9oRVM3cmpER0NZNHhP - VkdOY3hzb1VKSldnQ3JPeTJuazNHNGZkOEJVCm8wdFpmQ042NkVVWUpOWnRUOE5k - aW4ydVpZWjA4M0dsRHBPK2xVQjNSblkKLS0tIExjK1FlSGpyMTAzVm5ocWZ2aEdv - SmVPSkpsUU9UNTY0ZHROMUxnQzJ6eTQKdjUpd1n25j36c0BXLdofVU0WLXiwV7/I - ndfSih91JY1ALEh9mwx6H7Zaoj8sonIgzKkn8e0adizv4FY7cbBUIw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwb1VUR0hSUU5GR3IvNEVZ + eG1US01LWSt3VjBRYmxGNENXNXprZC9IN2w0CkEzMm9JNXJuSzZmNmhEb20vcXQ0 + elczRG53OEljVHhZdEVwNngraVZxMWsKLS0tIE0zMDFGMUZJR05hWE1TMVdxeGx0 + dWpqUWJzRnR3WE5McTU1SWhQdW52bjgK0hew+Omy6EtafSwnu3XYCc13f8kyKA6F + ChE776+KoUcaNLL6XzCVXvWkla4kMIZzmykHNzDwgQDFgG2AAUPsvw== -----END AGE ENCRYPTED FILE----- - recipient: age1fv5dafs4n3r5n83qm2hfz7xmnflsz0xf9r3saralrptpgf8mvuxq4t8k3u enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiVm54MGJWeVhzdzU3amw0 - Mk9aM3V4VmpOblN3K2xVN1JzZTBoUy9QQjJNCmsxbUtXRXY2NWJNTkVoQ05jWUM3 - S0RRUXpIMW1jM21qajl6VDhvZTZqS0UKLS0tIDVmWHQxazVPdWVaSWpDYXA4WEpW - OFdURnZENDZnb2ViOXU0SEZHZnFLUzQKdFNGsu2gtNg7ozJLkpS3u2qhZyGQ2lFU - 3/K4hBNrBma4U1opXdHzBvGYrVImvlQSBUIjJkfcpBKjwEDHtxdBhg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1WlJkSVhrVjlGRWI4SXlM + YlorNUdkR0JmcEJKbldrNktqbVVMRURhdEdnCldMdDh3WDlzWkk5dTloMUFTeDQx + QVBYOGtYSmQyYzRzT3ZvcEgzajQxcUUKLS0tIDR3RFNhaWR3UFFxUHd3T1B1NFlU + Nkh2bkdYeC9jRm1MaGdsN1JlaXVqYjAKf2ot+C5iOm9Y2ik4j4WbkUpGQ53p/o7F + ZR0zw/cLDU5I6vHQxw/gbFw1DR5pEUWKqLB13qqy0GPrP3i19AS24w== -----END AGE ENCRYPTED FILE----- - recipient: age120530yclr75k6nrzp6k5jjftj8j4q9v3533guupzk4ct86mjxszqg9e5t5 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOUUFEa2d3dG9sTjVqN2Ez - MzFUMTZzUnJNMjN4aFNPcUZhMXJVOFZMR0RjCjVOaE41LzhSV0VJSE54T3gvczlJ - eHhPVmNteTVlV1hVQXAzbXBJdGo1Qk0KLS0tIEVaTkJuajNLekJ5Mk9XZlR6c1Ay - dDJraEtIOXdkUE5YeW8zWmN4ekFmN2sKBrzVdPKNlmfhJfoJagyg5JY5t++/Q13t - 7Q84+7V7irgsaHyHave+5cuUjrKXHu97VcSy9iqVGXSVGYYTkriUmw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5Z3BQMUdOdkFib1lReVlu + b25hRDU4dCtTVEJONXNlSEVTOFVibFNuK2pVCnlVdElVeGxyeGxMTXU0WGZrNzFp + WjNUTlllZWVsMnh2U2RKaHRKc1dIMkEKLS0tIHJUSkxTQmlzYWRDWWZoa1lMcTQv + blVPeE1ZbGRqYVBpK0lSNUV5WHgxRU0KmHwb/rY2Es5i6QFULixTk0aC9V5bRlrl + nZxYzTYN2STVN0rz9Vp0Z0I7VwXQbMQn5dk7OQej4ClCaDIcHluVfQ== -----END AGE ENCRYPTED FILE----- - recipient: age1rt0ngkum32wt6l2wnyr40hmwd9ulmzqfarg5vk62zqp0uvj4lyuqd2atgq enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBTTJYRUZZVVRzYUk0N0Vi - QzhzWjBFMGpjZVZUN3NDWG1sdGZxZ1k0L0hZCjJsWktjeFZHR3ZNalRWKzl4Z0Jy - dVRvaUI0clRrMEt1U3Z5RXlVNjNhMUUKLS0tIGYxdHVKVjJySjFFTzZUZnRwb1Jm - QnpoWU1zVzBPdzVKSjkwOU5IR1FOOE0KbRmPXDGrXNKTCvhznz4aKWXaGJG/x0/M - Eyq8bOMtpHIJ8SpupMJ6WmXO9pf3qHwQHaeRJZvixygn60wJGeVCzg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZMGpibU1obkpRTzhlM0ZO + R1BjdHQ4YzJOVlpPWUx5ZHUyTlM1NDQ3OUV3CjVnQ3FNRWFCcmZUUVJCOHRpZDVG + VGNYNUltUGZuMStMN3N1cmFIb2JyclEKLS0tIE9PV2V2eGUxa3RGZDlHL3hVbzFC + cTQzK2IveFYzUlNSY2Z3Q0MzTW5mMGsKbV6keinYW2yFArvw7iqU5m/QXSIsq5U8 + RQHoQOxhLIMwILaYTSfizgX/soXfFvDo16royp1id0B7StsHiAF0EA== -----END AGE ENCRYPTED FILE----- - recipient: age1c4atxfp05u7zm875s6q8p82ve96rqqpq9smktxlur8pk2yc3qvgql46dp9 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCdGNKRE9hcHAvY2owTkVO - dGdpTytCejRZYkZMTUMrQ2VKaHJicHZLaFR3Cm1URGJ0Q1pPWnF4VU9BbURkb0ho - ekJ3ME9UcDRIR2NxcHhHb1dpUG9GamsKLS0tIHR0MFFQVUgyNnVQVURMb3g2OUtT - T2Y1bUhNWit6UjFNQks2Q1NqbjI4dUkK4IBQbaoV4aHgerzbgonvGTdRJo3qrFVG - 43brfMZ05D3ufHlXkRHjw8dnpkHjYeCPaID811tQyJdCZGxjiuR3XA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1Wms3akNEVlF6RVE5S204 + SDFTYVVXUEdpZlR6OXlVZGNUd1pVSmNxMHlrCmFKYmZjeTQxVENlNWRRNlFqa3dI + T0VtNG1WWEMvdmR3bEpRUVhxVzFmY28KLS0tIE5mL1E5VDJWNTJ6b3lkY200emp5 + ZEJuRWZkTHYxc292VDczbWlIY0M1azAK31/HpAZASGif0ild2pXOEvcF0ihs6g7t + aMXdCiBhCWRdIb8DCKap6AgqFA0OAXXHcdFgBIO/cPZZryj4OehaNg== -----END AGE ENCRYPTED FILE----- - recipient: age1rjldv3fn3q686647exmcukthr32gmp6s3axs0lhyenvru9ajp9rs24ukvz enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPejZUa1ZYbVpKYjZCa2Nm - VjJWamUwckwwTzk5eUd3bS90NWhpYSs2bWpzCjVkVHpBcm5mVkRrQ05zUmNHR091 - ekx3aTkvc1Q0Yk9waWh1RitFZHo0dDgKLS0tIGg4YzVEMm81a2RyaWtaek9FcE96 - cEhXSFpVcGVPQnJyKzdvUkZEVUNYSUUKU4KRkMb53Rm9PEQlQs4+/l+SYYuZ1nke - 6ztB6Jybn9qP9qFNBrNsWGTEdgXfi7yJA0j73c6kAXFg/e6uo3wN5w== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEaWFMa2RNdkpxQUdkcG1Y + YmFQdkh3WGxIT1VwajdIR1F5VTZzMkUyeURJCjZ3QnZQZTFHZlgzS0ZWNU43L3dV + eUQzek5KM1o3L0NNcXVWQ2twSlVKQzgKLS0tIGk0Ly9adzhncEVDNGxXUzhwbHVO + Njh5NDlxYThzRlY5cjlTaW9NY05iUmcKKMF2jDTSg994rhJz5lCB2VPt5By2osey + PR2phgWLdazsQYhJyqDfEEUQO4Y2nHL8AUmDuvEFiugeiVvkmerEMQ== -----END AGE ENCRYPTED FILE----- - recipient: age1p9v6xaujkdat2tsc2mc4gxpg9hjr4suvwryuat95z2c53xhsyfxq0gf594 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDR0NuZXFGUmR2eHM2NFRM - aDZEMmc0NGE5QnlEK2ZYc2t4emJpVnJOOHdnCmladWMvKy8vWUttM253YmJWUkMw - djdOcEFibEljZ0VyZTNJNmxqeFFPZnMKLS0tIGFhMC8weEdFUFFSZ2RQSUJCWFo5 - cVNRN2t3Smk4Yy9NaXBDMW9NQjhtVm8KzuJnoJbnH9nxZVLKP15b5jAaf3bj8sF7 - CY3KBbzDPg3jRNLDsaWgHfwxbdCcDSOBT8kTw3izRRpioRZ5vfbrQA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUWDNUeFMzRXZYUW8wK29y + aUVHaGdUbVJwNmhpQXYyYmkrU1puRkthVGxJCkYyWThyd3M2b0FlZUVRQ2dlR002 + aVFPbktwaVdDeTVRaGJmWFpZWmpWQUkKLS0tIGMxVTczMWpKcTJPcExUR0dGa0JV + UWVKQzNQZVlyMkp2MUZUeVUyeEthUk0Kfj29OqTAKfFwbnzY5BwLjFhQn9YiWzBC + sPjLUPR5cTx05ye82ka2Eitjj7mt3kZQLy06jqgGii8dOOjKYDWjew== + -----END AGE ENCRYPTED FILE----- + - recipient: age1nxgmdahcjhmtrf7q66jep55cjdcw6tfpw722jr4gytaykgf89ugqxufgyd + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYSTFFVzVmN2g0ZllOb2lo + Z3pEU011MGR2S1U4TFUrUUs3YnlmSjZxMFQwCjJ5VkdLVEdEZ1ljZjc4MGsxMUo1 + M3pZdStidUp4aXRnbGg3UU5senR4Z0EKLS0tIDNiLzZwSCs1MSt1RVdBVFZzTjZ5 + RnJxVDByZkNuWUh5LzFJcHpKQ2QxaVkKRAHTSsNrWkZuO0zEtroxy9Ltn/GkDg8r + 2nyTyAqzURiQ3aVOzvtmJnWW5a72sq/7ohnXiEBRBOvFjhQs71m5hg== -----END AGE ENCRYPTED FILE----- lastmodified: "2024-06-25T03:22:44Z" mac: ENC[AES256_GCM,data:2uVqMaPYgG2hbkMZCd3xJjjoEJqsGhFEXAq4p+X7YWO4hwB+H/REJJkHCUBegggWJtKA1zDKDIVzvZv3BeRaIe63Kaj2A/7c3qwjCsBpzm5DdJ3WrlAIffFSgOs7jUyFwQtP0ZsbHigsr/rA5NqDeC+4hVHg9XKgLXKyPoVk+iM=,iv:rzf0xQGfGMirg1wwe3paq1+lNdISerFXRUsPLtZ09m0=,tag:6xkM9kvN/8NqzTYB5eHbVA==,type:str] pgp: - - created_at: "2025-12-04T04:58:03Z" + - created_at: "2025-12-15T12:49:05Z" enc: |- -----BEGIN PGP MESSAGE----- - hQIMA82M54yws73UAQ//SMg5faz+XQK1ax89IRInYsREW+FkiIg9ZzeDRNrUNJA/ - zbqEFeEUT9X3hAGFv0bSBwfIOqFKKuDWlYaiJw0TPosyeGYHYtx0Yjmj6bvL5w+N - zOrH5EuJx0hDHaybthM243/0S9gnjo5LWslCmDLQADQ0pPb+3Ze191GHlw65nQv2 - noHkzmNUdfiB0UF/Wk/V6RuvqvyHnxJhnR23g972KKJ/1LSOPspiPdwpr9aLGsXX - g2YHa8jCMRFQ0HfxJ2E7aCPctuXwiDUOzgR3i/LEubXSz6AhAoDFaUIz1nLh4TAQ - kD0PYNn92xpKSUKCLI9cMZKaC2/qxENO/KgdwvdfYTbi7y5v3FlnQwzmOTm7uTwU - LJy69YX5JoC6QPSlKwGVT5Opyu4UKTaLwCoqWCaEzgSUsYFzqIG72YLWTgcTM39p - ecqsipio3f5OjmGjf7p/zoBoBO3LsLRxA4YyR5VcqbChIT4XsJdJ0AYMt6dUVSzl - Kq/lQSxnFzSGTiEV0pquoJztIDZ/eoF7pS8ZtZpFXWdKSuGV265NI5mzbKLSrhyv - IekFOp+8+GxwvhV/R3SF080xjRkWdkYdZPfYxR/Dd0Zw8L8x2w6QdiTlXlhXuJcu - 9rILb9YZwaPLt41kSJ2vS6TIwseKxVdYuBzrakuXTbg61VpROKu505XSzn271U3S - XgFUT/gw7DKC9Tcqr3aEA2CBd6+W1WtUg0unzgWb7j7aohv9LenSirwC10Fnkyi8 - lLwsqV9Hrt96T8eqvmqADY9F0RBWy3Nrqy1OyHzUc9uAwQXj97vThToiUGK3YXQ= - =YHPK + hQIMA82M54yws73UARAAvlFPcbHwcww9ZFZbMxbXdBqSw3qbfGTf7h4rhvDpgHUQ + K3IzgdcvXIFatvhwX2bE8thyhw3L6jHhzvRO7iE0sdiuDouAI+OXx2CnQz/CNDpW + WvGDIkDtuQgD4DtKKkb6kw7oEgjY+DWQ+D7iflT/l5ROVMzCRXoobPgi2/6L7DR/ + pXgqzSrl18YRBg90ZCvlrBSykHu4aekPqZjI2eR/xT9k2o5mt0fpxJCiNTE8f8Ne + N77Lb2u0HY3j7NhMEPE2QbRjugVGWse4gqkQL9x5ftLETsWPpCz3oFa5lxqF9N6o + zlXtKtiPlqUMwWmyZIP/AAcLZA0wXk+T91ec1s4019xg/qFXeokXAPHfbyUGyAjv + S/UAc6COWqXAX4qlzvupbn90LwTUQ7FV94SoMSC3N355zX6vg1ib/r3F6vk906pg + HZgngDgh/ZxaZZjBvMhAoAESo8pYiMfbCv9F6HaMcG/SS/G7zrTdP0crAOirtbH7 + 4vaMhGoH6VF0m9nWxTctw+1qRsb4IFEpP3nig2bwo84MJ2ROQaM4F5Q0OhJUbV5m + Mr63mVcHMoH8igewNcMBuqJE+3aUDR3+1rhUFwQMFroqGD6kalWkdXPLorBM1elZ + xKn2Tc4DEZbDz59KEwFQs6NDpd0xiZI46fFbqpXBWAJ2N/HMqCDuCptzOX+jE7DS + XgGKI3PWuoKWlhyq5VSNB+wtn/Spz8BVP51HsscWwpNK4f2Ai33uXa6OA2xSpooy + F+f2zvR4JE/C3uOlaQUru8CnjVx2uTNUPuzebLAuwNo0AwSpGLBIIkN7GPmHitw= + =Dmbz -----END PGP MESSAGE----- fp: CD8CE78CB0B3BDD4 unencrypted_suffix: _unencrypted diff --git a/nixos/servers/continuwuity/secrets.yaml b/nixos/servers/continuwuity/secrets.yaml index fe964f54..96329165 100644 --- a/nixos/servers/continuwuity/secrets.yaml +++ b/nixos/servers/continuwuity/secrets.yaml @@ -5,123 +5,132 @@ sops: - recipient: age1n4kdchmkk3rfkaknxhveqr2ftprdpgwckutt23y6u8639lazzuks77tgav enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxQnpZRFFUUWhBQVRtVmJR - Uy93ZC8rdTd3a0JJY1o4Wm1jY1RycWFpa3lNCmJuM1BKK2FRNkRBWmp6eFBNbklR - L3BheU13SWZoVnVPVjQ3V1E1ajVhNG8KLS0tIE4xK0FBYTFFMXBjSjhueXEzSnRY - QXdXRTNsMUc0b2k4T1dlcHJFTnpEZW8K0R58QmNMDrxMCFLjgumnrVT9xMsHDweG - VnUV2BxaIsT34bIr4Vnup38uBzom/gAzv8HvUXKRHeXOEaFl5dlNEQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGQjNwNTV6eFVHeDZJSFo4 + ajBTV29WTDVhSkF1TjhCQTNrTWd0M3pkS1FZCkpYN2piTDFXQ2ZCcnlXaC9VUEh6 + ZWd0Q2dSZFJhaTAwTkJIMC9WTTVtRDAKLS0tIGNtSUYxenpIUktQYk1KdkY4U09x + d29FcEtqZUYzWmpwdnlEbUpWMFBwVzQKuywXhZgv0wJE+zdaeKw4xkSIoIoYSD7e + 0CPgeDr29/I1Af4jHG15tLqN1TYBxSlzFzQRB3+4V71exvXB6pVgHg== -----END AGE ENCRYPTED FILE----- - recipient: age1cnu37d5fqyahh9vvc4hj6z6k8ur9ksuefln7sr6g3emmn927eutqxdawuh enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXQnlMdnBYSXNtaFFaWGtj - aUxhY01pV1QreVY5TTJnS242cDFkSGtPdkFnCmxlSWhKbDl0K2M2bmFIRzMyWjd3 - L2dMWnFBcmcxS2s2NzcwRU43c2FtV00KLS0tIFp0Y25IUU5JR0xqSDR2TGdqV3k3 - a1pnbWp3elVaVDJOeVpPY2hZN3R6YjQKwosd75NQpHY93mSpOyXwN3VcsC4g4fyw - 3sZ7QHeiqEC12TsPairkll3Z32zWybfCF5RJYGhWyXSWBso9Z5ZoKQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSSTBocDhMaU5XUWFUSktI + eURFZHVEa2k1V0FRek4zdXVybHlHQlZ1RzNBCkFlUVh3cVpXSmtRQ2REUVUzeFQr + R295Mk16Yi9hK2tYR0NJN253Z2xMMmMKLS0tIEtUSTZ3dHMzQnJJSWx6MDdLUmtx + ZHNNbFlzRlAwY1J0RXNoZ1lQTHY2TU0KXBreukdZ+E/o60qXJJ+8Wo2vPkul+8KP + amaeiakHyVTFR224RZUQxHiKL+SfPOeqyUYlpzK1gRy4GxKurSFy+A== -----END AGE ENCRYPTED FILE----- - recipient: age1a0m73qr8hhuz8xemv4vymf4wmpghm2hst8wgrn3pn65ext5mf4ksk0vsdm enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvRndOQ2tmV1FuakpWMVd1 - N0trSWFkdFdBMDNxT0FjbFJUdEE2cTZDZFdnCnovTFhCV1crZkFrblR3UlBNZ1Z4 - TWduaVNHemdBKzlFaDhCUjBEem50eVkKLS0tIDg3Z1VHUVVkdTg4aHBFYU5iSHVV - UzF4UEt1ZzMrcWsrZWVaV2ZtTDFKUjQKWw89qeBwLEC/zIbJQJ6aTewvQr5/PAAq - JF0rJoaY8NrMbnJAupU4lcD/icLybPokQaaf+rJRm92362AYU1IuAQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOaWQ2bExOWURFNDFjWjhs + ZDBFN2N2U1IwMElYcGdmQXFydHU4eUtGd2hNCnBMRmZSQ2JGaDUzYUN3WU9LRWdz + elY1Y3FhcTd0WWF5aHFJL3hDTzJ2Yk0KLS0tIE43UXQrODZNSXBWTmFiTkJ1TUVL + WVlKRVo5aXRreGFJRS9tblQ0SEtmUmcKRzUTzhpXwlH8gc3UbFkQMpJ1FsPtpMvI + U04DJkVZNbXANpX+rYvcdkeKYmBGwGQy4Pkci8gRKdVGXAiShuIMJw== -----END AGE ENCRYPTED FILE----- - recipient: age18hpxz0ghvswv9k30cle73prvnzrsuczqh87jjdk9fl50j3ddndmq9xae0n enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBsZGNDNFNZMmxUaVlnQlhi - dkw5SFBZQWppeWQyTUpYMHV5R1E1ellreXljCjB5eTJTZzhjYjJ2RlYrKzRwVFBD - TEdsckVBaXdKVHVsbkt4aEgrS3A5bGMKLS0tIHFGbWhqSnYwRTN1Ris4d1h1eitJ - RWJ4aDZ6Y2xZV2ZJZjAzYTJLajN0MzQKGoSQQcaQW8htwtDTllBbOMRq0CGGIvxc - eYj9FAr7jcKtP4n19c5Xpl2tc5s76gdvt4UH0Hfa88fW2pz+qcxJPg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQU0hXc2FIWFhocXZld2xE + ckdqYWlGcG9oYm9kd0VXcnZpQVVrNGhDbmdNCk8yTnBZVGxXREU1SXFsOVNhQTVj + OWQ1amQwbFBCTnlEckRWcEtRdTRhaTAKLS0tIHBTZmtmcWpLVDFGM3J0Q0o4QWhO + T0JMSUM2blRQQlN5bEwzcHZialRqOUEKqy1M532RqDAvo5uHHPgJkCxpBkJm2S5j + gfTvnvVpO6ZMn4rCTO9/5phVWg8tsDB8ipCWKd4yBhpuhv9jZOr0WA== -----END AGE ENCRYPTED FILE----- - recipient: age1xgy03g3vjydsxcl0qpdgm8rahjcjq95ucxfwlgr22zwjx3p7jf2s9jk6u5 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGYjBSUjhpdktpYzZuc2xI - S0ZmcHVsclpMZWR4Ti8yT2tNcXV2c25NVXgwCk9xenpwVFJHN1Babml5NUl6VG5R - Nk8vSG1mZUkwNlNRajB1a2R6UFVNaUEKLS0tIGM4Q0JvSnhNRjV2SGhHY3JJaFIz - NDdVR1hYRTRQVkJZTTFvSkc1RlVmOEEKqFbdon24Ar6eyf4fTKEjof2s22AypQ3p - jvZHa73+dBoSAuIpcrBZSGC7R68cybJ4KiBri8+I7GlFDl7UbSK3iQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiRjl6RlBhamxPTDNyU0FL + OXRESWxLUkJ1OFdTaEZmVWpPTmsvUWh6VmdRCjIzKzhHRWVOZVdWQ0FxWHZZU2NY + dzZtUWFGdTVRaWNWcG1UOEVJUjByUTQKLS0tIG9MUHR6a2dmRWtDQUFWQ2NyZlI4 + d3lwNU5hUXRxMmtDYWczZHNtajM0ZncKtnoWlDEY6lRLdoqlDE/FiZ/MQzpENOUF + PqcGP5mUVJyxvBfAHlF64CPwT3MQecUOAlS2/WKe8X2EpF53nWd1kQ== -----END AGE ENCRYPTED FILE----- - recipient: age1fv5dafs4n3r5n83qm2hfz7xmnflsz0xf9r3saralrptpgf8mvuxq4t8k3u enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXdWU3V0x3cWEvQzIrMkNV - UDY0VEFPcE90MzNxYzFOQVVqRG80cUZBc240CmxOU0tsRCt1b3dpL3FiWVlMSHZN - QVZFU2MwT2trUERiZHc4SVVZSWxNVjgKLS0tIG5tbzhnODM2R0g3Z1NrdWJVMFJP - MVBYZld4VU5KT0pvR2dIdDBodjJHOWcKzgWak18tFAeph2pRUDqThYNj7v52jwkv - UQuu0m3MbvyNXKKjykH25wOY+Mor8oaqEW80LO7DXgiNZh1dag/upA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzWENWQTRmdXVvNzJUeVBr + MWJWKzc2ZGJDNXRZTXVmRmlZcndnY3lvY0J3CmRPU0s1M09tTmNjeGZqL1QyK1dX + K2k5VU5wS1ZjQjI1alBiN2N3WFlyaTAKLS0tIFNZTlR4SEVaVlpmR2VBdXNIUHdF + RUhPQW8zOWdzVmZkdW83Z1pKam53bjAK0NUb6UXOpeVy6x27ewwR5gmyqmrXlacb + neuzTY08XXlNJuHX/L74hvgi2F3WoMwzYsxPoSKbZXGoiRI9mgjVhA== -----END AGE ENCRYPTED FILE----- - recipient: age120530yclr75k6nrzp6k5jjftj8j4q9v3533guupzk4ct86mjxszqg9e5t5 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5eC9qaWhjdzZ6VEtOVU8w - TXRSYUV3cGI4UFhOQ1NFQ28rLzFYU1FGelRjCks1TDR5MkwzQnNzVzNxN00xODFr - M0tHaHZGc2MrWkpwVm56R21kSTMxbmMKLS0tIFNIRFBOV2xKQUVzS1ZBRENzd2gw - aHhTVno4NkZ3Vkg1NDNoa0FEUktYSUkKccIGwZyAuzO5IQiz2tFiyWA9xFVsb0Ay - jGHTaAByb9goBq+s4Ho27uHnSRTZ3EQpH0tn6dILorvNZEzUQA7/Sg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQaEhoWGhkQkU4djE3bGZV + SXFRdUl6L3lGM1VYK0pjbDBEZnZhTFIvdVVFCkVLZCtJVDJYVUE3UWtLNEtZM1I3 + QkdZUmN6TmQxZjBnTWxZRXlxTEtJNWcKLS0tIEdTT3ZuTEtMVXFJam81L2VmZ0NV + SDlYZU5KVjlOUk9ETVVCNUVKQ1U3ZjgK37QjVMzGNEfpvVd5d+V87W/+auZv6z6+ + GMZAUjHGC1bC8RE4DnW+NN5dBiZiohrWdzWCjZ18PLZ/ieFISQl7Yg== -----END AGE ENCRYPTED FILE----- - recipient: age1rt0ngkum32wt6l2wnyr40hmwd9ulmzqfarg5vk62zqp0uvj4lyuqd2atgq enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEQ3pFRUQrby9tdnRiWU1h - UFlxS2xSaW5lT2RPV0VmRkpiak8wOWJyRG1FCnZvY1Q4aTM1ZGNPaFErNEQrTWhO - Wm9qSXZTbk5vWGw3d0psMFZSbk91VkEKLS0tIG9BRHN4eUpuZmhvUDQyK2JOdnhW - TzNOaW5UR29FWFZITk45d3BpVWc4dUUKemYfJX6PQo4TxAtuncE7d6h4+nU8lvte - SjWtG5jnbAl1VUkCuVsS+ghn2lYNCoXpi5xVGt02a6Py1pYVtHBvmg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6em1jWlkxTmx3MHl3L0I1 + S1JuY3cxS0dlNnlIRi9XS3NsUy9nbFVGRlF3Ckl2eEZaY0g4UTA3MW1uemRXbGF5 + c1V5aWRhYlNhNnBEVFM5VTRra3UrbFUKLS0tIDlUMVM3b3VJNDlhOFQ0d1pXZjhR + M3ZZbXNaYVF5Um9GbVlmc1FIKzBNZjgKPCrhRYTnq3quQnGX0zw2GyXx8JuNCRHO + Q+D4Nim+5D4h5Or7qzs6+xpMui4LLg+Tt6TAbAHCI3+Szb8U6viD6w== -----END AGE ENCRYPTED FILE----- - recipient: age1c4atxfp05u7zm875s6q8p82ve96rqqpq9smktxlur8pk2yc3qvgql46dp9 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSSFdkL0F6NHRPRkVUUDJy - aDQ5WjNLN242emNWd3NPblR5Nk50RERMUmtVCmFEdEZQL0hDa1VNbTR6L0JQZWcr - MXk3eGtNcitZdWJRS28yTFg4ZVZhYmsKLS0tIHI0YzE4WGZXeXV1aDNvWEVTTmpC - aWl1NVcyNWFoTGk4RmpxanBsNlVDUHcKQCY0trNZ2JkU6zmcEErWsOPt/Xk6o7pT - 1ewhnXSBmaafaSXM2Us43UsljmPPIUKAmLE116x7Wie5MNGnEmxwiA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBldGJ4VzB2Rm00dS9USUE0 + R3hqVWVHNlhoYzZxWXIzWVIwNmoxVXZkVTA0CldlMURLS1hwTFJYZ0o3VFU2Ykl4 + ZEVJSEhkdTZ0Yld2QW04S1NuVnVVRTAKLS0tIGtWWEh6MGxHQnAwaFFpUmZXaDYz + N210R1Qvb3R4blRaNkt1dDRuU0dzS0UKIaWVkkQG25b7ox2opDFDmQ8zMZdhT2P4 + P+eydp6N1seibTb6oIKAm1cpk80E1orf32895WfP3LaiuMdlHAynaA== -----END AGE ENCRYPTED FILE----- - recipient: age1rjldv3fn3q686647exmcukthr32gmp6s3axs0lhyenvru9ajp9rs24ukvz enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBaUll2UzNEdFgwY0pwR2pF - TDZUUkUydE5XUlVRL01NM2xQd1cvUXF1MWg4CmlyenhXTEdBU0xkcG40ZHZYNG5L - OTZVbzB1SFo3Ym5HTUxQbEVkTU9CMHMKLS0tIHJsZnlGRlBlRHR2dXBxU29UQlBO - VnJUa0lGNGt5TktCTGVzdFBNVkVNMG8KtUhNK8r+Z1vYS3yrgqiHEndbbd1DMsCT - LvuDqOWyYx0uCem2m7ZUgEXv2NyI+Cva2p6vFsKl8P7JcgA5Vfud+A== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWZm90ZzFYblQvcDF4NGJw + d2N5bVBDdy93Vy9odDRXTmlKTG9MakdGZWcwCm81R0lZa29lU2NGSm1PQWNYM0hj + azJRNk1qb1U5YXVkVnNKLzdQdzYwQlUKLS0tIDliWDYwTkMwSVNWTmsvV0RETEJF + ZEh3OTRFYnZ3aHpqRlh6RjRCK3NuYkEKDbZ+Mq21+Xv3XkzdrVN51mN0MD8WEV09 + oMd8cLPRwWmbe633o5tyTDPv5+nXGbY/c0VnknpicbOzy7B0rFMZqQ== -----END AGE ENCRYPTED FILE----- - recipient: age1p9v6xaujkdat2tsc2mc4gxpg9hjr4suvwryuat95z2c53xhsyfxq0gf594 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhNVNnZ1JtbGhWemJPNjI4 - Tlo0cHltNFV5ZHFsdk41YU16Mm9oVWV4UjBFCmpGVDdiTGNZcktFd0xtWHM3S3pW - aURaSEVVTllaZTM5eTNKL2grUE80cEUKLS0tIFp0TEs5YzV3WER5V2JYQU1uNXBr - aVBucDkzM04wdFd5TjB5YmowYVNxZGcK7l+KssCEdsLjKEECvFop49qT7IsJxbzf - kpJ2uK6sc0t1ZjS3gBObYv2Xw6QBhEwLbZ0ZWdN1xPqXnWfPrhoHNw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuTHpnRllabERuUDdvL1FO + Q2hTU1BGQ0dCRTR5YktkNlFCMEg5QUlhWFFvCkRJMGx2dUN2bjdoL0NWTzBiZVFL + SGlDZkx3am4rN0xjUWVqZzNXdmFma2sKLS0tIDV0enFxQWlDME1TblMwWkJXYVo4 + Z1U2N2NVWC9RVU1vUk5NZFU3b1ZKcGsKNbiaExxdhMYZkI6GRGoXt2VbTHX2F4Hd + Tg00tMncxOrToffU6s52Sk6u2bMI8k7dpjgCyWMNNVzezzDdB6iaDQ== + -----END AGE ENCRYPTED FILE----- + - recipient: age1nxgmdahcjhmtrf7q66jep55cjdcw6tfpw722jr4gytaykgf89ugqxufgyd + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBobDBNK01TQ25OeXZoS08y + RjNVbHNaQnNJcTlsZW9rRUtIUHB6dHREZ25RCnR2N1V0UTd6RlRKWWxwOHA2TWdB + VUxLQTFGaDdKcVcweURXZUMzVVFYVU0KLS0tIGhZTXFieXkwY0hQWjRrbC9DdTNC + ZGxqUVZGeENwd1ZXVGxVRHRXeVFiNXMKPWmvbARzznySc5V9MtwcTpLTYjJvYB8J + peYzBhg9BSw1kvAtLiet8WkrTYdn2G++PIBVAMA/HGRNBbyAqcPYdw== -----END AGE ENCRYPTED FILE----- lastmodified: "2025-12-07T05:56:46Z" mac: ENC[AES256_GCM,data:QikWC6PeQmm03B3yj21rbk8+dWVjEEYPFR8HtJ3g7xrtjWMJIyH50Wo4sbmLlpV0jXWM4Yd6qawR1vXcdaR+ErGM6400GvuI0+B6FE2Xrs6x2Tf+ZjTPXv/8RC2w17Xs4r2KhcBoAFy0uiwBAFNznjeUlC3HpvreDj/pIgq7ZYw=,iv:NaICM+pPCdhu5wYHwA3SWDRNKVb8Mwc28A4zaEAcRvE=,tag:rglzT24N4vZP6sj++Wj1nA==,type:str] pgp: - - created_at: "2025-12-07T05:35:42Z" + - created_at: "2025-12-15T12:49:06Z" enc: |- -----BEGIN PGP MESSAGE----- - hQIMA82M54yws73UARAAr0CwMypwtBXDHP5SloS7zO7QxrsWEckqwXTwI0zHgcF1 - xellqvku25wwbH+tf4FJVTbEutyG7yHrwsl3rSPD18xQj6RTozp3G6lJLYLuYvE9 - 7/1WOJCRsxlz7xLwJkldc/7fCG6tyUD1UQfk61gaCTawDV48AEREpoqQHb/5Edum - 1jLULWtp0Y56r6OnmlsDHKNJL6zQB/m/eX5ckR0Nq+OLRCyimu7Do1/zR92uXUPJ - BmS1/Twun4wfK3TRRw4KBBhBDwm+p3bs8g6KzlQW1qiPnUsxxPuIbmWXYVdHC2jg - qqVVgzjdLEMn2IUuZP3w7TqtFDuxJVFHudEbrs16dX02IdGgp02MVsUJKyI124ro - 62XoPf1M85Dx+J/SpE2mZ3IPXm0fqY8ftQiJ+VulAN80Vcgo9VSW5CueFBJS5roG - xWjrk3VZCKqCbM4MUD0anSSL1hXJnAWWP3VNFbgM15p/s18ck5wxIia4IwN7h2Jl - 9gttMDB8zUcesArTynvke2/ZW8yHq7pEuv92eRREl6tKmsoobKIV3ADcT08DUTlf - PXA8fD+tSM5TVMAa4gMwMswudL0SC4I+yK+sB6ch1dMfRQ1DjblzEZpcfcKIQMvp - MfWiHpLp1rxhCJOefsTdAWuBPYm7W7r1txx9RzVri5nX9Du7hwOA8HZ0QD6Nri3S - XgEHyTBTJxpUp04fc2Bap6PwKbCWhSPp908IdO+s/YmjzUk8t0edMF5gGU4UghaP - Bja+/yiSJhBMa6WBos1B6/8w/R0ZCPV5Gh99N9tZzwwcFPCem7q8s1ML9/t7Fss= - =i4hE + hQIMA82M54yws73UAQ//cyXF4pRohiT1DVzK70pIb7qGWcnE+novwBjbkILmAlYR + 9Y2lJFY1UnKwLO3PLdhWNuDnwdXIL0VdqfiaY7ApsnL82JCr3Q1UhgLizVDJVz6F + vJU3PQC1shYgIfArhSwUo1HaJvk8DJrcGkv6AwYHZIFZp8y+qVIRiLnu73zJszpw + al8CqgOgHuYS+DDqy3qYendZoZFtPd542+dAbyss7vmpkRhYnYIWGLb3CIzvB7XX + XBmCkDyNbfNU/qy4gzM7plAHqiBaHjAJ35u8MLAvFurYvFex2l1EIVS7Bc/cV5+e + TVZyLwZ2MNTRPjczCOKWnsRq1p5tWBIHMwUp2WsGjn+P+ZlbpjfJFBYUtLM2sjAm + msGDTvVzDvBo6AO1Pj3b4QLN2Q7781+ShcNogap8rBZzz6ExeWUb3msEdlXMwb3d + uKSPJYWPJlqyYvFWrKBM+6YRYGlB8ZRKP3qxhy4O/UrFvKZevlS1cbkao4g+J48Q + MZM33HbbQ4+KviS1qKCvlwG4HmFaXj8nR/rQamTgCb+6/orWe5oGlLgwxDtAR9Vb + IfhRe4FeYmQC3dMYUocqGy8TVCcN8aBu+U9y3/N161+yJse8NO5xJwQATIFepV3z + Hlt9xuJEH4CJE7bDbWQPatXXB2XKNWxo+uQlwA5lNQD4r+p3EeEsMI2HBZ2PSUnS + XgEx5gANuzzEWH7f6ZS78FndQsHQ5E01r6M874wsn/IpzfEEFUMv+4mgW6MXVOJZ + sdrNTFi6kRIJ1t8KR5dD7+GWHf4w1OfTAeAkYu4lJgYB/ubD4TgPujAMkdjeyR4= + =exUn -----END PGP MESSAGE----- fp: CD8CE78CB0B3BDD4 unencrypted_suffix: _unencrypted diff --git a/nixos/servers/grafana-stack/secrets.yaml b/nixos/servers/grafana-stack/secrets.yaml index 353df257..1a900dc3 100644 --- a/nixos/servers/grafana-stack/secrets.yaml +++ b/nixos/servers/grafana-stack/secrets.yaml @@ -6,123 +6,132 @@ sops: - recipient: age1n4kdchmkk3rfkaknxhveqr2ftprdpgwckutt23y6u8639lazzuks77tgav enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhTWp1clFSa3YxS3dzdXJ6 - elhVckhJb1JnbXdtNzVDZTFyKzJPNVN0dG1JCkdrOUJHbXE4Zml3bGQvZURjT0Rr - M3lTUDZack1xM25oZ3VoZG1rdnVyaDQKLS0tIEtGR09ib3dEZGlRbG9uamh3QUhq - ajVvbUFQVlJGdUZGL1Y1SFNOOFBtNk0KBfpMrVYerSoRjoM8rRmea43yT2hmU+66 - oO/Vmdl8n1037ZiMT01s2UD0U7y+a6jbVFuoMWSiAb4ihdG9bK1DVA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBwUmZKVnF0dlhBeUJHc2E1 + djBVVmFwRDVZb2RNUGdDZnZZUFR4cGpCdlVVCm9mamFUdVFZVGdzL0VESEZKUTV6 + NkQrVkFDMGN2cldtMy9LQXVYVFFxRU0KLS0tIDhQTytqRkRGVFZnSEk1ZW12SC9B + aDU3Rks1a0FDRG96RW9obHh1bnFsT1UK7L0EiO3qe73fTBcNhhXg8kzbUhRE7/Gr + sL1eEJi1UuSjBjZLswgSqDkJZBnL9n2G0pjVoIbx9uLsCVY+U/oWdg== -----END AGE ENCRYPTED FILE----- - recipient: age1cnu37d5fqyahh9vvc4hj6z6k8ur9ksuefln7sr6g3emmn927eutqxdawuh enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOVUNsK2NZcXZzbXBGVS90 - QzNRSEEyYzc3Ry9GRkpZOEpBNEM5RVdNN0VZCktmN1UwbmRkVm1JVy9XOUpRTk5F - WE8vWldNb2ZndlhWU1V0cHVwRlplaVkKLS0tIEU2UkU5NzkrNGZMb0YrSWRVclF6 - WHY1ZFFYeFJNTjIydlFiQmRScEFleHcKUjj/IjDUgD1UzIEJw/Jm5yn3/8ViII2D - q/hbJwnDKZxDdp5bKORusHrL4Aj2ikpRMH/unDOJVe7pQZ38ptNpRg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4NTdIckVVZ0VSeDlsdlpX + OStCb2poWnR5N0lEL0xIUXZYS1ZhdHBwWnhjCkJqTUV4OGFHRk5KV05BbUN3aWNa + MWwvTzhiVC9IUGhzM04vSHkyTTBJRTQKLS0tIGh3SGh3ZU84UHB0THFHamJRL0I3 + VW56bTZLcWFvbUhEa3kzaWZFMUt2K0kK4BFJmbQN54H3ugxJ7t1klCBhe3+uSPm6 + WStrHvCDZx5ffkLfca8Pkc5lPcO2+om39Tx8cSlaYQwxwUEQbO3pfA== -----END AGE ENCRYPTED FILE----- - recipient: age1a0m73qr8hhuz8xemv4vymf4wmpghm2hst8wgrn3pn65ext5mf4ksk0vsdm enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMM2hFd2xzK3VmM0dmNmFQ - S0pzaWNVNkNGeWFDQ2dnZzNuZUVWL1hUeEZjCkcvT2pLM2l5V2lNZkVYUXI0STJF - Y1VKR2dEZVpOeWxyVnZQWkFsNHpTVEkKLS0tIDRqTVQrWHBpZDVXcWxaSlpTcVFY - TGtwdTFzcWRLQzVaZ2xrWE00Nzh4L2sKqolU5t/lHJf/6faTAxxKFInFhSnrDsYq - XZZYm5af713g4RqM/e5W7bNTKX8Ajuo3nXioOa8S2TaeH5reFIk9XQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnWHlFN1NIcm14TUpuUmx5 + ZUNXTHBYTmxsYmN1T2pDK1IvUU53TGU4N2hrCjFjQkppblJ3QkY2MXdna3BtWkxE + VVJmWlJxSzAyM2lqU3g1a3pBMmUzOTQKLS0tIGZNZ1J6eURZUjhvaUc4RkFkbEFX + enV6VU8rMmphcDZQRCtUK1p4dzRoVDgKIxUmBsT0om3tf2oL4MDv7Ng7XEQ1NqaP + QuCmqab+exPTrt1kUae+ijBrZTu7HQtMzIQ1WY5PXEFrKS+GbJNQVg== -----END AGE ENCRYPTED FILE----- - recipient: age18hpxz0ghvswv9k30cle73prvnzrsuczqh87jjdk9fl50j3ddndmq9xae0n enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhRkxLeUphN3ZCUkVONkxK - OG01TkQ0OGRzRVhpbkZLMHZ1ME9vT1pZR0JRCk5XTVozbnJuTUJjRlhvQ2toQkVV - aGlrWkVyS216VHZreFViNUx2MHNLbWMKLS0tIFRhTWJCcjdJYWVpQjI5TXFFQkRT - Tkw3V2V6TXJFZnhFdDVjMGJrc3Fobk0KGu40/TPjGOgWcKtScn77enLFZDwml7U1 - uW6bGr/3X1y1WwTboCYoG9dEP5zun7xB8DGB6xJ05/+8LBFUy6EwzQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEaEQ0YWZ5YUZheWt2Witt + cWpqTHYyT1hFQmpIeEg2RlpqYU1seDNQa0hzCmNHMWE4NU81bXp2VXIweEhZK1pP + TURPS2dmNUFiT1NaMXZiWmd4MEVQVkEKLS0tIDhkTXVoZDdsQVFsOFF3WlRIUE1G + Qml3Vm84L01zQ09EMmtnVjkrclJQMWMKNUvfckYJ9v+JkR73Pwl4+PsforGNPQo2 + aC4SsSVHHhchNfnKQrsF+w4S1kWglOsRZ0hRWrr4VU9+O/Mmn2KG4Q== -----END AGE ENCRYPTED FILE----- - recipient: age1xgy03g3vjydsxcl0qpdgm8rahjcjq95ucxfwlgr22zwjx3p7jf2s9jk6u5 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB1VklRNWNSdW1Ya0p1QmEr - L2tXZ1p4R3ZOQVNWcUpSVDhTcENlc3FFMnpzClhhcTBsWVdnTlUweTg4ay9pMEtP - UFVhV2RZbTJ0QTQ0Q3JrWVJ6NVpHZmsKLS0tIHZvR1F5R01jRjBYTUZZVHlsN3k0 - U1hkdC9LNlp4TENMalEwMUVGbS9SbWcKVfLZ9UGQ1PudDhyYks0+Z+nL+cDBb1fT - VkFP1bMnmO1rd99GyaoWGJai8V8A8AgjFrx76bf8YKiUCclhHnHGrQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzRllYV1dJcTVpQUhqMFdz + VXA5eVhpYTAwNDlncHNRRWExTFFkVkx6N2xrCks4ZU82K3E4eGJ3dGM0Q2d2MjNk + YlJoZW9acmNkWVJyYk1CWUxZM1VVWGcKLS0tIG1xWW51QUwrWVVmYVFNYkRlTmdB + R1QvT1dpd3ZiQW5PWXpPelRHay9IYzQKeowheEj0jCn/LCpTpQuzjF3Hz8RDyB8+ + VrHgGTysARU1VVI0opGDgIlNZX2wmIzp970t9K1xYQlA5nUX5yWB/g== -----END AGE ENCRYPTED FILE----- - recipient: age1fv5dafs4n3r5n83qm2hfz7xmnflsz0xf9r3saralrptpgf8mvuxq4t8k3u enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2aDJEeXVpK1F5QlJPeDFO - M0h6clFDOHpuSGJ3VnZtY0krZFl6eHJRWXpNCktkbmpDc2t3OE9Fa0h5ODlFb21p - STRWTCthR25uTlBmenNOYkdFUTdFZHcKLS0tIHcrYjh5dlNGRVVWM3hrU0toOVpE - ZUhkRG1YMVBDaW1sQ2dxWjVKcU1nbnMK7cGYzru4dUO/zDZYj16BoGIfSr307J/8 - 2GBc07zn+BFoI4xsm+kdDfQaGrSEA5U1EsAiXDydjxnDVbSQ1shY+Q== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1VjlaOE9uUWVWbGtMdVpH + T1lMMkdvTTZkNmFZdzQreTAvL3VpTWdDc2s4CjAya09GUW9VT2pWSjRlcy9kRE1m + WlVnTGduYXlYRzVLSjBoVFk4VWIzYjAKLS0tIDUrelM3VVRUK3ZXbWZCdTFrVk9C + UEp4VFByTnlteXRmeEdvdTk5SVRMcXMKr+d+m3yykUykY8DkNn4rmjWwRzqbhNJp + C6Uw7yPIxgLiCLllghThc42OorgS/hdJ6/eQ5ZcnLdEdtINtUTM3QA== -----END AGE ENCRYPTED FILE----- - recipient: age120530yclr75k6nrzp6k5jjftj8j4q9v3533guupzk4ct86mjxszqg9e5t5 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQbTJ0NTU3NHkyUGlXTHZp - Q29HMTdWVHMzZGo0cWQxbS9ya0U4OVl0NkIwCjFrazl3MnhJTGpwOXVzUi9KS0hi - Vlc1K29KUDdBK25pMjZVZUZOMHRuVWMKLS0tIHh2OFV6K0Q0Q1k0N1l1YkNGdS9i - QzZqNHZkckFzeFN5bVI1MlpmQ1ExbXMKKxFAOKuSr2Au5KrA7lEZL5gVtDAqE/9Q - tv/ROXUkhcvaRTLp8vSVIVD0WXdD7KZT80y2EGggVuNmBBzbw4QMVQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3YnpkTlBCOTNuQzNnRmhO + OXNBZG00QzNWL0FLdDZPN0FPeUxxa3NNTnlZCmtWTlRFSjhsOXJUOWR6eGdydUdv + ZzIrQm9FQVVHOHRMZitEQVptd2JlSkEKLS0tIDA3RmhOVE45dDBsaVc1ajJyOGln + NlBoOGxPbXc5Ym9wM3diaEYxNHIyRFkK33QL19LPSC5JCtITaKAMaoSfrkzmHB8x + 19z382DzJO1bOokrGu3P17OMvF/Y6nUIvHVxGcuhpDvN5TjNiZ4s/Q== -----END AGE ENCRYPTED FILE----- - recipient: age1rt0ngkum32wt6l2wnyr40hmwd9ulmzqfarg5vk62zqp0uvj4lyuqd2atgq enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCaWMrUG9nbTdIb0NvUEdu - UkRXVm9ZQmE4cndKdk5Zb3dOemhNVlRXam5ZCkNCTTFpRGtUZ09sa0tQdjJSUzl2 - Mi9SUjlRNG4ydEJNNjBPWHluTmU4c00KLS0tIGU5YTV2MGkyQUlJYVN5dkpHdFcv - bkhNK1huYlpSY1B5Y2Z5QnBZL2RYa3MKKhHMKatEVcSh6TbEV5yo0+O0Q2mtSCGk - qrixtwyV7JTuZy2UeY+zAIQVfVdDhM5vZkp766mjgxhjGsTpShy7jw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLRXIxQ2d1UUpDQUQyN3FN + R2I0bTlwQ1RIQk1ER3dwTVVlbkJ6cUtGbEVRCmhRMXB5UFNIVTc4QlpUUnNxUTJm + L2pXRHp1UFNSYStUelFpblkrNkdCMWsKLS0tIGk3akUyWjhBTXdWaWZ4UFFYWFRB + Y0I5K2tOb1lkd2hWTVFBMXQ4cFhCaEEKbql0WVLpVpcYSiC4cKDtmge8QueMcmFz + eioNA/KKVi15NlqUX+B3JEOcK4FKjGrm9zTXvn6e6/swWhnX6VymNw== -----END AGE ENCRYPTED FILE----- - recipient: age1c4atxfp05u7zm875s6q8p82ve96rqqpq9smktxlur8pk2yc3qvgql46dp9 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0b05XckVncjBsZXMyVVhX - a1J1MDFEZWp0VThlNkFFYkYwZjFTUS91RWpzClhLWmNIYVBlUkZ2Q3dNY0Iwdk9p - ckhpNXVBUldTTDE3YnNBQ1ZLYzQ3Q2sKLS0tIGVBTE1LLzBZc2NjUFE3eFJDelEv - dGw2ZVBmUmRlaUZkaGtYTkNobGZ6SlkK+ik7RGKdolGmj7m+2/BXeqVxlbpHudvx - dGCANq9i9U8TtgSUnpMYfa3qaOhLXKAPRnYjwNW31wvC098anDDs3A== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6MUduUExkNTArSDBNUko3 + LzAzL1RTL1k4cktrMnhxU3hMZnNEek9ibkJVClhFc3Y4T2NmTXpRcE5pVWhDSFFi + VUNXUzV3NnR5UWlMZzNoenJ1WDNSOGsKLS0tIFNVREdVSW9TM1ZCY3hmK05XM3Jl + WEd6UExVZ2l1YkJpOENja25BVnZ4SDAKNA6212WLOCkgoUnpG5oIRkQxLPjEP1r8 + SxaBKKlfV9B1URQjxfDvbZlw5ldeK/izmi1MRgPUrnjvyPGAroaKJQ== -----END AGE ENCRYPTED FILE----- - recipient: age1rjldv3fn3q686647exmcukthr32gmp6s3axs0lhyenvru9ajp9rs24ukvz enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwbXczR3hhVkg4OFJmVWpq - QUdPTDhncHJyWGFpWEE3QmNqamdRLzEza2xJClhJVXppd3poR0xHUUhIMXpGM2Jz - NFZkeDNBY0NQczNuOFdNL1FHQVFPVWcKLS0tIHd0ZklkZ1AvTEVXUmJpamNQeG4z - TkgySmN5bE5qbTdMVWZqQTlyWnJHQUUK3IYg/k6Qesh+QZnHQ9MIshN59UXEvrH9 - E/d96HM7ukrb7xJHgD+sqJoycrc6WklWv6nAjPrWgtDUaL0X8L76vw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGZWFrRWRvWWNseUhPQ0Vv + MDk3MVlqSnNKUGJ6eThNQ3E4ZzJjUEhVckNJCkFZR3RGaUZyOTV5VDRBY2ZJR1BL + NkJQOEFIbWNiM2VIUWoxSG9waDQ1K1UKLS0tIE5XWjlyNzhiczdDSlNHbGMrSkNx + RllpTm80NVIwTVJQMGI5bG1NOG1JRzQKbu1KWmzaLXR+AwYX7VzPQtUIdXVCY7bK + NFU1+5+unjrMisrw2x48OLMK4TwZbeTfmGSfwhA/Jsfjejb7sO04Pw== -----END AGE ENCRYPTED FILE----- - recipient: age1p9v6xaujkdat2tsc2mc4gxpg9hjr4suvwryuat95z2c53xhsyfxq0gf594 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5dnl5SmFud0ZDUjVKUk5a - YmtFazBVQjFHZjNsSnVKUzdCNFlYYjR5cHo0CmU2azVWWkI2SlFpdEl5ZnNMeDBu - alRZSkdQajhvOUlCamxrQlFMOW41RUUKLS0tIGxHUXc0bkIweVlXdUlheUl4TWlD - OXlPSVUrZHJzZDNiRFMydWg0aEtpUHcK5Hzn+RTpdES1+UEzZp4RvuxoTTjO3WCb - QehKZQrDlMPGgHKA+X2r1sCYB+6oq0wBpBa/Pr9rf0b2YvuWBrYnZw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBId2Y2YTFVMXNFZWJCQTV0 + SHZlUEIwa1lZaVlDOG50WGpobVZ0eE91S3lVCklidC94dkFlZWFkaVNvUUR3eEVU + ZXc2MnMzUWZRVEZBNmlrOVdNTnk2bncKLS0tIEdtWjhGMlZRWk50NFNWaGZCVTF3 + SUdIc2trN3VaNGJwMmNnRjhCaWZYNkkKSMYJ0MTMXt8LD0rASRNSmZKdEF2I3/t+ + d6rhCboIFUYewSCebhKmsvgds2RITAasdAD7J4ckv02kNg/wxGfHQg== + -----END AGE ENCRYPTED FILE----- + - recipient: age1nxgmdahcjhmtrf7q66jep55cjdcw6tfpw722jr4gytaykgf89ugqxufgyd + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBaUCtKQ0w5U2g5cFAyQUc0 + UHFWeVpROUowY3BYY3huRnVoMDl4WllneXhFCi9sK0k2NjdEaWdJSjBZR3JBVlU5 + bXZBMS8rMk04TVVtRXJsQ0MvVGllK1EKLS0tIGRiZDFyeHVvTnNlRzc1bm0yTE42 + U2U0TGdnRmg3Qmllamt5TVhHVndRazgKvb67M1Ir49+tnHoFzE3glqldDiXIXOCK + O+UNc9qTk0KnCaufzIuqEloU6Hq+o4CAcsmAOI2lgH5NToAO8MdlPg== -----END AGE ENCRYPTED FILE----- lastmodified: "2023-08-12T16:28:10Z" mac: ENC[AES256_GCM,data:7t9dAJPUiOD93Hyt+YLVjR/SdqIcuLi8TFP2/8gzem8Hrn97Yqx5Iow57alFcOWcb1ymhSQLIWjh5RydhlnoeLj/HbacSKxxFirFFv842mBVKqbVyfQcNozGl5D0oo0yd8gKzXQ6BaKqel7ZeOeIeY6XKAzH2RH2r8Gj1kPhkHY=,iv:bZuu+kFJcc8SDA1uShXroQcLMjUj+DTSvsbIABLddFs=,tag:bNLzxOll5UL5uFJeoq5XzA==,type:str] pgp: - - created_at: "2025-12-04T04:58:05Z" + - created_at: "2025-12-15T12:49:07Z" enc: |- -----BEGIN PGP MESSAGE----- - hQIMA82M54yws73UAQ/+NwmMaI8jMIwdHnjOFIW7/CPPCah4hqYA8/GuXgTI2URA - V+NSMC9RxW08gTJfY+EML3Y+ZlEuZPA7nX3f4tJie9B1S9c1cTMhX5xr0RoI4s7Y - VS7nzXYTWmulY9Q2pcbZAJajAzZUsYnraYmrVw9KKHaOVe3dXfmPFdGEDAidNoJK - R46RAKwWe55oqI4RBf9w/2DgeA/i93B9BA/IpXbPH4deXRv3d0Y/WPsWQtPcnoTW - gu832LLrIW6pwgqaaW/wHGAEviZQS8A5x+q3akwkt1VTNdee3EBjARcmbZ6XKhdp - TrWrXyIJXoVnzYWnCzFLHA1pKxNGzb629B/elRtBWq0e2QeD24J7zaxpBB/MYESR - 0T3BvfInnnrTatZ+/sw8Np+daKK84BgOVk+eaYZcW1NhvUZRViyEi8Xa1axQsl9a - MoSyo7c6yJhNSG2I1rXTuIpUpA1ZwhOD6YwqmZYUbAiknDugQAK/8aSOLx77HAtI - Hrr6YkEtpOp2PfHFWLWPm3ivPhpobEf6SiEVY57qbNlpZ7o9nggzF0nqMCGOrhWB - rXK9LDY7wBgEL8tL5VMIXeMlVxLlG+9NcbsU4ZtneBKv+Wln9+s+opdldMExkWhT - vabeAF8AfBJl2ildDyb+IgQYWoPPwBcOsv7lLLMDZG7r132kYFt0WVCq/O6vVJ3S - XgHMKk5DyZnrpoNrHX8pOtY7SpM1JPyGnPeRez0pzPgJFZ+Pj3gmPA6KVXIDAA1Q - 2OBf0rv5ECV0l3u+oca9kmcy9Hlr0ir2qqvsYDLPd63/3RmCLJYef7x2IfhImVk= - =TIo3 + hQIMA82M54yws73UARAAg1YtDo/by3gZ/FNNOMGJzCVZeAf6BGTp6IpMJyyLHav3 + DIaGbAm5S8sQ5xlEkRoAhWAIIJ4t7orVruHohEKfEQRX/lgOi3Q77hZi6Wve01MD + nd2GynOfZinekISLR1D22+hwH4GK0EeoYmmSbUHGD/3zOqQIIHWLK4GPzNucUL2V + gz+Gi7R1ytz5o7ePF+nE047a82isGUVDvuAcl75m+on4jDz60iiGFNRNwO/bZGV3 + ru/XWN0OKhVKuk6MnGa9saeVPNVqTQTSmG2dnQsZk1g4UXoCeARD29zfH6wGCUBD + yycQxjds/yZOxS//F0XctXgBRpqT5zgsmHHrd/GdKA29S5ugzY+PJLum87R87Npr + HzAfxbGsGAUmngoQSUQxHSmZAYotxjiRxXPqRliMz0iMybj7GEPp4xsVqOP3V3Hh + Dl+mQ4qlOnKQxkyhmNNTS2x07N7KtukXmnCD1Bs//g2ExOmrwflA6s/AOZ54aATn + 9RT72t8DQlZZR2a+HXrtecGsEUVguF51Q/ds0vm6YqOB1p7C98cU1way7AuGx6bX + K6kCcFT2bZx8j8As3frysLpFKgRDpBfudHwca9Nl6vF2XfPL7alGH3ftCx1zvPjF + M9K0HFlhWKCrfVzdubMofx+qsdhPhOqI73qNTaeq4Z+y37lMqOaP2opBT3/+lH3S + XgGkzkt8Y6irSn9cJwqU3c9xBRANtYykspzRSLTJLcgRJCEfp2NtSrIaWCkayGqB + 202M5EwOSA3sInPZs91pm7zUommofh/2zt0tXxzAxVsCcpXDdmYBv4Em+pGTxu4= + =mIWu -----END PGP MESSAGE----- fp: CD8CE78CB0B3BDD4 unencrypted_suffix: _unencrypted diff --git a/nixos/servers/mail/secrets.yaml b/nixos/servers/mail/secrets.yaml index 56ff7ace..57c41f0a 100644 --- a/nixos/servers/mail/secrets.yaml +++ b/nixos/servers/mail/secrets.yaml @@ -5,123 +5,132 @@ sops: - recipient: age1n4kdchmkk3rfkaknxhveqr2ftprdpgwckutt23y6u8639lazzuks77tgav enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNWXJobVhxVUdMTThCVUc4 - NEF0SUoxNkhtRU90VHpjanZUZGk0d1A2N1djCm5kTXpSdzlkYkV0VHdYaGFLQThC - QnZDdXZ2MmxaaVRPYThDMTJPKzg3bE0KLS0tIGhnbzhUdzlLellQZ2g3enY2R1Vl - ZUlPWkJsSVlLNEtxV2JzaTFCVWs4djQK4mMDLXTYoEnfCG/1QFEtKRw1TMy6H3zU - RnASNkT2YMmCqkb0GOuLYPVkkOWLHoGsBOVpGkmi/k/l1NlKrSU83A== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxYXVrSUV3TlBLWWVHVS9T + UktQT3VuRjJCZ3lOVHV3Y3JUbHBVeGxrc1FNCno5cU5XMlJjbUErOHBnQXkrQnNC + Znp4b09SUUlUVitXUlY3UWZ1SUtVUEUKLS0tIE0yUUdmNmJ3Vm1sUnVic3FmeGlP + OWpTTkJOOWZGbDlRMXpGc3NuUUNYalkKDTOK8D2lzfLO713/SNgQTIV4bxPNhuID + esRcX4P1ZkTiA5VSdfob9zuw3dpeLU/xIx4X5pNl9BytVYtAGEzApg== -----END AGE ENCRYPTED FILE----- - recipient: age1cnu37d5fqyahh9vvc4hj6z6k8ur9ksuefln7sr6g3emmn927eutqxdawuh enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMaFN3NVlDL2RoUzJ5Q0ZW - ci9ORzZZNEI2OEZ2aXM2MzdnbDVUYmM3YUhJCkFvTVVJTlhZa0RUK3AyajBJV21j - VTgxM2VWOEhGY3pSM2tVeVdYVlEwZTgKLS0tIERGaDhuakxNWjN2cDhBWS9pbGZr - L3Q4ZFJ4NVRXMzZIV1RSL1pMc3RpRDAKDx5hMmHGdqUEfCSYaJLTdkuWlgx/AwAo - scwMkcYDeyZ4up6Ntl4ZM3hLqRdNNzWZ2UoXX+/p93AoZlRmsu+bqA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLYmxzbjdpRXg4cEtRYVVi + MUFPQ0pxWGF6Z0tmd0o5eDQxTG1Fc3NOY1NJClR1djdFMnBQbm9RSWorMWc1cG5p + TVVuM2dHaU1yYlhXVjJXejRCckQ1THcKLS0tIHkrWFdjdUExL0VKMjNGbC94Zlpl + SVFRcVVFSG9qbGVicDNqWGREQmh6SFUKNEgoq1aPABV2Bz3R+DezbnTMXl0e5QTb + UEs86MhyNbt87DCBIySyqqMOU8YD7fYAqrkEJQzFWszmZSpIV3pwvg== -----END AGE ENCRYPTED FILE----- - recipient: age1a0m73qr8hhuz8xemv4vymf4wmpghm2hst8wgrn3pn65ext5mf4ksk0vsdm enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2M3U3VHdMUWZYc1VaV21u - S2FXN0d5V0F5WWlPeVhYZm5nVExtb081UVEwCnVFYnpOTkpTRXhTSG03RjExL2tZ - TVRwOUhkSzNLSVJ0S1lRSnY1aXVEZEkKLS0tIENjY0hvRWtYMGM3YWRJSTNHNXh5 - cDJlMW5pN0lOM1RIbU8yaXViT1FybEEKuPryiHmuSolFcdF2pdf9UfqSYYEGNDkA - Q3p9iCSwMIQaVWKQHvk2oaEphY3FwxjcI/sYfDinscBjMQPZRwYdLw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0dEx3UFlFMnB0M3hIRjMy + SUZ2ZzQrb05ueS9CaDZGanpOWnREZFl4NHl3ClpVSzlSOGs5NHFrUERNbzhaTitj + cXoyVGt4dXhMSDluM2N6KzNpL1JxbzgKLS0tIEw0eE1NZWJIVDFDQ2ZkcDAxWmQ2 + VDNXTWRiaEJMVWdDUlBsczkxejZ4YWMK9gTFqHtJToihkxA1nCnzSb6NqMIaF5dL + Wk8cCshkjw3RI3G0NrKfUgz1R4jo4NPUqUhlTbPiLAmBKCS1909jfA== -----END AGE ENCRYPTED FILE----- - recipient: age18hpxz0ghvswv9k30cle73prvnzrsuczqh87jjdk9fl50j3ddndmq9xae0n enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmdDhFMk9oOCticTV6NWZL - dG8vYVZRaldlMy9mYlRhemx4aWFkZVZldENVCkJ5YWlraDFuMmIxNWltVDloaWFB - TjExaWRBYTZhRmFpVjk4SEdlVEZPcVUKLS0tIGl5YzlEMlBmelZKdHVBNHlBL0Nz - TXJObDhUQXJJa2wyV3l6ZGJyQlV0NFEKitl0XyQkAkGp0r/i1xKukfVKrmEwtttD - jjxa4qYRdCC7gC+nPAhMfwI/C7s7dsOMRsQUHRhqLigl3gyCjvTaJQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrQmNlaDlOSTYxOEx4MWxW + cjc2eXdpdFIxaTUyUURDQWdoLy9iT3ptTXdnCmcrL1cvb2NNWTkzYkVmZVJqTjln + L0xQQXRNa3lTMVR3ZVVwUThqaVpsNGcKLS0tIDVmQjRPSTFJSHR4NEh2WmJJZXFU + UENuNTh0NldaUFNROXNEOE1JclRwVkkKzGmppt6wGCe3W5hF51lUZZsT5fOJsVzf + gh/a68l7eQzdknXnxQyl5NEq6XnxVmt+wHdkeDE04UCz0J24lYaZ7g== -----END AGE ENCRYPTED FILE----- - recipient: age1xgy03g3vjydsxcl0qpdgm8rahjcjq95ucxfwlgr22zwjx3p7jf2s9jk6u5 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4Yk41TnQwZzcwZldWTE4w - R0h3MzJrT1NZZUNnRWFiMnNnOWh5UlB0QWtjCjZPVnhNdkdONkEvaytXWi94c3Fi - aGRML0ZENjFhOGRHVVNQcERlcWI0K0UKLS0tIFM1aWJrWnM3NDhDVjJiR3p0czUv - a3BOYXF3UE1qQWsrTlhOc3RXVXE5ODgKi9jhHeRw45+K69CVunmFylntnrpEgYVv - 6G8Hlv9IOK4ACjpArqtIiZ6jetWI1zAaYHiBYtguw/H8UIFYwZcRLg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPOFNabkFta3FvYnNnbVNJ + N1AwaUlFdTlZNXhhUGhsbXBzZitOWTFRdkFNCnExc2JWbHFPcEFHSnBSYUIwUFRh + MlF5TTh0dFViSGZObUdvTXdEWXpuQlUKLS0tIEMrM3pQVTZLMGxYVWJUdWpUdDVp + SVBObk51Y3JIZnNqY20zN05JNFE1b0kKHafP3BcmyDN/dSp5Dfso8f0IW9rHgZFK + Ef2ZR1rlIGp86glS7A4kBL08Bx26pZq+plLdyfh0ojLbpEu8uv8iWw== -----END AGE ENCRYPTED FILE----- - recipient: age1fv5dafs4n3r5n83qm2hfz7xmnflsz0xf9r3saralrptpgf8mvuxq4t8k3u enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuTEdCN08zazlISkczL3FV - Z25WemM4WVM4clFCQ2FrM3IxZEVEdDRURW1jClRGSW1LU1FHRXMxMGVYNmMvc3g3 - cG5hNFh2QVFvbUQwd3V3QTE2TkxGZzAKLS0tIDZNR0lvcXB4R215SlRWT09jUm9J - OHdHUkNsMTZQa0I1WXhTL0NzSERRWGcKEColN8B1Ys4YR7km2Lao+uIFUFugIH19 - B/q/tlTRkiwG/gdDa7Zy/T9H2jch0ug5H2S3iXVKV/eHFAcldoCMOQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArYTRiQjhseXZUY3IxVER0 + YUNhaGNCVVBEZTVRaTg3U29rUExmTGxYTVRnClJhNXJxY2FKSk5QTXBpbHlUM0cx + eStUSm1DKzM2Myt3aDJacTJsOWZRbGMKLS0tIEhZc01XSk5GeEQ2emRmQ2FLUGtK + V2FiRHlVWWhlOGM3Qys5ejhhVThQT1EK6jDmP1zOldLyg/L0495Q9F5Jf2QiA/Bn + PP4to8gBSW3Z39pRgTfuB9l8CLBV0mQP9fPCZRUob0itcA5/0k2LDA== -----END AGE ENCRYPTED FILE----- - recipient: age120530yclr75k6nrzp6k5jjftj8j4q9v3533guupzk4ct86mjxszqg9e5t5 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4L1FOYStQWTI2Q1Jua2lW - UkdEVnVrN3JrOGoydHZqUmlzTjFIQVhxQnlrCnVmM3o3SmczRGQ3cEFkcm02b0Fq - SmU2WEFGTGZBTG1NTFFxZDF0d1p4RzgKLS0tIExpMVVMRlpyaUxFVWxzZDZ1SXl4 - SjR2ck9BOXFpS3hBUHJlN1FWeGRYcFEK/QuQbxJk0umDvsEZ+mSG9rkLc50dhUFv - IHk0BDRc/j+RfWdHXw1MNsjrwf3kWlr3qVHW/AACi/oDIoueb6gSoQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnQWI0cU9XaWFacHFaZVE4 + TGtPUGVYYWZha3hjdDJXTGdZVmdEN0Y3aXdNCm1KVjk0UU5kVUtUcnpoa3JISCtZ + M2xPL2tBNHJZL2xOemVSNGQ2R09VY1UKLS0tIDVLVkI3Q2d4R0dKL3dXSjBKcVhs + K0hVT2hwTlFtT0pIY1M0M1FpYkJPK3MKXq+alXzWwpa1qkuQTVVu12KtG5KHw6x+ + p7G8AwuC6Nut39WhI5/HHosOtz7z+xEScuNr5w7uE0S3XPMElUkOkQ== -----END AGE ENCRYPTED FILE----- - recipient: age1rt0ngkum32wt6l2wnyr40hmwd9ulmzqfarg5vk62zqp0uvj4lyuqd2atgq enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHSzQvTUhBbzE5UlJrS0NQ - OThKRmFYQndxc0pDVWdiM3lHMHRLMHF4VlIwCnhlM2MvQ2JJRERRRmpKRW1WUGRY - dUtCSXZmK3V4elh0MXI3ZGtmWUNia2MKLS0tIEx0VzhkaWJpZVhwM0dNZTUzcngx - V2JpeUlIQlIzZW1BVUM3Q3FRWHNyeFkKZy9/XP4OoXmh+/g2pnKNm8ZK73iQxMYb - Pmm47vfqBcwrk+q2K3QBQXeMQVUd2RmMX1od/ttNC/mRaqo48kAKsA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAzKzNVdE9GeEovM1VsYVJh + aVBhdXZtZUkyTkhPS2cyTzRtOWVjUnhZSXc0Cm51cE5sSnFCZGZlemFCT1laS2xl + NndubjBNNG5FcDJnRTY3U3hick9mWGsKLS0tIHREOVlxUmJMMEMrSVdoK3U3cFl1 + VFVpNFJGdUNIVkczMFgvekJVNVNzeXcKvtLsQdg9zoP0A0r16qfanADWyYh9WwnR + ka1zWkmpgKJzgkhzRFvSQc/isin0EHd034/KmOrkHC3w90AsPyA3UA== -----END AGE ENCRYPTED FILE----- - recipient: age1c4atxfp05u7zm875s6q8p82ve96rqqpq9smktxlur8pk2yc3qvgql46dp9 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKQXBpTktYTk1PMDFjTFVi - aGl2clZpU2R5TTUwUVh1Mld3YUpnUVNxNGlzClpWdlptSTlEMUwraXY0RzBTOTJ5 - bGtZV1dDTThXSFI5TGc0M2M4WmJXU0EKLS0tIHE0RGR1dFJkWjJLaFBvdW1neUhK - NjdvdTduM3dPWnd6NTIvS0hkRFd6MzAKJdxjO2eDkbriitwdRGF3V9ZvC3J+48+b - WN3DuFDoMKV9JZoAr+6FSsbzwBb5bhX6qNmsYaJWt/jkHC4I95yHWA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0bDREblZzZmd0MWQvaU1n + WUxwUUNPK2YwNURENFJnR1lJL1NvQ1JGeTBFCmd3bTlDL2ZHS3NTYTZVc25XcVo2 + SXBENG1SVzc1bnBUZTJMdk8yYUtrRGcKLS0tIERUaERTOU9IblFHU0hQNjM0SWNW + V2o4K2lGcHBkRWxjVnBxbUlhLzA2cUkKSqLbuwNXlAnOGiCkkSWsgvRLjIUieXJy + K+RVOsRgyb5rX8K7UT3Wlzk0zYXylQNtWaOziTbBNR+2Sf4NZqI7RA== -----END AGE ENCRYPTED FILE----- - recipient: age1rjldv3fn3q686647exmcukthr32gmp6s3axs0lhyenvru9ajp9rs24ukvz enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6ODJhb3NtSHVQNXhNWkxP - UUVqdEE3UXNMNktIeVdyaU1QenNHbVRmVlRZCkFsN09aUFZ6eDJVYmtMZmN4SFBE - bjRCb3c4cUJGZTBtUHVzWUJheTByTHMKLS0tICt5Yk9oaDR4OXRzZnV4VkRaWlVz - amJCRnlTRzY4ejNnR3puM05xU2tGTHMKukT3QTpEYxheIY3reuKiw6gw9tdBIxNv - Doxmxgen/Z3L5sZbRNf4HMyL8De1HopgBm9mkElNlWWTkyk+wf1Nuw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPWUJONjVWcVdYeDNBd3Rm + MlJQN3dzSWd4Y2grZWxmb0VWalN2WWxnNFhVCkNSTnRIVTJ2d2JQbElyZ2k2YXNv + Y0w0VTA2YTYwVWJSU0JTakdmNjFzYXcKLS0tIEFJd2FqcnZRYzdpdWwxODZ1ckd2 + bzBpU3pzVTVBWnVpaDZ3cFBJWk9PNmsKG7mY1cKcqAS0bPVQIPj6MBoPX3sGaAfr + GH2ReHYX4sRMCAHS9e2L4qoPnoDjIkla4PjUmuFDHNAc6ALy+Unwtg== -----END AGE ENCRYPTED FILE----- - recipient: age1p9v6xaujkdat2tsc2mc4gxpg9hjr4suvwryuat95z2c53xhsyfxq0gf594 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmcTNBdVZjVkt0YXVQODJI - K2VVeGR0elc1Um5GcFdPZTl4UVRsNS9BQmtFCnNDbVY2TkpIVzRCNjBxbWVqLzEr - aHNxTjFLTlJMeEFEcEpvVmtrc2hNNE0KLS0tIFVzKzBhbXc2NXR5SXJIcHpvWFRO - d0o2U1ZRb2xvWm1aMDM2ZGk4WWFPUWcKGxjAWVEUF4EngwwY5vYdEfa4ceh95TIf - 3spSMNe/xW70f94nl7YFzSjPjXG+TXqvuTU3BiBLYYfv8fNsrpZCcg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZaDBseFFYbHRUTzFPUkxL + STk1VzhUdnZYMi93UytXWTluSk5ON05pY1hVCnQ4TmR4Rmh6NGxKOUdEeTNMODR5 + RXJnV3lzTFhXWWRzczRIUnFDT01EY1EKLS0tIEJzbVFSYWxjb1h2UXJBbFdic2dw + djl0N0dwanpPbXZwcjV4L21KZnZnUHcKnyZXcQNzkjtoPji/zibcnmhI14Q1Kx6+ + CgeGqbbLn5y+tkACdBtxvQBVofIHGkjTla15fmbl/tPbpnNe0pO2kg== + -----END AGE ENCRYPTED FILE----- + - recipient: age1nxgmdahcjhmtrf7q66jep55cjdcw6tfpw722jr4gytaykgf89ugqxufgyd + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhNklVOVFxVFA0VUhDdUNx + WHFIYktaRjNmN0F4OEVPZjZTRk43S3JlMzBzClpQdnhlTEVtaWVTR2RKV0IxUzV0 + TlNOcUEyM3VLdmplUWhWK0pVbk5uZE0KLS0tIExicTRodThiL3FFQ2NoMXhwaGNZ + N0hKTjRYdzFxVVczbHFKamQveURrcFUKrnUOoE9xrEuSWYdIRvOHvQo4z9Pf2mGA + 2yQ1ojJKvPmWa3LNuALniOZ4Rj43MNNlB5D1YoXdQBfpAPHmLdABhA== -----END AGE ENCRYPTED FILE----- lastmodified: "2025-12-04T09:33:56Z" mac: ENC[AES256_GCM,data:/p206tmUtOuEJNWd9d02wiK5HCfttpA9ennTavNW97laXDEMVsVkgMV89rdpplX+NZAYn1xLXwhUu9Ruz9M8yMx8J0ziepDkrcHQNqBxoRWtmMbfEyk/Lb98BJk8T6SAR9tvFwf+t0OPfO2bpV6h6jTrR11BFDNiZFkIezn3/Rk=,iv:ob0w/w5NwlkwrxEU2shgm9mhA+NQAW72Px4i/GHGnfs=,tag:3y3vQGDWu9h20aKq1nGdBA==,type:str] pgp: - - created_at: "2025-12-04T09:33:39Z" + - created_at: "2025-12-15T12:49:08Z" enc: |- -----BEGIN PGP MESSAGE----- - hQIMA82M54yws73UARAAuB2Byq1UieMqwSlOqpGeY740YSt+BvKCqMx+Hq8PoguB - T9H+7elDIBAW3ND/RcTSLErEmOHV8jmilpdWvDVxcUudma25ugCGgbKdOo+SryBA - c5kCA5X7DCykgdsLvqGBxOFbeGT0+HDn3Ai8+Kq52xvCGShm/RGeYiZlku6lQbrg - S6QCOghHqqBC+DX3iKaO5+e0hNCedACYBbGC6n1xhT6PY3ukqHBIcDgLnuHcuA2v - BvRjFEExmG+o0758L3FOmr+4TyxW0wtv4g53b3HHk6C2Pfx52A/qwVxa8fSgsf2v - mNIYn98Sst3RzL0FxUtINEFl4ISmU+lwYxVhy/HKYWKRjTF/xL0Pv7NRLK2xXJnf - vW+H66lMKOF1fW/S0hapRnE2sVIm6s0Ia4Dl4GblveWJLU+5ooHYIF5nkueIvNao - vDJ9eCzD8p4oaDioS3mej6LWENYOjWm6GEKbyPLeVi5MtSoRKP8o/z5MMD4dyGiQ - P82Le8iDQ4x5FkQwfqFD3a/pTegoMfLWEfPrI+sYSaf+KFdtAUewBWkdTItkFmIO - 84cil0INjILs1k/4l3mib52U8GIAxTT2YnOfhiJHwxzW+NYsTxMZE1kC5yU1HJIe - XNYWwx0SSo44nYxcFGbHbEze1/4VNEVxhAW2GXerlKBhpRgyoIWKbfoMfTRZFIHS - XAF9lFofpMqR4S6c000F7xPZwar5HuZihfbubpYOVcCn8ms3Y0EOJuSPAZ7/9eSq - 6kVEXk+6XIyhKUhWE9Xji5fA+ZxBi+n58C71FkGWSzfy+Udn3IBVJpG1FQ11 - =3RnM + hQIMA82M54yws73UAQ/9GXFumsIhNrmjIiISpI++E+fpnNoK8ZuE69ecWzvc54DT + 1aQctFc8hQfQalHGmWfYZhoMoZwY8/eVI+vDjE70zlkdOYhJ5lclirmBXTnuWezr + QqSgWBG4h4dQFZHhV/GqmFy9xwQHP2yjxURFlfNwrxDzu0D0lE0NQVnKX4EdFWrB + h8rvFnDqdHPQ0v/R2V7qKf7zZEG/prZaXcd8jN4I+pN3nauKsGzujlRDa1BGrA6R + RWHg3w6LSbtd/IbMeptmN4NhYumGIGUg1+MBjKlJY6tlunmct50IVZRCJ5Ah1QrK + sGw87zBzBU6MDTB15dprx9MjqNwzpuLHlyWdiv82J7Br8oWMdq5flChWVSCsulGp + 02VOLlyhAmSu93mULgYKsFbcYVoRnwh6QOQmJOJOWeh+R/M043ziRy6fSIsFUQiW + MgPBj3x2X+F0At2fsSPJPqr0SyuiQFY9364/vKxpzvaHK1Rf0NTfJ7l2ZpFGcwVP + ioE8iRW6BlkKmZAdtbH7Iu+oEvnoFWRpOWa+MkNuH7k+eMSqP1S/ZblDFPsVKOP5 + VngVVit9mtdyrmGXArqNw7CFHF6sN85+fwk2iFhjViQVsh4U98dfgAKz5+drlLt8 + 14zF9iwWu/IYGEHA2fwCa/i66VxfbgkKnAy4D/Rzz/5AWbTzIBMbFiDkcP1rs4HS + XAH0Bb8+Rkm5GPnu+A7suTFWfxO4PW07EOfDX9DNgfvVEja17Y3LXfOFmJTnzucJ + XZ6JTDAxLdJkzrNurYgU6qyM7J6ltmkB8FnZgldRZ8lzSvcio3U8j2oOakY1 + =Gaud -----END PGP MESSAGE----- fp: CD8CE78CB0B3BDD4 unencrypted_suffix: _unencrypted diff --git a/nixos/servers/monica/secrets.yaml b/nixos/servers/monica/secrets.yaml index 8e390952..bb53c728 100644 --- a/nixos/servers/monica/secrets.yaml +++ b/nixos/servers/monica/secrets.yaml @@ -5,123 +5,132 @@ sops: - recipient: age1n4kdchmkk3rfkaknxhveqr2ftprdpgwckutt23y6u8639lazzuks77tgav enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjbjM4YTlqR3REdXlCQ1F3 - eDZrZ0J6UXJ5SkxJdzZmcTdCSmh4d0JqUFh3CitXNXpSaUlDenh2Z1V0b3F4SWRC - eWFwenEzNFdFbG9yMDAzcWhTYkUrMTQKLS0tIG5FNGxjc2tXSTZvTlVwT0t3NDZz - blVMNjVMamU4ZW1xL0ljRFU0YWFGaVkK0sc52xT12UkLaYHK6TxJRETCt2GN3KM3 - mnYwxHVbm3BPvQhcv64xCnMM7lmtVBGXGFUyI7ZyB3D6/kPbmEEmBg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB1Y2Q5cjVnZDd2VDYvdjdO + N25ZQWhJZ0JQYlArQW1IZ0FHcG5seHZjVTBBCmtzbFJSdWdDWjZ1VUZJbFJJcUth + cENIVjUzK2tpS1lDd3Q3eUVQRzJYbFUKLS0tIE0zOFo3ZEtJRmtta0tRdzl6TmtZ + bnZMTklSbEJKUzRCaVhKQTAwOXQxZncKwVaVV26WIqlgmk15KCdBYeZGUqOAZhDT + DEpvvKijxlMWsLHHvzMJkQL+HsJ+N8+xcXIJOggpJwDCUfPspjRTBw== -----END AGE ENCRYPTED FILE----- - recipient: age1cnu37d5fqyahh9vvc4hj6z6k8ur9ksuefln7sr6g3emmn927eutqxdawuh enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIQkpmZ01zNXVySGNZM2JP - ZjQrOTdsREpaRUJFRnQrbU9pZ0lyY1FiaHk0CkRCWDJGSk02RW55UkV2K0ZxYjli - YlJ2eEJ3bTVCUFlrM1E3V0x5cnFZM0UKLS0tIDFoTmVTa3htUmNpRXJDaUpOSmla - Q2E2R2I4WXNTdmpPTEZQWHFRYXUzQVUK5f/L8U8IZJPgbfelPBwTBmKsc+Y8tjhY - eYtaV4ZWz5RwOlbE+rExUJVApIrfyWQAmGZSVul2HMKdBLOmHxoGKw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBldXgzSkJqSHVkZGpPSGV4 + K0NMczhmVjRqYk9OVmxXM3VwKzNOOWtDQkhjCkVlV1RrT21ab05aUitsSjFBQmo4 + WVNkL0toTXEwYnc1NVhZWXZIaE1YSnMKLS0tIHJlL0ZtM1RDTkxQd0czeVlrS0tn + MzFQajZKQ1U5cnBaZk9EdUZhcTJkODAKcAR83PIG8l8uEo98sKxs3HuhPbJJ5z3s + aNwSNcAHjeXZXBxt9GpYf5Weq6a7p8Muw6Ie4RhYbNvNtEXmw/Ai4Q== -----END AGE ENCRYPTED FILE----- - recipient: age1a0m73qr8hhuz8xemv4vymf4wmpghm2hst8wgrn3pn65ext5mf4ksk0vsdm enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxd2NxaGRObHZmc1U4NE9n - QXlPR3ZaODQ5VU1ZOWh1ZlVtTEZMZkY1Um5FClNQSjhkR3QweXJkNTZ6UUdROWpi - RnNtbnZJOCswUTNjRW1Da1FwRzBVNWcKLS0tIDRKYmVudjAwd0tUaloxVWxINDIv - bWh4YVJsQnJITncxSlJGdkxCVzBKOWsK+880CwWu5iApYRBFrXOjEnKAdFFEF9pE - 2+a89W/7vdclzE8xoQ1HLWaVgGz3ldJDtaGAN+w1dI8w6bqzVsixuA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoczN0dEZWbTFSb3I4TXlU + ZDV3T3p5UG80SkxUaGcwK3pkLy9SRkFHWWlzCkFPc2FpN3BJMkFQa1hKcFZjOHRI + V1FUK05QVzFSTmlTQ05xallKRG1neUEKLS0tIGQwZUhnM3Q1dzlkUnVCS0ZmejBW + M0tRSkxPZnhqL0p5a2xIeHlOU2tkLzAK4y57YbVG3KKeYXAJI0JfRBtI62YMQXxn + DBKNYsWW7S0LmlgtxxZpBcTrLLkR2StVdlaEPF1InDoe0la1oawbtw== -----END AGE ENCRYPTED FILE----- - recipient: age18hpxz0ghvswv9k30cle73prvnzrsuczqh87jjdk9fl50j3ddndmq9xae0n enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArWG1sd3U5enhjbTc1Z3hG - b3h2Y3FmY3pwalZhVGVDSDBjaDZpaVRXUFc0CitlYkpZZDlxTG1zYTlSVFlZRFRE - UGdtTDlVbHc3eHAzWXFrVzVieWdpaFEKLS0tIERXRUI2QWk0Um1aTkhYRE8rUmFk - eWN1MDJIeVRqc1Jucld6REZuV3FReVUKExdjds7qvNOgQLjiCMRBgi1FSGxtXMFM - h54rdvLDQh02GMtR/YQCyGGFi4P1njYqy6/tY7BWRBjt8A053Bsa7g== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzTHRCWmw4blJjbHUwMDBw + VHZnVTRZLzRMWDJrc1RSejFTKzBQS3NIWml3Cm1UR2pVQzdUa0NiRU9tM21wd00w + dHgvbkxhQktSMEVjNzcwSzByOSt2UUEKLS0tIEhOTGxkQVdEZWZ0L3ltUjVESVcx + alZnRjZKeTZpeEZici9JeFFHVkhISUkKwXNhVox9mz63yvHIt8lBBrzxYgqFSpWp + FPfvd5QfRHyi9V5giSOJyV3QuErp831IF4FnpB38BQOHC5QgWw8BAg== -----END AGE ENCRYPTED FILE----- - recipient: age1xgy03g3vjydsxcl0qpdgm8rahjcjq95ucxfwlgr22zwjx3p7jf2s9jk6u5 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzRExxU0tYTVdZNTRXVUU0 - SVY5RGRDSW5PWklwcjBXRllUbVBKenk0RDJVCm5yaksrTVBNeElrMUNkZzgzTzR3 - Z0JNV1BIVlpLcjRadUttWGtpWFU5WU0KLS0tIFIxTHJobVBSdVVXOXlPelpDY29k - dGYyamo1VmtVdTVuSlpWdFU2OXFZRTAKweZHnrGMcFq+W3MYGtAC1frwTLnUJpPU - dnPkxX42zL8YUxRBJt/sFYk/j1YGcW+3fYibyp/K212soIGzWhV4zA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyM2doV0MvNE1zRE4rc1hC + Zy9HemdvOHJmOFY1QTlDT2piTDIxTXpsNUhrCko0dldKWDZBYlFwMmZ5RTNzSm5D + NXBPdUM0SnJ5Tnl4a1g1OTFTS2ExVHMKLS0tIDNsbmpkVkhORFlzeHMwaXo1dStK + V0VZT1lLUFhVVnFQWmRuSDVjMmZNTzQKmxsMZwx439SN2Us3MvPhwZTW0iGdC3+x + d9tYS5Sjr8GRFnjMMllUumh4Z6K/nviZLjdiSE07to+aVhghN/z3ng== -----END AGE ENCRYPTED FILE----- - recipient: age1fv5dafs4n3r5n83qm2hfz7xmnflsz0xf9r3saralrptpgf8mvuxq4t8k3u enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3Q05SM0ZkUU5hTVJ5TXlh - VDRJSHdZVnlMM0lTYUE5dm9SYlBvMGEzSlR3CjZkM0UzcG5McjRUSWp1WEdnUDNQ - VHpwR3JlZklFcHNYaXZJRWhnd0JNY1kKLS0tIFR4eDZvcnVZdjNWRDVTN2VTQkI5 - MHRhd3I4RjdpdDNGbkdnR0RyMHgwWTgKNEkgnpi5CJxjkpa774DD6dt/a/NMt4Jw - iVhSKUvH5R3L+qJ9dVzpTJellrBvY+F3Z5UD+YwS9bhXeeiF4jof6Q== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNcTBpdEUrN2pnck5RRi9D + TVJvVXg2MDk4ck5Ia3FvUEhkSVkvdE1QMXdBCmNlQ1BkRk5JSDJpaEJQOW4weEtE + bjFWV1ZaVGdzMHNvTUR4OG53OTFFUTAKLS0tIGY0RmZuN2ZmR0JXRjBNcWJ4VjFj + N1hpRXRSOXV0Si9rMFJPaTkxcUVJRTgKGUOjKCLKwyZNtBu+izi1snsSi+LDg7ve + mJwWaZxtgWGeIIF9AozYeq3wYOmblpTDSV+mEM1FTmSrXTqFobl7Bw== -----END AGE ENCRYPTED FILE----- - recipient: age120530yclr75k6nrzp6k5jjftj8j4q9v3533guupzk4ct86mjxszqg9e5t5 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6dTFvbythNnBDQmx3Ym9W - ZTYzTXo0aFErZ2FOcE5mTURRekVNWXhDMGxVCnVsck5xdm9wcGhlZEsyQytBWi9K - dGlMTXJqTG5HY3BFbzZ6M29rSUJDSGsKLS0tIGsyK1kzNSszSFJCeFlhVTRPNm9y - cW1lVGZnVHZQRkQyZmdTSHMydjFxVFEKVE8+boRfoDPd0KFM3IJtbMjkRT67fZY7 - Dr7Ssmr5OO6z5NrAtDwcL5fCpRV6VS0oL7cM9yVv0QVFVJDiLos5rg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrQUlaMGwwT0hrMmc5bmRF + YjB3V29Qejh1UGpjdmNsaTBiUERaVkFvVFNRClE0SDNxcUtSWnh0SXl1UDI0MTcr + WW00NjJDL2g2MUQ2bDNoaCtBc1ljeTQKLS0tIHBudjZ0SGxsVkJQSDBBRlg0L2JD + bGF1bmxrbXB6K0hSRnBVRXlaU2U0UU0KqipVWTTSQB3TKEleUeOYknd1RhgnIJFO + GNnMkbKwrj29c5SBCksdTb1fteBmakDihCE7+iNKQTExx1OucS/xlA== -----END AGE ENCRYPTED FILE----- - recipient: age1rt0ngkum32wt6l2wnyr40hmwd9ulmzqfarg5vk62zqp0uvj4lyuqd2atgq enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvYTNnYnB3Y1A1MzRxOXc5 - aU04cUZFWlpROHdOQnpTUnV6OHhidFZKOFVnCkRlZXRJUDlZTGxFZWdSZllES21z - b0ZqbVNHd01hNHNIdU1rWGhlWnFINncKLS0tICticHZROXA2d0V4WW12ZTVkU01u - dVNUSDR5U1RNaXBiUWRLQmdlT0lEN2cKHMDOgsfIg+rC8AZd50LmHdIz2mY3Ud3n - hd02liKhYItGaCXphJtCFdMn1gefpadjB8MpZM60muFp/cVpFkDvOw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5QmZSbTdseGs3UHVhUVg1 + SXduTnZuR01Gc2ttTXc2UDRJTVFxZ0NLeXdFCkl2VHJVT1VFemE3bUFuUVdXQjI2 + UW1RVjNZd0J0dUlsSnJZMlFKRFAvMmsKLS0tIEZrUXBKWDVXOGNWLzBVUHZYOXlP + eERiNFdpU3pRY0Nwb1VYZ0hxT3BzdGMKkHeh6hsMhBRtgLKXxj7ylVCOXIkWfBZS + +ZYMg8DCDm6cCa0Pk9Xr81ccw1IJqMet7aHgCR5d8fKLAijiU/NZgw== -----END AGE ENCRYPTED FILE----- - recipient: age1c4atxfp05u7zm875s6q8p82ve96rqqpq9smktxlur8pk2yc3qvgql46dp9 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2WlR2b29IM0JZUUdqZFB5 - dHNuemJVRlhuRnE3azVpNG9JaTlYajlDc0NvCjVkWjN6Z3QvbmxPcXdsRlZyU2JP - eDJZSDhUc3E2Vm5YZVdUVU9Rc3owNEkKLS0tIE9EdUlLUVl5UUlGSWdQd3JZZDV0 - aU41dStlRGs3Y1lhaVpGVEpYMkIrcUUKQ1qcAOal7P2RBSZB7/hiSj6uUU4gHSiP - LntpjP6eefS3WlvzAbAWoKyowF4kLdfcAlcOSSs15L0voHGRrGBzYA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzSENUMGU1a1g2NVg5QVJB + TzRtemNHMzY0UzBuZ1lQTU1aeTY3ci9IVUJJClU2RHdsOUp6RHZHZlp2L0RybDds + Ny9tWnMvZUlWZW5qUWZ3SUJKZXBUT2cKLS0tIEVsVi92WkVsdnZhUTdSa1RzU09k + bkVJOHc2WE91RGliazR1bWZoL0pUMWMKoCmAtOm4qo663XienB3jRCc3qL0Hxpr9 + jKDHTOLCCakjcyKoa4jSfPA403qcvlM81zSMHWzjFWMp5a5OZ2cQXA== -----END AGE ENCRYPTED FILE----- - recipient: age1rjldv3fn3q686647exmcukthr32gmp6s3axs0lhyenvru9ajp9rs24ukvz enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQaDAzRndNR0ZQMDY3QkZN - SGp3akFDWHFZZXNmTTR1ckxQbFYvWGI1YUhRCmI0SGpld0ZuSHhzWHJ6T3BJOElD - bTJGbTI1WGQ1SHZvaFNFTlZNcmF1c1UKLS0tIHFEVEYvcmE5a05HT1ZmQSt4eW1F - QWU3RWFIUTFweHhpUW9xSGdmMzI0VnMKWmzlIoSO2sGisvtjsf/aauUJmpLxbnqU - oSb5eGoaOvP1Ji9u6BdDNujq7YrryilK/84VBStwuCZfBSgA0/uwbg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpdlRTMWhoSGdlRUlEMlk2 + WnFlaHR2YzhaZUJmTng2VWQ5RWQvQkNmV1hFCmNiSTk1blo4cGhQczNmNlBHcUp1 + WDRBYjhzSHZMbGx1Z1RGZlloaXBqRlkKLS0tIFBhNFNacmlhQWJPMGE4blJ5azV1 + K2FGdmhKaFpaam9ESHg1aW45RkJVWTAKkOeCA/INbE8laJwJTIuWDjLLVuMWEx9I + OcerXiZ6Id4+t4rSSG/algdX47yb/RmLM/BZMFvC0eJkBdlxRhc1Sg== -----END AGE ENCRYPTED FILE----- - recipient: age1p9v6xaujkdat2tsc2mc4gxpg9hjr4suvwryuat95z2c53xhsyfxq0gf594 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVZEZRV2FXaitBYkp5ZnZ0 - M0FNdmJYUkZCS3VrbUFod1JBY3dwYzFFZndFCm9IeFZwT0hGbDcxZGxkMml1RjZy - TzZWZzh3dVNKTjJMK1podERjRmt3WVUKLS0tIG5uNEtUaVRlMkIyU04rZGVZRkg0 - THJxajg5R1NJT2x6TzI3dVI5NXB4SFEKI+hmS3XB3W8pbb32t6E+0eI7WvMhMYRM - LwYMkUUemk+L/L3Lcrh7913ThD2fsAGlKtpd3tL22BU43Qx9BP5ynA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXd2taK2xSaThmTkhkdEVF + dyt2WWxGd2FvREFvSHBac3l1REdsRGVKRnpzCmx1SEFuWFlxdzBFZ1MrY2NXZUUw + WTUxSmQzK2R0dGt2VGdLYktvOXhvMmsKLS0tIENOWXBGblNYaVFxQ0xWUGl2VENn + QnA4NkRqUmtBbkJrZmJqWnpjU3lKNlkKVRcyP6QpV2RCsbZSlMx2V7DqB1NvC0UY + EGy1CCmAmtwyndMT+iPClMxoSgLr/GAjIMiMIkUWESO7gCW28oigbg== + -----END AGE ENCRYPTED FILE----- + - recipient: age1nxgmdahcjhmtrf7q66jep55cjdcw6tfpw722jr4gytaykgf89ugqxufgyd + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2REN5Ym1EQ1JiR2o4SmUv + UDUvZUVxdzRueFlHMWpnZk8wYUhWc2d2TmxnCk9JdVRsSkpLdHF2b2YvQ1FyK0xJ + MFVnRXZnWDVSNUE5bk9Kb1Q0eHFXSjgKLS0tIGc2Yng2VE1FcEdwa0lrVThpaXB5 + d2pqNnZEQ2k5SWZrVkxLNWhGVUEwQ0EKw4QKlCNB+QfAUINdyMZBbqsaLLm4HwR+ + rvojOXa1Tn7+3Rc/arpwz0n2xL3df1JftBBsUKfAWJLIrp4M1smH2A== -----END AGE ENCRYPTED FILE----- lastmodified: "2024-05-24T18:40:26Z" mac: ENC[AES256_GCM,data:llJ9lZSWogYuVeRJRNfeg3GchCPWvtTKaxNOHYScXBTjs7x37Wx2PCG+QC2hj8p5+BgtI6au+d7qMOSxhiCBVciVyIdeYeM/CVyb8nY08MQZuDBoS6R1MT6qISrtbOI+xA/HEZZtj7sDfyo/LwCi6sjEu132EmufD+iryIsLbx8=,iv:D7AStvmItKZdQWgKh5GcoJ4OAB/1VtZ571bGrkZffNs=,tag:lRtMvscOhtagthAX9S6PmQ==,type:str] pgp: - - created_at: "2025-12-04T04:58:08Z" + - created_at: "2025-12-15T12:49:10Z" enc: |- -----BEGIN PGP MESSAGE----- - hQIMA82M54yws73UARAAmqPBnK1eAkB4Nki74jkUtrRES37YOVPORbavTaqUqQbp - b5n6NgB2V9/2ENZA2K98UEoS1J3Fh/wnCEy0JWGCy0bQmL1GuOzRoPz03PApJLv3 - FpO6dgEzT1Sy1vd9L1RgihH3ijberOXw0rLqTids1TImGEsh7hsSXNRaRy9astWV - 2024iHyZ/luCJ+bnHDXEBM8udPG87Ft+gCCp2w5SJ/hMJPdOIGEysyvW4Io103Rc - FW5tJ/faaFpCQnVz6bm3WRpYqk3F8RhxWNzdzVTCaZ9oKjyWI1So/u5r+2lLvt4c - G0iVFHb1v87A6g5etEMTyKAr4pomnhgXZqfxkwknbhIVz22oUFBNc78xQj3qtYrP - VcGmuAZ/D90PxjaLcNKaUYiSr7G31y8gjeB1pfa49VgoSaGteZdfvcgCctb8epxi - s871ec7VAOCB2ts1oCMxAr1yJ6xEJFj8NoRT8vEs6WwDWHuxAOC6rTt3rX1sOysH - Zs98V+ZYNBMKthDjJqFmCtrsyYOV5FaqiZp9K+rxn2ENbDq5HFxBlqrVcXi4bzfZ - BeQVM7rGggAGPvMkynLH86yjJEOFfo4y/lGYTW56nVVNQJDRgxbC3JejFkFOaZ5K - gpCSdcfgUHoFi7Nh8avqx8A+P10XCe8vlG1MlBZa6ffkoZPsUIWbdV9lhRSmYHfS - UQGj5vVRho2EuHRAySgz6Y2C7ZfoKIljbD5l2IhlO8CDeuHzi73Ci/nJFltjdubi - B2Rbc6VrhRZC7bluCHnTHDr7b7ao3yoqtlzoH78nAiSjCQ== - =5EG4 + hQIMA82M54yws73UARAAkKSrE1VwZVcXpPsntFzQ6pCwv65JmF6/E/YPMxK1alA0 + Djprq+h4tLcRbqO7baQye8NbjYlBjThvk6vzt7HS/B+vaabyXxUENWxUDtprCkbN + dR9npdPWEeVCGBBB/zUlv939/2GXr3Y/r88dV8uHGXdQ1sLzjNe9C08TEY5oD7Tf + uJ74302fAh+GqVNj329uT081T6PliighOjxQUALaOzUOZV3vwluByOn/pDDcO8LV + E7tDhb/9F5N+TXVz2e+0foOk9eflOIJa+MYBAitZceRgFtx1lIOoOmNhvL5nWT9J + mT81bm6rcYs6yypf3qa54g5PjadhyQ7IBA52fUQ6VG5p/hhN/K/i6qIEgfL/9h/8 + EJE07r/if0EBPXQV1b4pk+m1oiOs/5obRHuQwBb18iMN/7tVzDLZFhoQXjI32t4y + LRH2DnMS6Z1Iez6oyA2Ov4NPHteKkDmPEbpZ20K9vRladquJAIkynQOASMBWjBxt + e7OUzX1W52p/K/VYYLtlMQWUHfn6y4XoSE5td9gkt2Bo0Gp0YF6UWwuiI9nOcEuC + 7IZfQ+3ioZHPOnTNd0N0dlTcxFdx15LSA7t9ZHXLZXANKEeBXIUDhOq8Vl9g8GyT + jL9dNMFoBBU+EL5s7SqWiJeN6AHL5z8q4JheBrShloA4cvrW4k4rYAmp2dgOKULS + UQHnFnDaYQjyVQaADDMX4rBh61UfljTsB5ShCS/OpR6POsEkht5gLqXjAUVQsciq + 6DCTmU/LyBxXGDMJ2phVp6jNXObvQjXw2hC4JRILG0O8ug== + =9XKt -----END PGP MESSAGE----- fp: CD8CE78CB0B3BDD4 unencrypted_suffix: _unencrypted diff --git a/nixos/servers/stream.nix b/nixos/servers/stream.nix index a9958547..df7eb257 100644 --- a/nixos/servers/stream.nix +++ b/nixos/servers/stream.nix @@ -31,8 +31,8 @@ _: { record off; hls on; hls_path ${streamyHome}/hls; - hls_fragment 3; - hls_playlist_length 60; + hls_fragment 1; + hls_playlist_length 20; dash on; dash_path ${streamyHome}/dash; diff --git a/nixos/servers/vaultwarden/secrets.yaml b/nixos/servers/vaultwarden/secrets.yaml index c04903ca..927911ae 100644 --- a/nixos/servers/vaultwarden/secrets.yaml +++ b/nixos/servers/vaultwarden/secrets.yaml @@ -5,123 +5,132 @@ sops: - recipient: age1n4kdchmkk3rfkaknxhveqr2ftprdpgwckutt23y6u8639lazzuks77tgav enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFbzBXN2NTZ0xsZUJjMGlk - VlNkQUhMZFVOMTBIQ3lFaW5BTU93b1EyOURVCjZIVXpCNC9DR3JnTDhwanlEL3ND - Y3lyOHJrNjdkZFF3QjBUZFB1RGx5NzgKLS0tIFN1Z1FiZStXcU5UejI0dFdkNFV5 - ZFZNYTloMzhXbEN0SndnU1JYYlpPNGMKie9LG3axFKi2j9GVxPcaPSMqpS0Yiy// - LdYpKIuHneZw6f7pAM16oa2yOLd1ssDBpCTg3lf7ff08qGYFmhccxw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5QnpMWWFzTktFN0dBYmFB + ZlU0Y2JTUVhjV3pUcHQ4ZDhaRWdLamYwTHc0Cnh0MHprRmh0QnBuSWE5R1ZaMzBZ + OUs3blNzL2ZTUWtEMG41WDRGWERuWDAKLS0tIDdLZXZlU2x6Q3g0SEhuNXlyWkxy + b2tSZDhuQWk4OVkxNnRmQVdzak9ZakEKmQWFBNo+xB7VKYEAbSo3CL4TUPDELaxE + 3nvME+7iLP48LRukHUuPsKW22NKnpk5bZro6iV3e0W95Xeo4OcmUGw== -----END AGE ENCRYPTED FILE----- - recipient: age1cnu37d5fqyahh9vvc4hj6z6k8ur9ksuefln7sr6g3emmn927eutqxdawuh enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuMmcxVVNxUERkQUtvbDd6 - R0lMR0RRZmJJSGp4MFY1SGtuTEFQT2tTN21jClBmSGYzTDJDWkJWNVpsdnZUZXhq - dENuZi9PNytZSUNtTXg3SEdLUEJkYTgKLS0tIHRzV1Q4U1MzalhnaE9zQ2Rka0ZO - K0VOT0lVMXVBd09SR2dldGdDc00yM3cKNxwiD5/u84h8MiN3tb+7IiUXGZkpCEfy - YFn0J2h7I+sr2SshD2MpA7rBHso5VagNv/nZplYDyg5ziFJorlPQYw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0MFlaYUR6MUlNcGFQcmsw + cGFOWGJTbG9GeU5OWUJTM1hld2xqVE5uU3hNClQwZmFndFp0UW94Z0o3bm1UdExD + SDNTT1RVZzc0RWx6MndWT25sU0NTQzgKLS0tIHJtSXF0c095ZWM3bGk5c2lXdFQ2 + OW5ZdmZ4V3hHSHdpWkxEZE9mQ29RV0EKoMdcOFByTUSz9Gs8W7moADHV3lHmPrpe + zo6zstXoC1rrdeRZJdUI2HJxbk1txRPGtKO0gdWYJPyfD6kUkrO4FA== -----END AGE ENCRYPTED FILE----- - recipient: age1a0m73qr8hhuz8xemv4vymf4wmpghm2hst8wgrn3pn65ext5mf4ksk0vsdm enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB1TjMveEprd1drOTlON2Jr - Um54a01QTXNzbkNuWlRsbGNWZ2xVS3hlN244Clg1bFBzcGt0bUl5QnA0bTVPRWtQ - VGN4bXppTUdxeU42c1FxdTcyVEJCdUUKLS0tIEo2dWJncWNYUlVOSmN5T2tORkJn - VEs2ZStkOUZXb3ZobzQxOVRKazExTWMKCkN0EtXysVpEYYt6cj/M7INMCVw8dmaX - HqdIe7cawYXkQay2YDohIN+w5eNsiGmcZ8HYsOvX2HPRJhYG226Ynw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxMWN6Nm5ldXJrUXhyeDla + eGUyMEw0bEYxS0VJWmdlcisvVWxHaHZxZUZVClI2Ly9qTUw2WnIzZmpUdHBLUGNy + U1pRZVpoeE5LUk15ZzZ0aWFxZFdRR2MKLS0tIGxpcVc5UmxjbUtXR3lrejZBRVFQ + ZU5NMStGcUk0dUh1WjIraEZFbVBkVmMK97V6/2U7h60gDMc2X7Avh0Sq/eXFnTEw + 2dmh/bCM49ULquVUAW8NXvSgIVWi7md1xgJ+bnBCRhEwEh1u89IY+A== -----END AGE ENCRYPTED FILE----- - recipient: age18hpxz0ghvswv9k30cle73prvnzrsuczqh87jjdk9fl50j3ddndmq9xae0n enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUOWY2NXNyd01Md2xuU3JE - R3VmbzlvRElnaXJSbVBWSGZ2MGQwWEIzQzBZCmV3c25IbVo0Y29SbWErQjh0V1Rv - NE4xVEhTaC9TMGVSUE0zbDkxMnZPbEUKLS0tIElKeWhwcHBCZHFETHpsUTFwOEY1 - ZlZXZUtwcEJ1NkVqOHZKUXUxQnJNZjQKxNIxZ5/hWLtUMPDiktOnHjX2N4Ynhi7n - ycoAzDIojqjjuvdvgj2rvrliZKmLCVv4v+IvXhYP9c+A4cv2gCYPHQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpT2Npc2M0QSsrcUpUSFRU + cU44dVlrQ0svTCtVanRHU2xxZzhlVkZyVG1JCnNZcDJCZitFbk96VytKMHZTRFNl + YzViM3BBQTJlWmxoWkRBYnZ6VzdxQmMKLS0tIHNjVTRlOE1LZnFVUGZBZithdGVj + Yi9lUS83V2ZOTWtLZVh5YUc4ZC9nRE0KB4aT+JgxFdB0LoAizv3VijbcEIAhtjqV + Z96O3l7dkAH37cMJXgpTsCcEjkq2IJEpwzRyhb3l34hPmPjxAHh81Q== -----END AGE ENCRYPTED FILE----- - recipient: age1xgy03g3vjydsxcl0qpdgm8rahjcjq95ucxfwlgr22zwjx3p7jf2s9jk6u5 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDMUwvYUpvaS9HOUtmS2dG - NEtzRFQySXpzSlNEWnZoOHpFQWZDNUF5dUQwClBHOUV4ZHM2Nkp1OHA3WmxIOWFB - S2Zjdm4vZ1ZobCtTQ0J2OXBZckRpVkkKLS0tIEs3Rmt4ZTRhRVJYVnNXczJBbU54 - Z3lOZ25IYm5iYUNGZXRoQVFzNEV6K0kKvoEc2iot6prEAtu9Xy5lOGUuSmUkYUJg - sen3e+NKejQGckExGelbKJ/UEOoAeUV+qivbYgnLqG4PM6e6Kr5KKw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxVEpWNmF2MnlLVzFPcDEz + QjE4TktjY3FNTlFhYTJqMHFTZU1oZDBGajFrCmVjaCs3S1Q4NTBaSFdHNTdqYXgr + STI2SnpWQzVZL1lmTHpIdldMZDJ1VE0KLS0tIDBVdFZMRFBXcitoSTB0MkJKQm5D + Rld5dTZEVC9CUmkxVkZTaWJBUUZGK1UK3ZGmkZnfgjcxvC42G/DbXpssHjc9Zrgl + GwGiK3wlgRohukVQhyRAPfgMHBNdJLztKF7kxPxUhcDjO6vLfYPBow== -----END AGE ENCRYPTED FILE----- - recipient: age1fv5dafs4n3r5n83qm2hfz7xmnflsz0xf9r3saralrptpgf8mvuxq4t8k3u enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5a1gzcWxCZmlKT3lqZVFk - czFlcUtUUTlJbXI2SkJCMEpBWXBtd2prRlFJCnpGUDVxSE9uUW9uclN0VDZLSkU2 - RTFabmIzU1RRb0tBZUs2c2FrK2RyeEUKLS0tIC94VVFEMVhwQ0xzbjRjUytLQmlw - a3JMT3VualVSb3lLbmtac2ZVeHVOakkK2qet/fgHpBkagbC+16sSjeDsYK53Pj9M - Ss+wK+x20sCSQ7W7pn2+ueX81CVanxbWGCvqpMOJBn+saBfPxp6uoQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3bXRmUWo5TXp4SWxDajlF + NHpPS1NMaUNZdXc0WHZUbEVVaDZYb1VTbjNNCmdKQy9QNmpzM1hNeXJkd21kUDZH + WGFUU0tJeTF1K2p3RFo5aUJPRDExZGsKLS0tIFdwMXhmN2ZVazh6TEVOUEhza2hQ + dTlIejJ0OFR6ck5oOWdNcWhVeVg4QlkKcPqwaDkFFrbhty12WZIfE/6xZvcMmnzd + dWDo7hl/1KPyeL9s6p2CFiMDoirO8wT7E20b/7YZJ93pF0bSSixjDw== -----END AGE ENCRYPTED FILE----- - recipient: age120530yclr75k6nrzp6k5jjftj8j4q9v3533guupzk4ct86mjxszqg9e5t5 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKR1BvUFJLV3NDQ0piajI1 - MWVESzNSb1dqeElsUE9RM1dMRXdFMU1SRm5zCmxFeDlUQnorZ2VQTHd0LytqRm5K - cFphWnhkNzJUczNYSmg4a0ZyN1A4QncKLS0tIEJaclRrTmczaXdmNXYreVQ5ci80 - TlFRSmNvNWcwdWpOa251bGFoQ3BIbG8Kv/kND3fCXJGaaejp8SLuvdAZEKuJe1PR - m9TVYIosOBj1c9cKlDch5h0w8y8vK/pea70HeLeLtRmDSkizDEYQBg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjMXkrblZkQXRCbGhoMjRo + eEtKZ2ZqNGdDRGtXWDZZdkxrUWZnZnhudlNrCk0yTVZCZkcrY0hzVEg1a20vcDlQ + M1BaVVBhZVVlS1B5UUgvRE85WTdMb3MKLS0tIHRHTE5PUmZyK2RQNjh3a3BQVDYz + eFdETGRFVjJsc0FoclhueXlsN1o5bHcK0PgSWmxfT7Lmf6dKOzbxeQqR8X4WP801 + 8LqEenfinZszqH7IQSCZJwegO27bERtNbxTp5Hwh7cuky0gGCm2bNg== -----END AGE ENCRYPTED FILE----- - recipient: age1rt0ngkum32wt6l2wnyr40hmwd9ulmzqfarg5vk62zqp0uvj4lyuqd2atgq enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzTjhCaVh0YUNWWEg4eXhC - dE15MDVmWkx3dlI3UlRsaDJDOURLajQrTXo4ClIrSlBrWnRxY21GSVJOdGV2Mzk2 - ZHpZclNYbDV2M25FcW9wWkZPSVFjVmcKLS0tIGtyaDljbWhJZmM0SWxlZVJYYVdK - dVBxTVE3eklobk02TFp2YjhDdExJcjAKtNlFNurCOWH6i/ldo4PUxAcrnWRSGhOa - 03cQ+tFSSyjS2T9RGJUjThQDyjEk1rK39rMryVeLCBDpK/nJFt0PFg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSByZDR3STZrZkFzVXhpbzFa + cmo2RFZoR0xCUTF2cnRlSWdoS1hSK0E2cEc0CjV6UTUva0xTTTFXT05pV2xETFB4 + ckJTM2Y2NjByaWRVR2lOK2NQZ3ZJR1kKLS0tIEpQSjRGOXhCUCsyM21qZUt3djhv + MklCYVU5VHpnWlllUWhlWmROOXZ5RG8KhwXnq9DzLyRh6HIk9VSuuwoL3Hd/hQ5h + HnLbENunI62743DbjG7HNbkJAQU4ohuj3a1/VMcp0dOuQKuBHMdNuw== -----END AGE ENCRYPTED FILE----- - recipient: age1c4atxfp05u7zm875s6q8p82ve96rqqpq9smktxlur8pk2yc3qvgql46dp9 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPa1U3UFk3RW4vb3pHSVI0 - U3VDRGs3TVRzWWJzUkpSa3QyQ0d2YWVSMUZzCnZlUCtQTlo4UXZCYWFkSFhwdk0w - OGpjWUJtL2NhSlJGZDUxNWw4a2ZzTDAKLS0tIFBxR1ArdzVHQWNydjhkdmxPWHdF - R3RNV1NUNitXQlNQTXA2cmpWTTZ5STQKSupF4NXN5EAoN44X/037lUjYZVow8bQU - MC2cmM3kxPjOS9buhloV/rNbWq1UarEfGHqScV5tbc8/DvmfdszmzA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0S3pndFQvbER4R2Q3ZnMz + VlZ4bkhoVzFCY3RvMXdkQzlxZXZQbUFKV3lzCmpGRENLOXFsanF2b2xzS1FnejYr + RXhzMmxXaWJNa0Nhb0c0enpjZGIyczAKLS0tIFlITkZPODlYanJIMWw0NmdUbU1R + WnFVeHoveEc3dmtlWTZ4QU5oS0FYUlEK+zMC3CV4Fb2uXVhgD+7EN396Wqq33zlR + +P9hqFEjLeKEUc/2x/2xqPn/Tpfnd07tXci5h5D1KRSRR8T4412sTg== -----END AGE ENCRYPTED FILE----- - recipient: age1rjldv3fn3q686647exmcukthr32gmp6s3axs0lhyenvru9ajp9rs24ukvz enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyNS9VMkVJQmt4cUovb051 - TmlpcWo4dlRGdHkyT3UvUFRPandRempURkI0CituLzhxK2dMOTRsOEh2b3NiV3V1 - ZzhwbkNWRCt5L1RuVFFxbVkxV0dWdEkKLS0tIFErV2xoeDRNZzZyMlpJWDMrbUlr - K2NxSTZTMkZabWFEZWgzVGFSMzlkaHMKPWyy6Ymm0/Bs3BrRggzgdUTU2a/xLqE/ - v9CpxgjtxY+mZa/UgnpwyYTcOsDl9l5WwZ+t7gZPSJw5G7Vhj9mObg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGWXJGd3lrNHJ2TlF5cjEw + TjJqR1l3M2hHZk8rbFkxanNOMllESXZtZ2xFCnFjZ0FLMm1ITHN3RHUrZ3ZscmZ6 + MlVaOEtqcmsvVGFxdVQxWW5zejkxZDQKLS0tIENuYXE2RHlmNUh1b2ZNdWpuOTZp + UzA1MllHMHpucTM5TVNxQm9lN2djejQKUDSwRFLRuRqmpwysWFy6XVFhwe+5Y+Mk + n/FJqMgPGFxlrAFxzQK8cX6X/m8Kw7u+nJnv5Zs9ClTfzJIs3V471w== -----END AGE ENCRYPTED FILE----- - recipient: age1p9v6xaujkdat2tsc2mc4gxpg9hjr4suvwryuat95z2c53xhsyfxq0gf594 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKTjMwWEdrYjljcGh3ZkRC - N2lMODlJRzAxZ2JxekhYVldpVVNYa2pBaFZNCkY3WHFCbS9ETVhsaTh3R2M2WjB6 - UEJEWEdOTW85NmFZZ1BtbmlvY3ZaNWMKLS0tIGtQaUo0YXVtY3hSSDZscnNNS0ty - dGFPVFFVVTRtU25tOVJoSm1Ob3NHNkUKHPRDN8fhX75mEjqdn0Seqbhd473r030X - SMvd/jPH0pzaav0WgLXf5SQaQWqXD3eIWJd5tov0KLBVOvk1CxlXqw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqR1pmY213RXRISmV5cFUx + alNMNnhZOG13Z2E2U3BhRmpGUER6WExCcUJvCkRWeWRUZitKMXdwUXNhNTdwbklR + VWlkMm5MdGZwdnRvVHFROTI3UkZhUWsKLS0tIGNCZUtzSDVFRkprYXMwZGpUT3FJ + T1pEdlBGQkpCZlQ2R3hCWW5YMUJrUFkK/0diBw5szbrAMm1JL12vVOPfeLVsRjr0 + mlPKqZe7FXNl9TlpEcH8HiEB6ZUaikA/bU3PeDmzYvpHizXncqJeqw== + -----END AGE ENCRYPTED FILE----- + - recipient: age1nxgmdahcjhmtrf7q66jep55cjdcw6tfpw722jr4gytaykgf89ugqxufgyd + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMTjBGU1lIcXp1dXFxSlJ1 + Si9KaTA5R2dQUEp0cXlMNS9QeU55TUo4S1E0CjJKVUU2WjVNUzdRQ2o1K2VGckF6 + Vnp0RGtPaTdCSFVFMmpVMXl0NHJBVm8KLS0tIDBJY2FNTmExZEZoQzg4bHdhaC9M + c0hIVHJLV1JMQ2laMjR4bU1FWnpqcDAKGDHThj93SUovbpGS4ff770crTfy4M8hL + PpmhF6HGaShl7XHuO7xXhA0V+BW2DXxmLCBI//xsPwjQFfg9Jas8kA== -----END AGE ENCRYPTED FILE----- lastmodified: "2023-04-27T00:57:18Z" mac: ENC[AES256_GCM,data:8QwxkjAuISrTs8Ls0fFtQ52AhzDRJIw130Dox2c5zrdqnr3rTjZDvz+zmOjFt+gg0iC6gDrvEkYh+4+9+g3o3D3A8wdQHCpi4ia7pSiZ4palxKwHkq8XY9sgDOamYb1534QlLZk5OmpxFPLATyNfDt1+UoM2++ATkZ3t1MjL1PM=,iv:9C59fPOga2/aih1Wty1HFdZJk5T3xyIWRVuogZ6k4dM=,tag:Eh7uYYty+mkC828aJKd9iA==,type:str] pgp: - - created_at: "2025-12-04T04:58:10Z" + - created_at: "2025-12-15T12:49:11Z" enc: |- -----BEGIN PGP MESSAGE----- - hQIMA82M54yws73UARAAnTsH8d2fVMYqLM82tIKu/ji8Nra0ELm+UnT0MUhr2aRg - sDYluiDodkblLDLzHaLdlYiV8DTvxllqFJDw6cGFEFDpeF9rGx38aSPmV2cA28h+ - XPLV6CZa8ItbvqhVXEJ6WWt8ulCiFzQzK0fHkJtWWmVbc7Z/K0V8ipgCWvQDTKbk - 2Da2G317ij3jjpqRHjrrxE1q1GalXWYnmVWvmEZXymkB0PGNK76uv6CzHyr6u9e0 - EH7NOTJqpfIrcq7AcOzPLKBWp10xiLMLqKWqd/rPkFThBzK0N13DLTubMKDuOOqk - jiKUngkvH7O4RRlwmzQIOc2jQc7gXmL/5llDlhDK4NAujp+d1D0v5Nt30av8HE3q - dT1cWJHmiBHapLBqCeVe5X1itnAj4H/IHz5Vw+iSiEYWmSChi5gW1e1BWJYbGsrF - NsPds7d2lmMrQqjREjSwXwXBhpbfe6JRlHaoL9d32RR/zepb48/cfOgnuqmeWmqO - J2fdoXQXdXqozU5p2a484a7mQPPdefljuH/IeXvzDsLSZ/TQcs4/7XpSgtxWvNxN - +DMvAcUXC4kcaGX2YjCw91N/cbgM6MdqWu7JPjfcvO7AkrQUwHfRrrJpCaoJhX7u - /0yfIAVuglTWeUPU3ZB219SRNstjfS2mkqzD8+6H201OOj2OmDNb8D5pr/ceeH7S - UQFyUlK3FvNdOETZFcEHNQ5xXaVPKyjyqPLtMQSUuG+1WgdG/sWYPwkcIyQTH++0 - XFmXMSeqaM/BcfB8x27eZBkNN27SqbtWKplCw+KyZnt73g== - =zDcS + hQIMA82M54yws73UARAAsnMPoyaH/5QBIH3Hm993yuXSQ6TFfG27bqgk+s7zGABY + nVvtJs2bQNQfiAcJgdKL+fNkM6Bg/kFtDbID55eqZjNiKFDwlrngQQF+6WsvHJ5P + mTTy0RTsWqAFuhTy3RPJCVRzH+/EEyaU01asxsbBTuUoJ45r+kShFW3rBnc5qyf4 + 8pKNTvmuh5dC38rMYxp7b5xIrLc+9gzGs9dYcXYsxNstRxrHXXmNb8ldcfd0hHrI + SAHdfnN6Eg7gFaY3s+LFIrZHbtlhlMOuDUkvGtBxRIhwlAZkiX+3HoAGsLOavZb5 + DWQuAZs7qVG/kBPBQ/0hwfjVqJUOEhjaTybUJ5PT+2YqI9+sEThJFy0ixX30yFYO + 4j8dKoW6P3h5qAyqBVMT992SeS3x1EyGMIhugCpjWOMenKXoRS/+Ij4YoLQJfesQ + sT3rJ5a0kJTBdM7M59WfR7I7ggHLoBOmAL+nHi3Fsu++buIiiCo28+Y+KoV8cUzi + 2jEoYCPRskde5ZV7qB8Ub5a8h3mQRre8P/jUPO+5Ww56+12UNZWwYgcedmQ03+Jl + BOdBVEgltpjSMd8hE2zq5Uk/BWm4MnZKtg7Iaobv1zpGSJEoyLhsY0wI0dir/7RX + HgFYS4vhRey2RGE8ZCmNKyP8/VCzMBWbEGOa3Rtb/qloeqIgmH2H7NEgtoBRT73S + UQGzRgpyTdv+BBsgLVgqkHQ6Q4UkBG+S/lyNDbzfVUlf24mX6ov98Tp1hP5V8+nk + Hwqx4SvhifOrwHcMI9C5GsQG8k8d+L14DREQggkx1dZVZQ== + =oBkf -----END PGP MESSAGE----- fp: CD8CE78CB0B3BDD4 unencrypted_suffix: _unencrypted diff --git a/nixos/servers/web/secrets.yaml b/nixos/servers/web/secrets.yaml index 661d9445..3a1d52dd 100644 --- a/nixos/servers/web/secrets.yaml +++ b/nixos/servers/web/secrets.yaml @@ -5,123 +5,132 @@ sops: - recipient: age1n4kdchmkk3rfkaknxhveqr2ftprdpgwckutt23y6u8639lazzuks77tgav enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoSWFKeFJ6cDd1UE1sT29G - ZHd6VEpEU24wV0o2L3ZRRTRMVVFRT3c4OWd3Cjd3Unh2WlhHK1FLczE5ZjVSVTFD - VHNJeWt2MmdReGI0M29LV0ZSeEtiUlkKLS0tIGt5clprb0VXdnJCcDZFa1c1a2E2 - clB2YjJTR3YxMWJOUVM0OEpyZkJDVG8K2W49cLfKB8+qDfZfGAPPMqXE7ID0Gcpa - oRPug5CCfdnptackqeLOzs7TeT69Kz4CDuPvO7n7PRzBqcFcZ77E+g== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvU2RCbVdjTUcrcEJvZFIv + K2IxNk5Vc3k1ekgwaURkSDl6cVNzVGs5cEhJCmdsUDBES0RtR0FINVY5d2QzZEw4 + VnE2aWUreE84RW1GRkt4UGZxWVNzMVUKLS0tIHFMRDRncXdJbUptWk51RXNxT2tx + RE94ME91cEFFZzdMZmlaeUs0QzN3NGsKJkm5oFWXYfOAdb1Z5KW6dKPIvaS5ZNfa + pSMAx8uWxtba4ZkkYIX75/2zJm0oZqfYgF36Xs//R7+dCdue/2RK4w== -----END AGE ENCRYPTED FILE----- - recipient: age1cnu37d5fqyahh9vvc4hj6z6k8ur9ksuefln7sr6g3emmn927eutqxdawuh enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0TFdUOU93MmNBdnhES0Vr - TjBGQTZlc2tTNzBUQzNLek80c3k3RmhuZURFCnVWeWl1RGdHbGZuell2NjU1T2tF - THoybnhKRVRiWTk5QitXYzFUZFZrVTgKLS0tIHQ1WUErRkVMd0xTdUI4RFVkZU9X - NnI4aERkMXRHcE9LQ3FHNFJXT1UxaTAKDY6+tybzzsNydpD2t7S5QzWd2Xzj4Mox - TU7yr2Xk9mFMQISescYLgyaYE/fIzyGl8SNNLA6OFLYoe90o5EbskQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPcjZrL3VCV1QrM2RsQ1Fr + WTZvZFBFVS9yWEd1eS9SWFcwTGw1WlhiU2tzClRFN0NaeUZ1OFJJUnpqN2M2QnI4 + UUZxWENmS1lyTkJveVl6SVA3cEdYZFkKLS0tIDI5REZwaURGc25FUTBLMnFaT294 + NUNGSUJZRVduTDVmUXRER0RLMHNZdE0KKZYLVDD30BrTeMCGEdkxwkMqtwWxE3fx + EXO7PF4SxoSHJBs6hXz1gNdv8heBpg5pBGlHMbwaeGoTl1KgMLJBVg== -----END AGE ENCRYPTED FILE----- - recipient: age1a0m73qr8hhuz8xemv4vymf4wmpghm2hst8wgrn3pn65ext5mf4ksk0vsdm enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGeU8vbmQ5RDNWS05pdnBx - YUllYUdvcDlGR283ZUpLam1rSHhObjRoV1JrCnpzQzJBbGpUSEpid1djcUVPeGw2 - bE0wYkYvNEUyN3hSZjJUSWJ4VDRoa2MKLS0tIGdUMmdIbFFwY011WndkTUxlLzQ2 - RDYyQVZEK0xEajVPWENhVVRPUWI2TWcKoAvc3sBjReRTbhNrFZ215d9S5d7E64gU - +D0Olk9VnC8YmaHyteMkYej8T3zMx3g4GFewWf91ZqDOmYhtkJ6c4Q== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4ZjVGemVxbGpqRFF3SzVT + OVltYk92M0tCcng5M2h1bU16S2V2WUFXQVZzCmw4M243UG1YUmdTVzNWQTdCN3c1 + d3Ribjd2aXcxbzRzKzR0eHl4endDOUUKLS0tIE41RVhvc2tsczlYcC9YUGI0YWVk + cDR1T1A0TUpJQldMd1ZRWGNHYWtuME0K7vdqA3ackFgFG/XFBwkNtf1tRIfU3p6C + skNiyTl4nwYE/eWCkCBqE4JMbvzICj/K+YXbTHjC3vAKZBbPnknYlQ== -----END AGE ENCRYPTED FILE----- - recipient: age18hpxz0ghvswv9k30cle73prvnzrsuczqh87jjdk9fl50j3ddndmq9xae0n enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYT1hlR2tNcUlKT254WXpz - alNYZndNTmhyQVpybE9pZm9wSHd0c2dHbHkwCmxYNWJURDJaOGw4UGZZNkFIaXRo - TjF5Ny8xaUw4K0ZjeXNpVmliNVRzazAKLS0tIGdjMTg5S2llNXY1ekxGK1VVTFc0 - RHJTTkdSc3VIZ3JlZFR1R21MUFYvb0kK8q6RjpDw160bLxrxu/9Zu6n7Sjnu1GjQ - 5ME7JQbgusbu2YBh1nOOWXGa6AWYP0iBxkUr4khx6OYsjja1zBKhGQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrUDV6NlB2RkgzbFBiWHFX + aUMwSGtCUEpUZHgwM2Q4K2hZWHRIWkJuU2o4CnlFalRabDRxTm9PWlljRC9vZzF6 + Z0J4NTRzV21LYWw1cXM0OFJ5ZWlrNjQKLS0tIG4rc1pSMWp2Sm5Rd3FGY2haS0tp + OHNrSlV6L2RHZjNiQi94S1dFVXJZWDgKd3L91Fa8vJ5uI4e1iqWhEuSmKfWysjDD + hKJFWkHP/FxkD4FalVTx/MFVdb6rWvcx3akaqvgGsrOiYTYAxcTSGw== -----END AGE ENCRYPTED FILE----- - recipient: age1xgy03g3vjydsxcl0qpdgm8rahjcjq95ucxfwlgr22zwjx3p7jf2s9jk6u5 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEOHZpb3FVUVluaHdJS1Rp - VUlnaDFSd28yWDJMaFFEWk9QRWJDYk1RV1hVCmo5Zm1KUXh2UGtDdEw0VnZzVVRr - UGpVeTVkd1VjUExnNWVnNkx2ejVJa00KLS0tIE5OUzBnc09Gd0hTTzR6Qi92c1lz - cTNiOWRMSFNHVDgzOTFkMGxqekFxbm8KT/vCX0vRkHYScJJjCdLTIi2kV9gtWCje - 709JPILgyzUA8+Ou00tw3lXSCYUPLS0VAFMHlDaRrImlOXDHhRDp6Q== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyUDAvSVozdEpKajZaWC9Q + aGVlaU54dmNZalJyYWlVaDdnM0ROMlR3MWxzCnZ5RUt6RDV5NU9JbkVhWmVKdVNo + cnVFcGhsZGxVc3doS25LTk5zNXgySUkKLS0tIFdPMlBIMHgrVTN6WDZERHZ2Q2t3 + NWRqRkJaMHRQdzF0a1BMT3JrN0oyQkUKYCY5wJAKKBi1LJ42VYoqevyGvKo9qK1C + sox3u2cikylJ1AM4kpGvJjQG8iK30J/WonfshzNFWm7QnOHbLuY3dg== -----END AGE ENCRYPTED FILE----- - recipient: age1fv5dafs4n3r5n83qm2hfz7xmnflsz0xf9r3saralrptpgf8mvuxq4t8k3u enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvT3ZIQ0JMUzFvY0RWczFB - a2JPY2hTTEhBTUtKQTJ2Tk1xTVFKVUtNN0JBCkE4MlZ4MXJDSkhHc2RMRWR2UGtY - cE8rNm5RYzN5OEJ5ZldQOFlvbHdmaVkKLS0tIGZZZUowRVllRyt5NGlXSERnU1lj - azNjeFFOaFBxTUw2RnlvREpqMGtFQ2MK67/r7xthQWc+DCbJBCERr4g7uHqkJ/hZ - r6/0kK2HDYqUPMMbl8m9MyNWFXXuRXSPEDK0fESAtzgO1dKf1qAhVQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuRS9PdTIxanhlNk1DZm9H + eVc3YWpiVGRjSStrMEVzVndyaE9VVFJGMXh3CnRnVGNFUEtJRDZzUjhwbkhMSEFU + UGdVeDExelZJWTFxUHRqcnAzTEpZWTQKLS0tIFJsY0w0dW8zMldIUXdDUkt5Nk9G + RkVzQk5sNjJLekFZSkZjNXZYczlFc0EKO4Ww3Evw16Jk0r15FR9jy/5R6xSFe/Qr + qXOO1qGQ/K5jY9BDophgcBTU55Bo9421WPMVTlJV0W2TMwnz3NMGPA== -----END AGE ENCRYPTED FILE----- - recipient: age120530yclr75k6nrzp6k5jjftj8j4q9v3533guupzk4ct86mjxszqg9e5t5 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSByNFZvV2k1d054TTdNUkpB - ZzI2bHh1TXBqRkZYZk9rNHJsczc1eXZJSWhJCmJuVkg5UTQ5RGtYUEJtWWNRK1R6 - L2drcE9rcHltNkM5T1RtMnRXTkdHWlEKLS0tIEtPaGNTQWFzRUxRWGQ2KzZ1U3E4 - SlNNMVVZTjBWSXdpRzVONEIyZDFKQ28KNmyR9uTJfLOZ0nX1NJEOQz1kOSbBTpyX - zQIlrGB+yw9119tZmETRWvQ0x4bUA21lzg3RoGJojCdj7YBqxjDqDw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqZmc5WUNUODR1RnZzakwz + L08xTmo4TWhpSWh5STVOVy9mOHp3K25WQW1jCi9hMm53L1FOMkc2c2VTOVdDeXhr + RkFyNG02SnhlUG1iQks5N3hMZ3hiOWcKLS0tIDRKUG9KY1ZZVHErUWo4d0VRYVkz + RE9JZWtlZnBLMDZneVJPNVkrQ0o5QkkKKnkZ2wBEPhm4VzcGnTxW0r764/lNrWof + a2jik5yZ+/wcaJGrPYXjd+dUW2NuNqM7OqTxqdvwjYs01fa6Y0+ZSg== -----END AGE ENCRYPTED FILE----- - recipient: age1rt0ngkum32wt6l2wnyr40hmwd9ulmzqfarg5vk62zqp0uvj4lyuqd2atgq enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyc2pzQWdJVVVoWVRTZGV2 - SEZRLzMwY1dBRDlYYnA4TFlJemRRYXA3QVM0ClZuTGMwN1R5Ni80RkhCbEpGZWN0 - VHhXc0ZpVmlNOEVzYm4yb2pBelZyMG8KLS0tIFJHZGFuYVhORTFoZS9qUUkzVFNz - blVnUmR4TW9ZYnl4d2s4OHJoL2d4WjAKx4e9vhXWhHuU5fqFJ2H3BXt5U5Lj00Og - kvtnFejMPLDgxll2SkFWlMqZeUlry0JdUK1raWaMdkgZhqwpLrAlZA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBabmd1N0YzcVNkeWhMLzVO + RFhma25mV1FnSWEyczBoak8wdmxyN2tCdVZzCko0R3E5MjBjYnAxMWg3eTJyNkth + M0lXY0t1bC9ESUU3dVZ5d1ExWkhhUDgKLS0tIDN6OEh3SFlRU3p1c3BRNDAxOG5N + MFVVRy9FeklrLzhtQTIrV1c2NDZ3bW8KhH/oIoDTc+Hi9Tzz9vkaI5AjBTdeaCH5 + 5FXlv14b3K8G6EEW1BV9Gs1oY+IQimmWC6L9TUMLA4qU7B8HLeq6EA== -----END AGE ENCRYPTED FILE----- - recipient: age1c4atxfp05u7zm875s6q8p82ve96rqqpq9smktxlur8pk2yc3qvgql46dp9 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVY1EwRG43V0hwbSs3UTJj - NXBhMFpFNmsxOWpUWXRENThLcEtkeVcvbHlFCjEveTdCcERYNjBNTklPZFhQcnB0 - TWJwMEJ6V3dZZlRPeWw1VVZkcTg2Q0EKLS0tIEdOazEwa3R5UnJZVFN0YzRqYnFs - SDZmNi9HNzRsZjhBczhZUnkrSTViTlkKaDiGwivzDkquptztoeD15PEueibm/0BB - 0YSW0cXf0rKijbD+LmbuB+P2Luzg+qDOuchx1kdtQz2pBAVJYYLMnQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4ejE3R3ErK2VHQjdDNkRS + bFdPR2RrTDdES3pzWjFielQwZWNaalNyWFE0CkNBZTdZK1VSN2I2ZGVUa2hSYksz + RjBXWnZhQ1g2aHZOSy9xbkVPek9kakUKLS0tIEM3ZDFNQlJ0SkdFNnNDWVdKcVNM + bzFsM3FPMjMwT0oxZlFsRVRDSE1UaWMKY3dFRAJfZBLKaT7LD04dkSJoBlIRv8SD + eTBfvJwLGdKCS1V5o6FBIQFOSms7vJIU4NXDixBM0oG4r/NTv5/mvA== -----END AGE ENCRYPTED FILE----- - recipient: age1rjldv3fn3q686647exmcukthr32gmp6s3axs0lhyenvru9ajp9rs24ukvz enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBndkVqWG5FSmF2Y0FCQ1lm - azFRY2MyanlkclJacCtHd3VwcnVvckhCZ2hrCnpvdHFvckVYenpRcDBtNjViQjhi - eTZHdm5JVzVtZ0N0cFhjL0lxZHcwK0UKLS0tIHE5Lzc4a0F0RDFOQTgvdDhJbzg3 - bmxpY09wTnNWbTFOWXNtV2dTZXFjY1kKpbXTR7wVYIs+iToMayv/RrUUeJQM1o0X - +FmTVfC9VJSG6OZEbtcnWDdc7FGMD0xCEsrjbXX0AgcPSgg+HOqYUw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqM2dwd3BrWUJIWXljc3pN + bG9EZDJNeWZUUmc4c1A0MlpZNlU0TDZxQkV3CjdxVFNpU1JYd2k4ME43dUNJdW1W + K0pzdU5PaEl6b2MrODA4enhlcCs0TEUKLS0tICsrOHlLeEQ1ZWFrdEFNRDlMekFO + STkyUnl1aXM0Sld0Z25QTHhYTVNmSjAKgOakvFNXvCtKUO7ZsTkuCUpQbGx7I4Ou + bvax8qh3KSWJxqFfeZTIiDU6NJnJZIE/dgX7A8xbrDoa091UWD5I4Q== -----END AGE ENCRYPTED FILE----- - recipient: age1p9v6xaujkdat2tsc2mc4gxpg9hjr4suvwryuat95z2c53xhsyfxq0gf594 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBickZIMWhWK3g4S2lkSUcy - dGg3bWFkMjNlWlpsaEdmdG5BRUZQYzJYaFQ0CmQ2T3pFcWlFeWQzaU8xMzdxKzBv - OHBFRXFmVUtiZFZjaXNCZzdEMG5oYTQKLS0tIFhNTHk3ODN0MUIvWXViL1JCSjhG - M0Y5OGtrcEJMUVcrRUdlUnNOUGNYOGsKTk5EolDKBHZPw9FSPdw1I9gs0HMylPnh - bQ2vhwy96O487LbQ+qo29mmd5Ov+zlIvViRLjKl++171xKgj7CQQdA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHaUFqd2pnRG1BK1ZaTzdR + U1pQZzg1NkVDTU1KN0swQVBOM1lyNEFERVVFCjZubTMzdUpQcThxaWw3SHprRjNU + K0s1YzZkb0ZOL09sSzlwRGUybzdhUUUKLS0tIHExcjg3Wm5aMkRiUlhwY3E5RGpZ + S0FSL2drV2UrOUtTRWpGazArK0RUc00K/PrI+npK9ZkFHVJpJ7ZAaqDXF9jPl7CQ + BC6SQM3SjazdkQd8H/mismB6PPKGWk3AJCWOs49QHy5FqhMxXTFh4Q== + -----END AGE ENCRYPTED FILE----- + - recipient: age1nxgmdahcjhmtrf7q66jep55cjdcw6tfpw722jr4gytaykgf89ugqxufgyd + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLSDRWdldFbXE4R1VlZDlV + Q0JTQ0Rnd3F0UlNGWXRGQ3VJRktvSGRUVEFnCjNwUFlIVUVTUGtCbTFnWHc5aUo5 + SE5GcWJWZFJCU3Q4MkpxZDF3ZFRkSEEKLS0tIHJlaUV4VThCNDhqZzFlNFJWcy9s + YjZ0dm9OLzNFamwxNEwxOUgyOHVmeG8Kop7G+fur1p1B5AZhth5f/iOYDpXxjtaE + DwC0fGLMWjmigYMVxh/daOpnYJzskZUY9MWyHs1liN1nvWIJAXDNRw== -----END AGE ENCRYPTED FILE----- lastmodified: "2025-12-07T17:36:09Z" mac: ENC[AES256_GCM,data:+ZcOBSYxUnwtGGK7/82yiJ0p+zk8xIwe9GkX2ut051kOE9I7lENxxCCURTkO/zAAmlYZgaln287HRBBtMDE24tjUvw9UKNZm9Dfh0IQxzFnIceTQDnMTOwyvhMWXEFiwbzI2rIEihrwTH0jSwasuI9W+pusiDhk4vXkz6DlcIsk=,iv:X6OqsZ4UAcS/B1VuYRPKc2KSJO7P6JUfr6GXkh3j5Tc=,tag:0P78aet5sKwS8hoV6wUpjA==,type:str] pgp: - - created_at: "2025-12-04T04:58:12Z" + - created_at: "2025-12-15T12:49:12Z" enc: |- -----BEGIN PGP MESSAGE----- - hQIMA82M54yws73UARAAsSvmHucStz5iVC1iFoU+L2bhS7r7keH7F4z5lbWuthlL - iXOYobLOyJfLs60wfguYq3LCm8etiamjEYNIpfzxbMzxws8Q5Iqamdw5sK4z/hl/ - AG+aFcNjJASRgr0MJdgpm1MUixv3mETI89RQqio/MobI7Ofg56gOqdmDrnX1pVgH - 9MBYuDx0cXrfpib6seZFGd6btXt7TBPn3L2sVoqVqHHWpAojRVILFYHJvaZGvi/7 - YdVCeyMul9PAurzJ3oajVHZG8kIchJZu3jtCbc26xwAxTIhl92rBCd/06GzYVSX+ - 1NxXyflsqhRvfBT+IHtBbKH+2KbPx0TlJTC/bwqcnGeHvivPtRWIujAVA0AvvrcM - pFDE7/3hRgbAFVRjGWM0PZp3aCEuXJE3qrCAwADT2hC+WsGSos5Yic5aj76kKnZB - CJbMgO/mgigeijUrW57Y0qaj883UT+fVQXNxsUzJm265rbm7sQURPFadumvWeYYq - YhWMjA/SSS0YT/IITI6bBeZo13MpvgepURCm94dxxBio1REAWmGgMj8P8QD67fLu - HAKxfarUcJruVDjXK6i4koemNCDcIG/MG+1SxZ6gcuWTqtJOIeb72l3rz8WI62sW - o0/s/FQDlsWafx7dL4mjIEkeZ14qstuy3IFrHGTQ6UE+ZjZxOUW7RlKSkn9JiGXS - XgGcEpEW5YX51M0NtzD20pii5aXim7k038s2pQG467nEVljWBaHCbEukSohb4mDp - kASIFKRNMw86mYZgmvR6rSZqg9UVsVzQOrq8fKq9wUUx4Q2d3L5RIGJ17t8rUpY= - =eJx+ + hQIMA82M54yws73UAQ//bCCFC1yPSPOj9nOvBvYyN1xiPS2iLWH3Io4Ns5q4MeUZ + VSOsqKrNkhXQNZFuOZ91x3aXVHKxOVx/Yqb4TSllfJpLrO4kL9EANh8AEyhP94Nt + gvbcvN5nNWWVyepd/3Vom5lnI3Fnb0x8fftarqqx74/tUTobWRxMlxRY4wmB3Sh7 + oj4bxhUYLurxuEAwS2G6+yrtAXS+fAdWN+f4zQ7Ixnf3nPoh7ui0R7Y9dKP0FLNT + BycsnkaP55yGhg5Oe1VS1VJVQwrWsel9fS8dG5X44CzBjn2Oir6EkUjWu9mBc01G + N0iaNpeevMPqLNZK2SL66uGTjMmcQ8JWAMPRA674q16BCJyFTgsfohzBVYzECJs+ + rER/paOLEWxoyZvLrM8bcrH1ql1pf/fvINkjncujHCt5FlQEXai6ZoB/r8WaHEj2 + +CIRXsMon/tdyfLLs6Xfm7YfcBwkXaT+zCzjLAv10XsncNzw0BZLS1F3tU5fS2Aw + QWJWBH98LAeEM3jvayD4gaJn/2HphoySGzOOcsDBAcqqrGfDwpB9IDcjbrObmtBc + LwlWUMK/m01LACJ1tyiVUPO7VOBljHjLzsCO2IBB91hm2idLNjKlUbODMAblMwbV + T4S4Lx3XE7aWSsGl0NXcVNBfu3Cy2tHPpn63BksoYwiy7lK1412vTk2kORrc6SLS + XgHJzjslaaus6DwItpivFDNEh4kaHnfcfDsm5PEPp7aRurriGMHkcG1jngAcmiw8 + +NMPHONZdNMN9Di4RugZxEfUJj/U3K1/r11oExxeVq4idH68+oUO7N8fMM33poU= + =C0hv -----END PGP MESSAGE----- fp: CD8CE78CB0B3BDD4 unencrypted_suffix: _unencrypted diff --git a/nixos/servers/weechat/secrets.yaml b/nixos/servers/weechat/secrets.yaml index 6d6d152d..038ad3f9 100644 --- a/nixos/servers/weechat/secrets.yaml +++ b/nixos/servers/weechat/secrets.yaml @@ -9,123 +9,132 @@ sops: - recipient: age1n4kdchmkk3rfkaknxhveqr2ftprdpgwckutt23y6u8639lazzuks77tgav enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3bDVpOTk5RmFORk5YSFh2 - UXVNKzhBYjNnY2JDNHczaHlHeDNDVVg0aHhnCm0rNE83bTNhUVgvZmhnNC83TnZr - bjRnS2hscW1zM1VzejN5Z2hyT0h5WEUKLS0tIDYzdEJsa0hITXVRZXdZcnJ5eE52 - NFArVksxcDAxelYxOHVyOE5WRDhDWnMK0BwmJmgzM7/u3NsZj0w1B7Jz3O1sUCyM - +1PRcH2JYCyJBDKKnPO9Qbp9ikfCW69La/2+Io7g/PQthxlLQrTwfw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHbk9xZXN5bVJ6ZHVLMm9T + WTIzdUEvWVdGT29KL2FOZ2FrcXdPczJTc3pjCjhnc0hZQjdoa1JSZFluL3p3ZXY3 + bnlBd1dwT3MvNHMzTHNxQStreXJkcUUKLS0tIFFCZk9hTm5xQ005ajg3eWZQTkFK + OGI5Y3JBS3p0UXQrWWRIb1FDTWc0OU0KysPkpP1+sntcvJqzC6Jpi/XUtFvKvI68 + nQh+smMJB4By7dB6Ebxpinzo5ZRatJmdApdlm6CaNk20gJMIYRJ/RQ== -----END AGE ENCRYPTED FILE----- - recipient: age1cnu37d5fqyahh9vvc4hj6z6k8ur9ksuefln7sr6g3emmn927eutqxdawuh enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXN2prYUlJRlFpbHQxWlAx - bGE0SDZMNTZsZmZvVmVBVld5SWJtTnZIMWhjCkp0encrRGlyV0tFSnZsb0s4elAv - YmQ1c1RYelJmd0NtN3pXSCsrVDFYSjgKLS0tIEx1UndUOUp5VWw3YVMyYUdjV2xo - RUJBY2QrWGZKK29Ta1ZpeXlVaEZjL1kK9UpOhJK4HN+wtJEUxOAG2jJJVeEGUPKU - oHUahC2z6kvBw8+AH7pfMoqGBy3jK3ABFjGdmu+6ls17DGuo0moQTQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxbGhVRmJvd3NkTmpYcXVF + eXlkTXZKbUlGK0gvemsxVDl3S04vNkpkNVI0CitDSTQyUE5kUmZ5bUVXMEJyTCsx + NmFmaDJPK09qa0JBekFNbVJZQTQ3Y1kKLS0tIExTSWJGd01KQjJKcWVuV1JnbnIw + c2JPY0hyOTNWNEEreXFGYXh0bXF6WWMKRmCVCzONcoReFYCpZjRdAbsMUdaTjqpo + bGOHkju2NKRWHLJgz7xvrtR3Tc+N7GurZbgp76ZndY2gb2scbPfaxA== -----END AGE ENCRYPTED FILE----- - recipient: age1a0m73qr8hhuz8xemv4vymf4wmpghm2hst8wgrn3pn65ext5mf4ksk0vsdm enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlemxKc1F1OUh0dnp1WXlr - Y1RKQWpnditTLzVrUG43TkdTNUw3MlhDdUVJClFIbU8wVTVXUkFLWFJCSkR4QzhW - ckJKUm9WUVZrTHIrRXQ5dzhWamtzbFEKLS0tIHByU3lmbVlvcHpkTmJlMlRFdEE5 - UHQ2bkIzQWk4QW4xRkVkeTdvbXF0UTAKPBblsqyZNiXtia91BkkjK9N32qT0fDZN - dTT7KxVcQ2zK1jH+Q0DziSfY7rspyvLy1I/9FSpSJxD36Av90Q2JCQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoMUdnblBrS0UxWlNnK2xm + SkhNQmJTWWQwdG40TVVpaE5oZzM1b3ZuWmxZCkR6WVlsOFJINGFsWXJJeU9SNGpX + QUtzT1NLMll5bmhmM3hta2FPY2NXSFkKLS0tICtaaE5rRlQ2VSt6b3JXU1hYby8y + R0gzZVpYVDF3ODNWZWxaL2o5R0ZkZmMKRxP/1+2Datk+41OOL+oPey7b1O3BS6ty + Tq80gpqfG0A+j6RnKETuJNm2aZQQOvOiuP/thKqY+8Xobz/RdtDy7A== -----END AGE ENCRYPTED FILE----- - recipient: age18hpxz0ghvswv9k30cle73prvnzrsuczqh87jjdk9fl50j3ddndmq9xae0n enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5dmRKaWYzb1FLM09Ya0ln - aGZmbWI4UGZYYS9EZkdhR0U5UmtlK2ZBYXdvClhvNWhzTStqaFV1UlFGLzZNbUJD - dk9OT24xbFZNSEpHdUVKcTRJUGI1RHMKLS0tIHN3WEYyektmTUVndzROU1NGWFEy - Y0pJU1Y1NkROdzc1UTJpWmFrbHJsMVUKbD2XVuW1cikmyBvJpUtUnNi79OYgbMLh - V8m/ZQ5wz4PrEQXIWeyXUdPLZ8lRI4X5CQY4fFesljnvTJ+2pRIKnw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFcmxVSVh2dDhiSGttZitP + T2o5aDRXZDZmRHl6cFlNZmN0WGdCZlBNV2lzCm9xbEQzQm9zLzV6a0wwSmUraFpE + VlRCTlVUamtRMXFpMFRXVUtMWGRnWmMKLS0tIEFFMkNFelE2WlhBQUFBODRHMmdo + TlE1d3dPcG1MZlFkUUNmbVlwYzIxQ00KnJ6lxix4qG6cKyR620KFVvBQ8wn+KznB + IVkYvTPC+jnFOvkjU1UO79zoeJvt9eXcN9yJQ/evsVvRjNFsOLY4jQ== -----END AGE ENCRYPTED FILE----- - recipient: age1xgy03g3vjydsxcl0qpdgm8rahjcjq95ucxfwlgr22zwjx3p7jf2s9jk6u5 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQd1JERVd4Z0l6NkZXWFhU - S1RwcGc0b09idy91NExRN1BUOGlQK0Yva1hVCjNLdGtvM3FoN29wdUtFaWpqNFY1 - d0hEY0ZNeXB6TFBkWlhleHJqbHNzTG8KLS0tIDdDZUNIL0VEMXRES0IvZ09uTWY1 - MVFaRWJ1SXFvMDVRRitmem1qYWhaS0UKnLW6gVHpRPHdfcY2mdpGpRO7D7Mn8g/Z - yI2riHDsGviMDjABkMSoOdbfcu/p77WUo7TQXkeHrTepaT+GbFtpXg== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQR1MwVHExZExsODhOMWlz + RXd5QjNRak5UcGNGa0VQaHp0dlAvWjVoQmdzCnZDV3h0Yi9VN0xhNmRiS1cweGNv + Vk80UG80amp4aksrMjlXR1NZLzdDZFUKLS0tIHRRNEhqQmNFVWNxYTR0b1g5ZXNi + VXo0SVNHMjdNTHlFOEMzRlhVTTRWSXcKT60DVAO9nbN/wlSXtQf4cZHf5ZyRBKDV + /1zP8J1seCswhMVY3heh6v+rM+7/r2VdBXgnkzA2tr8PpjmYW/v9bw== -----END AGE ENCRYPTED FILE----- - recipient: age1fv5dafs4n3r5n83qm2hfz7xmnflsz0xf9r3saralrptpgf8mvuxq4t8k3u enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBZUJpdGtOaGVpOHVSVVBT - MUllQkNuSThqRis0TW90bExlbGFxd2R0Zmp3CmlxUCt1VDFtb2x3Wk0zNDkzY29I - ZElid3R4WGt3eVVCNlB1V093bmtLQXMKLS0tIDh5OFU5LzRBVFFNVHBKS2trcnd5 - SUlvc3B6MkNQTVR4TVVHdlZGOEZaR00Kgsi2pIrzKvTyLP0To6NSt+ZvkOkURjx2 - QwTSGDFWw4InyK5A4KeIqNtX5y5T6D0AoPTSpUO8Xtij8rCuIZXbMw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLVW5vVDBkMGVTL1JaY3lE + ME1ySkQwSllLRXJiTFZZUndWTGpZSC9rT1NZCk5ObU9UbTFSMVYxRXkwYUpQUUxB + YXJYRHRmRFh5RzJtNFo5S09pY05ucXcKLS0tIEZ5UDBIQUVXeHVxdFNtcjlEeGdi + Tk5GZ1BuZFNxaytLTEx0Rk92VXB3NFkKg89O5rvfy3PY8YqlmqormoJQPj0kbBfo + JxdZMWYoOK6QAgz5QbyHU54fNh8Kl96UAZDM5NvEOpHUQYNGbtOZfA== -----END AGE ENCRYPTED FILE----- - recipient: age120530yclr75k6nrzp6k5jjftj8j4q9v3533guupzk4ct86mjxszqg9e5t5 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6K00yMHFsaGFFUDA0V1FS - RjY1d0czWitzR2ZRenZqc0ZpMUZUMXdQTW5ZCjRXanRLc1owL25ta3VzLzV0b0lh - MGROSHNmckRjenR1bDBsNVVuS2hoQk0KLS0tIGtQMnVKb0NGQmMxeXd5bU96bDBI - K1lTaUhibEladzhvcTFEc0FJdzVVRkkKqrWdIgTxe8a8chYaE7fTGFOq2gAn31+K - G9R1EiHokGmMCmAR9thmNdBKc2XyoiDODxruq72R6f3D9fKCj7rilw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtVU9udndxaWRiRHYwWkpq + NUN0SWg5Rnk5N1ZjQXV1Qk1PK2NRUU1qNXpjCnB4bi91WUxtcWJMcktON05NQ21N + RzJIcDRLN3ZTN3dEcWYwbVVYdTl2d00KLS0tIElqSTFXUXV1bHJsQkJlcndFdFFU + ZmIvWERPZjFnRVhEYTFQUFl5SGRQK3MKXeYN2GCe2Eo/Dvs8hgZKYyKwCyqbqMAb + kxxi9clhQVD0N3sPjnJN6FS8nB5Y9EcbflX3W2ILY42XQSmzj0l6jw== -----END AGE ENCRYPTED FILE----- - recipient: age1rt0ngkum32wt6l2wnyr40hmwd9ulmzqfarg5vk62zqp0uvj4lyuqd2atgq enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArL0lSSk8wYWRneitjZXB0 - L0phSlZJQjYwdnoyWVJmQlQrZldMa0Z0OUR3Cmh3YlpjUXpjSUdmY3htOTdiTlM2 - NnV6NWxPeTdpNHh0dlhlakxtWTRyR28KLS0tIGZrdStrQ2tTbng1YkVMcDdOUG1N - cU93cW13MVNIeVFoZmQwdklKOU55ZEUKOpvhrFMciyI2XY3jOK4urv8UArkwKV7D - +nlur6rUodaijF6S4LGA+4SU7FJxNPGYdkrbgYuL/Dukw19p8O0G0Q== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZRlIwRXYrbTlTeXNpUGZV + YTBXR3NjWUlkc2p4ZUErM0didWRoaFZpamxBCnpLbVR3TEpKQWwwcGpvUXFFNlJ5 + SlJQU0dRVVBOMGhkL3VicW84clB5YU0KLS0tIEl1UTNWMU5WbGJVQ1lvTWl0Wmlr + NElDTDNZN1NPdUtLNGFiVm04NUZHVGcKvBBsH52HgaBzQ+O3nITqJWDf8FeFxZyy + bw5RUyCG7GlCM8YaL+dQZqGT0o6QA+GgntGgoDqtEc9SFymXcZ/n2Q== -----END AGE ENCRYPTED FILE----- - recipient: age1c4atxfp05u7zm875s6q8p82ve96rqqpq9smktxlur8pk2yc3qvgql46dp9 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBU0pvQmVocVVnQWloTGJq - QnZpeWFhLzlYUk9tcGdPcXgxOGY3engyUnpFCnpaSHc2WEEzcitIN0FPU1h3T2ZP - YmpZRm90b1BIeC9ESnZ3TUNiK2F4VEEKLS0tIG5jRHYwRStoZTlsZGJPc1BuTGFN - MTFHVVRnZEVVM2JseWNGQXNRNW5Mb0EKaYXWtgWgWvC92b7YZOOpnmAC4jsriWjx - E5jr5AMUw3+fmChmrpWo+8t85ICgthlA9ppRZHB+OXhzLuwiJe0Fbw== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHRVlYcTlJa1ZqTURsbWha + Zm84RWFjdUIyU2E1MVVydk92VG1KMzNPcTBJCk9pM1hmNUpqK1Y3aTlqbDdGVVBB + MDFjaEcrWGZpZ2MxOUpUcWRMRW01NFEKLS0tIHJodXhlN0hXWUUyWGJyOTRFR01p + ZlNYV0ljek8wcm96VEdhWmduTnEwTDgKt3a5lbYTUOQMG5EncHAS+ROMAw4rFeku + BGdAk7HzAp2ACsDrAELWjZYazuK6DdF/TIs59GcwFa4y676jqDuB5w== -----END AGE ENCRYPTED FILE----- - recipient: age1rjldv3fn3q686647exmcukthr32gmp6s3axs0lhyenvru9ajp9rs24ukvz enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpTFYzUk5YYjZURnJtcDZz - LzV3NU1Ma2NnWE8xS3pxOVMva2gzazRnMUEwCm1oVWVacDBicC9DekpFRlB0WnBO - MXBUdnRDVmgycUJDL2JCVmUzSEY4ckkKLS0tIEFxREk4dGk1cE85WkZsR2NHZWsy - ajkvMUhXcnJ1dHhZRitYRlRwcTJ1NTgKNcDZNrwXsjuL4h6V10NKJt+geunKDSaB - 0rBvSGWzVUoDw4+Q98/d5n26vPEkyPUkKcOafutzP5qMM9XxFYFftQ== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAweXZIQlgyZmVKMXF2UHF6 + ZWxtTU1Qd3N6d2x4VkJYSmJtN3RaR3FwRDNZCmV0bHZzWFc2T3k0SmhEOGs1S2Jo + OWJBWWxYZm5FN0oxM292SzF4VEdDR1kKLS0tIDZQWWJrdms1UXd2ZTU0dHJEeWlx + bWhsTzVESEsxdWFQMndMSDkxZHpWbWcKHU8uEkG2DVQzjwyRYJaLFx0neA6P0fNy + oJO7SRmBWM8nNjwQfo5qMjQlC7yiO7mHjznS9gpCsrnEPqqoROr9GA== -----END AGE ENCRYPTED FILE----- - recipient: age1p9v6xaujkdat2tsc2mc4gxpg9hjr4suvwryuat95z2c53xhsyfxq0gf594 enc: | -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0bjQ0dmxwejNNMDJ3aXdN - Um5wdE1FQjE3c1gwQVphcU9aUXptMzdjRFhnCm1UOWo3RURqTHNLWFB3cHVmZ20w - YnJ3NDZpUE9DT0wwNkNEcEplY0ZzdjQKLS0tIEJjNzVZZlFJVm1IcS92YjM4SWR1 - RUNqR0xqbUs2YkdwZDZmNnBwVW45V2cKRVPJwrjR3qiWzKVtvziPmoMdRMugF8jC - XoXJL8sIeID7nJtmvytkKrneG2JUeTSkGriR17JyerxIlagPj0ZPTA== + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoN25KTEp2aDlFd1pmMkor + TVJ6Sm5TZ1ZUQ1BSMUtJaDB2QWxuYXl5LzA0CjhRNDcyeEJ5L2NnVlNwNCtacHhZ + RTU2TzRwQ0NCVlVXYi9CK1ZOaHR2SE0KLS0tIEZ6Rit5b3NrZUNhVGw2RTNML2VW + bks4Lyt6S2o5YmdETHRibWhYNXA1ZTQK/m8yw5iVFU91svskF28AOUPs0/rQ3Dzq + f563xZ1Z5xOI9OP+NEkkO25ynTfgQN9BfDd01oeYNLqb9ukXoeMAHA== + -----END AGE ENCRYPTED FILE----- + - recipient: age1nxgmdahcjhmtrf7q66jep55cjdcw6tfpw722jr4gytaykgf89ugqxufgyd + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPZFJMN09tUloxS002dTRu + MjM2ZWV2M2kwKzRrYmlRdms1ckpMWDZKbEhVCkh4U3FvOVAvbkZXM1loRGhhL0Nh + ZnhtWC9sbGNXV3VsRzQzNkpLOUZDR1EKLS0tIG11MkdEc01kSENRdUdTWjVJZHlQ + ZWpBeGdXUU40VGtOTndidjhub2ROS2cKWA8pgxvEOFqYrs1DP/v2w3L+ffu1QjYk + UFXWL/VKRUdJdMFVldF/nEZ0+qra0OEtCcbgSXUEvOygbRtAC3cE+A== -----END AGE ENCRYPTED FILE----- lastmodified: "2025-05-27T20:29:36Z" mac: ENC[AES256_GCM,data:EROSoDKKxmzxgOiGxW9vRyk5Ik95pfeREOGFk/SwPZOFtoETemVh5199xZT1s3Yzim7+fB5efdBAkooUIGjq1JSRVjpkfnozdvRZMYp3dp0b8fp5kBaepYLNCfKCs4e8guNyywiSIBiUGYhi+XZi/N+q1KG/zB/jhGl0G+9DixY=,iv:Qn1MObCfKca7tQn2hGZIcyiCl1PI0gV4fwJ5fFXo3Mc=,tag:X0Ht901lI6h0Ito3lmDvbQ==,type:str] pgp: - - created_at: "2025-12-04T04:58:13Z" + - created_at: "2025-12-15T12:49:13Z" enc: |- -----BEGIN PGP MESSAGE----- - hQIMA82M54yws73UARAAssBzjr0KAmZOmMnnShaxNx5tdDNQJ6zzIOZugxqqCXPF - FvZ1DM9SEQisdsspAND/HISJJ1sedtw/3nhMPvtHYSTkBOTszLA3oPLmOkBaoBhx - 0XAHeMqAwVVyXrmgf1syl2Hj0sTGRqsvNBUSPDdgDYM8kH3EbYMlYyEDPqMwT6bY - TMP+FtIXnmNuh9mgJv0Ys7y9zxf7igPwVxV71+WkAg2vgXx3zV/Xn8av3SwEBjs3 - y33+msI+hz0WEuAz6zFaW+n3iM+nXaJYYiVikqAOuqcLYO5J8RcF5P1j4P6KoBhy - k7k72OZ+bY9JDCKAKtxLrNOn6NJ614lUpq/eHW4u0PpQbWsNxF8GyRVP7p0yjm4u - fgrKchqkIg+Z95PXMMd9ZmkrHM/jQv9Dp7Yt9aaIwBBnILaZ8Meoq648z1gRy38O - xVzfuCFhirK9M8CLn0eCI9H3UM1WbGWVF8SMqn4/GzzJoCr9z+k1VqVwj0gsPUO3 - W/H6e3SxGdLFPeBs1RsXaWmSaZ8QVkMmB/0ihojWDY6E4v+4tZSkH2T4x8yLyT9o - A1a7YbIsqztWvpmFy5KRPVoPPxHkSmyRcQImfVFcKT5T9p09TYMEEXkKyS6DmgM5 - qgHIPw1Tbgizjx+g9BUlemPsWooJYOeOmk/nuXoDHTqgb9PoyDvmbJOLQNrB3lzS - XgGnqD0v9houg54dC6FsQazEoZJcLDJarWxRPoWwRp4YVjkFWpKVKIp3K1nrx1iD - ZvF9CF2x3rthktuKhn6EVHXgx1V79KXmHhsQfOnP9Ixt/6cAWXMInbeFIlqISzE= - =uAjq + hQIMA82M54yws73UAQ//RQKrtTdUfr6RZ/7iz8uVyK4sCr4QXDjjjp4Fr03J5An3 + enc4k1ffeWy91svvrxHdrS8/8UwQHyZqlQwE8OjFV6JlNmax1kkWyPHtPGDpsH3h + rvJs+xcGv2Ly/rQYzRXUX66B/w45jxK/Dhh5tD/rl+ezf52O2FWh74XVqCLq322n + xg6cb9KGEX9hjoLarA2sHOR7EKi1ppAuQtjrfU5i44SQcNZM/r/oZ4+hkTM77mcO + 1vgke3l0hNdLhtzXpCnr5YeN7OiLlc8JG57cREizRbFqg4l3dqdcVkY2L6XHYMUA + 0BpGtl+lYjYPnBr/X7q3EtyPiPw/85qDuXz/qvvWhmVFJgdwnOV/3fSBwyWjdTOJ + G4y/mfrRD2C3skEiHWDmI6yPfnYFM1f6SyIr9wptF4XOXiQFvUjvRLuqJbHD6gto + a5ue+tm7Icgy95FY4Jkro2VsIkhZVKL21n3l7qhIfmjWQ2+pc3gl8AnOKyB1lNt2 + D/D69s1sgU4OCTNAoHC88zse14TsdbJTDlF+INNMDTzt2cEKqAocVI0Jp+qmipoU + W+K2yqsfoZ5Gqj1R3+J46EU4LHbzdEUZX9dkdD0srhgjo8rYdzA79ediCGkVBie6 + mDXCfM1zRCSrwFBHwkgNDMgz56k6DKpRX9G59xUr68n3mv76VNqHYh88Uv1cLiPS + XgFqOWNm3KYyD/+hDUrMp+s4HGZ1sgTIRbY080gwP4LKYPJa9ZRUQB3xq0bGsU6g + O+OBK3zKdejgy3NsOBX5ZXVreopUzIIWFR1BHvn1H9FSNzL9K7cyQQ5bfVFhOdg= + =TtUk -----END PGP MESSAGE----- fp: CD8CE78CB0B3BDD4 unencrypted_suffix: _unencrypted diff --git a/overlays.nix b/overlays.nix index a39e4f2b..3b27a153 100644 --- a/overlays.nix +++ b/overlays.nix @@ -32,15 +32,17 @@ hash = "sha256-8UWf1RKsRNWJ8CC6ceDeIOv4eY3ybxZ9tv5MCHx80NY="; }; }; + wivrn = prev.wivrn.overrideAttrs (old: { + cudaSupport = true; + }); }) inputs.rbw-bitw.overlays.default #inputs.arcexprs.overlays.default + inputs.nix-gaming.overlays.default inputs.darwin.overlays.default inputs.deploy-rs.overlays.default inputs.neorg-overlay.overlays.default inputs.niri.overlays.niri + inputs.proton-cachyos.overlays.default (import tree.packages.default {inherit inputs tree;}) - (_final: prev: { - wivrn = prev.wivrn.override {cudaSupport = true;}; - }) ] diff --git a/packages/wivrn-pacer.patch b/packages/wivrn-pacer.patch new file mode 100644 index 00000000..ea585c91 --- /dev/null +++ b/packages/wivrn-pacer.patch @@ -0,0 +1,13 @@ +diff --git a/server/driver/app_pacer.cpp b/server/driver/app_pacer.cpp +index 5748a6c..4255b29 100644 +--- a/server/driver/app_pacer.cpp ++++ b/server/driver/app_pacer.cpp +@@ -34,7 +34,7 @@ class app_pacer : public u_pacing_app + int64_t frame_id = 0; + int64_t compositor_display_time = 0; + int64_t last_display_time = 0; +- int64_t period = 10'000'000; ++ int64_t period = 5'000'000; + + std::mutex mutex; // locks cpu/draw/gpu time + int64_t cpu_time = 0; diff --git a/quickshell/stylix.json b/quickshell/stylix.json index 608a5f9e..e69de29b 100644 --- a/quickshell/stylix.json +++ b/quickshell/stylix.json @@ -1 +0,0 @@ -{"author":"Stylix","base00":"#191A2D","base01":"#4F415B","base02":"#6363AC","base03":"#A39AB2","base04":"#B1B8D5","base05":"#D5CEEB","base06":"#D8CCEA","base07":"#D8CDEA","base08":"#7D8CC9","base09":"#908EAB","base0A":"#9B8AA9","base0B":"#948BB5","base0C":"#8391B0","base0D":"#6693D8","base0E":"#9C85CC","base0F":"#AB83A0","classy":"#9B8AA9","comments":"#A39AB2","darkFg":"#B1B8D5","defaultBg":"#191A2D","defaultFg":"#D5CEEB","deprecated":"#AB83A0","functiony":"#6693D8","integer":"#908EAB","keyword":"#9C85CC","lightBg":"#D8CDEA","lightFg":"#D8CCEA","lighterBg":"#4F415B","scheme":"Stylix","selectionBg":"#6363AC","slug":"stylix","stringy":"#948BB5","support":"#8391B0","variable":"#7D8CC9"} diff --git a/systems/goliath.nix b/systems/goliath.nix index ca4f68e9..4fcb1227 100644 --- a/systems/goliath.nix +++ b/systems/goliath.nix @@ -54,8 +54,8 @@ _: let dev ]) ++ (with tree.nixos.environments; [ - #hyprland - niri + hyprland + #niri ]) ++ (with tree.nixos.servers; [ forgejo-runner @@ -107,74 +107,90 @@ _: let # "-model_sheet" # ]; # }; - waybar.settings.main = { - modules-right = [ - "custom/nvidia-vram" + # waybar.settings.main = { + # modules-right = [ + # "custom/nvidia-vram" + # ]; + # "custom/nvidia-vram" = { + # tooltip = false; + # format = "vram {}"; + # interval = 1; + # exec = let + # inherit (lib.meta) getExe; + # inherit (pkgs) writeShellScriptBin bc; + # nvidia-vram = writeShellScriptBin "nvidia-vram" '' + # export PATH="$PATH:${lib.makeBinPath [ + # config.hardware.nvidia.package + # bc + # ]}" + # exec ${../packages/nvidia-vram/nvidia-vram.sh} "$@" + # ''; + # in "${getExe nvidia-vram}"; + # return-type = ""; + # }; + # }; + # niri.settings = { + # outputs = { + # "LG Electronics LG Ultra HD 0x0001AC91" = { + # scale = 1.0; + # position = { + # x = 1920; + # y = 0; + # }; + # mode = { + # width = 2560; + # height = 1440; + # refresh = 59.951; + # }; + # }; + # "Samsung Electric Company SAMSUNG Unknown" = { + # position = { + # x = 0; + # y = 0; + # }; + # }; + # "PNP(XXX) Beyond TV 0x00010000" = { + # mode = { + # width = 2560; + # height = 1440; + # refresh = 119.998; + # }; + # }; + # }; + # environment = { + # NVD_BACKEND = "direct"; + # ELECTRON_OZONE_PLATFORM_HINT = "auto"; + # LIBVA_DRIVER_NAME = "nvidia"; + # NIXOS_OZONE_WL = "1"; + # QT_QTA_PLATFORM = "wayland;xcb"; + # }; + # }; + }; + wayland.windowManager.hyprland.settings = { + monitor = [ + "HDMI-A-1, 1920x1080, 0x0, 1" + "DP-2, 2560x1440, auto-right, 1" ]; - "custom/nvidia-vram" = { - tooltip = false; - format = "vram {}"; - interval = 1; - exec = let - inherit (lib.meta) getExe; - inherit (pkgs) writeShellScriptBin bc; - nvidia-vram = writeShellScriptBin "nvidia-vram" '' - export PATH="$PATH:${lib.makeBinPath [ - config.hardware.nvidia.package - bc - ]}" - exec ${../packages/nvidia-vram/nvidia-vram.sh} "$@" - ''; - in "${getExe nvidia-vram}"; - return-type = ""; - }; - }; - niri.settings = { - outputs = { - "LG Electronics LG Ultra HD 0x0001AC91" = { - scale = 1.0; - position = { - x = 1920; - y = 0; - }; - mode = { - width = 2560; - height = 1440; - refresh = 59.951; - }; - }; - "Samsung Electric Company SAMSUNG Unknown" = { - position = { - x = 0; - y = 0; - }; - }; - "PNP(XXX) Beyond TV 0x00010000" = { - mode = { - width = 2560; - height = 1440; - refresh = 119.998; - }; - }; - }; - environment = { - NVD_BACKEND = "direct"; - ELECTRON_OZONE_PLATFORM_HINT = "auto"; - LIBVA_DRIVER_NAME = "nvidia"; - NIXOS_OZONE_WL = "1"; - QT_QTA_PLATFORM = "wayland;xcb"; - }; - }; + env = [ + "NVD_BACKEND,direct" + "ELECTRON_OZONE_PLATFORM_HINT,auto" + "LIBVA_DRIVER_NAME,nvidia" + "__GLX_VENDOR_LIBRARY_NAME,nvidia" + "NIXOS_OZONE_WL,1" + "__NV_DISABLE_EXPLICIT_SYNC,1" + "QT_QPA_PLATFORM,wayland;xcb" + ]; }; imports = (with tree.home.profiles; [ graphical + tiling ]) ++ (with tree.home.environments; [ - #hyprland - niri + hyprland + #niri ]); - }; + }; networking.hostId = "c3b94e85"; diff --git a/systems/minecraft.nix b/systems/minecraft.nix new file mode 100644 index 00000000..28c3b417 --- /dev/null +++ b/systems/minecraft.nix @@ -0,0 +1,155 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page, on +# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). + + +_: let + hostConfig = { config, lib, pkgs, tree, modulesPath, ... }: { + imports = + [ # Include the results of the hardware scan. + + (modulesPath + "/virtualisation/proxmox-lxc.nix") + ]; + + boot.loader.grub.enable = false; + boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + #fileSystems."/" = + # { device = "rpool/data/subvol-103-disk-0"; + # fsType = "zfs"; + # }; + + programs.java.enable = true; + hardware.ksm.enable = false; + networking.hostId = "576fe6d7"; + networking.hostName = "minecraft"; + swapDevices = [ ]; + + networking.firewall.interfaces.tailscale0.allowedTCPPorts = [ 25565 ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + # Use the GRUB 2 boot loader. + # boot.loader.grub.efiSupport = true; + # boot.loader.grub.efiInstallAsRemovable = true; + # boot.loader.efi.efiSysMountPoint = "/boot/efi"; + # Define on which hard drive you want to install Grub. + # boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only + + # networking.hostName = "nixos"; # Define your hostname. + + # Configure network connections interactively with nmcli or nmtui. + networking.networkmanager.enable = true; + + # Set your time zone. + # time.timeZone = "Europe/Amsterdam"; + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # Select internationalisation properties. + # i18n.defaultLocale = "en_US.UTF-8"; + # console = { + # font = "Lat2-Terminus16"; + # keyMap = "us"; + # useXkbConfig = true; # use xkb.options in tty. + # }; + + # Enable the X11 windowing system. + # services.xserver.enable = true; + + + + + # Configure keymap in X11 + # services.xserver.xkb.layout = "us"; + # services.xserver.xkb.options = "eurosign:e,caps:escape"; + + # Enable CUPS to print documents. + # services.printing.enable = true; + + # Enable sound. + # services.pulseaudio.enable = true; + # OR + # services.pipewire = { + # enable = true; + # pulse.enable = true; + # }; + + # Enable touchpad support (enabled default in most desktopManager). + # services.libinput.enable = true; + + # Define a user account. Don't forget to set a password with ‘passwd’. + users.users.minecraft = { + isNormalUser = true; + }; + + # programs.firefox.enable = true; + + # List packages installed in system profile. + # You can use https://search.nixos.org/ to find more packages (and options). + # environment.systemPackages = with pkgs; [ + # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + # wget + # ]; + + # Some programs need SUID wrappers, can be configured further or are + # started in user sessions. + # programs.mtr.enable = true; + # programs.gnupg.agent = { + # enable = true; + # enableSSHSupport = true; + # }; + + # List services that you want to enable: + + # Enable the OpenSSH daemon. + services.openssh.enable = true; + + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + # networking.firewall.enable = false; + + # Copy the NixOS configuration file and link it from the resulting system + # (/run/current-system/configuration.nix). This is useful in case you + # accidentally delete configuration.nix. + # system.copySystemConfiguration = true; + + # This option defines the first version of NixOS you have installed on this particular machine, + # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. + # + # Most users should NEVER change this value after the initial install, for any reason, + # even if you've upgraded your system to a new NixOS release. + # + # This value does NOT affect the Nixpkgs version your packages and OS are pulled from, + # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how + # to actually do that. + # + # This value being lower than the current NixOS release does NOT mean your system is + # out of date, out of support, or vulnerable. + # + # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration, + # and migrated your data accordingly. + # + # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . + system.stateVersion = "25.11"; # Did you read the comment? + +}; +in { + arch = "x86_64"; + type = "NixOS"; + deploy.hostname = "100.78.130.44"; + deploy.sshUser = "root"; + colmena.tags = [ + "server" + "container" + ]; + modules = [ + hostConfig + ]; +} diff --git a/tree.nix b/tree.nix index 94fb3b3d..41b8389a 100644 --- a/tree.nix +++ b/tree.nix @@ -90,7 +90,6 @@ infrastructure.nixosModules.default lanzaboote.nixosModules.lanzaboote solaar.nixosModules.default - chaotic.nixosModules.default nixpkgs-xr.nixosModules.nixpkgs-xr spicetify-nix.nixosModules.spicetify clipboard-sync.nixosModules.default @@ -119,11 +118,11 @@ nix-doom-emacs-unstraightened.hmModule nix-index-database.homeModules.nix-index sops-nix.homeManagerModules.sops - chaotic.homeManagerModules.default spicetify-nix.homeManagerModules.spicetify stylix.homeModules.stylix noctalia.homeModules.default nixvim.homeModules.nixvim + nixcord.homeModules.nixcord ] ++ (with (import (inputs.arcexprs + "/modules")).home-manager; [ i3gopher