From e3a865e74ad9dfa0d29ddfdabcc636d3372c5a27 Mon Sep 17 00:00:00 2001 From: intergrav Date: Fri, 10 Jul 2026 12:44:35 -0400 Subject: [PATCH] reorganization --- hosts/darwin/d-macbook/default.nix | 5 +- hosts/darwin/d-macbook/programs/mail.nix | 182 ---------------- hosts/darwin/d-macbook/programs/restray.nix | 84 -------- .../darwin/d-macbook/users/devin/restray.nix | 76 +++++++ hosts/darwin/default.nix | 1 + modules/common/default.nix | 8 +- modules/users/devin/desktop/default.nix | 11 + modules/users/devin/desktop/mail.nix | 201 ++++++++++++++++++ secrets/draupnir-at.age | 12 +- secrets/mail-gmail.age | 8 +- secrets/mail-icloud.age | 9 +- secrets/msmtp.age | Bin 338 -> 338 bytes secrets/navidrome.age | Bin 556 -> 556 bytes secrets/restray-bluepill-rest.age | Bin 430 -> 418 bytes secrets/restray-onedrive.age | Bin 2582 -> 2570 bytes secrets/secrets.nix | 10 +- secrets/slskd.age | Bin 431 -> 431 bytes secrets/tranquil-pds.age | Bin 550 -> 550 bytes secrets/transmission.age | Bin 351 -> 351 bytes 19 files changed, 317 insertions(+), 290 deletions(-) delete mode 100644 hosts/darwin/d-macbook/programs/mail.nix delete mode 100644 hosts/darwin/d-macbook/programs/restray.nix create mode 100644 hosts/darwin/d-macbook/users/devin/restray.nix create mode 100644 modules/users/devin/desktop/default.nix create mode 100644 modules/users/devin/desktop/mail.nix diff --git a/hosts/darwin/d-macbook/default.nix b/hosts/darwin/d-macbook/default.nix index ee60d01..c46bdc6 100644 --- a/hosts/darwin/d-macbook/default.nix +++ b/hosts/darwin/d-macbook/default.nix @@ -3,10 +3,7 @@ inputs, ... }: { - imports = [ - ./programs/restray.nix - ./programs/mail.nix - ]; + home-manager.users.devin.imports = [./users/devin/restray.nix]; environment.systemPackages = with pkgs; [ cinny-desktop diff --git a/hosts/darwin/d-macbook/programs/mail.nix b/hosts/darwin/d-macbook/programs/mail.nix deleted file mode 100644 index e040f3a..0000000 --- a/hosts/darwin/d-macbook/programs/mail.nix +++ /dev/null @@ -1,182 +0,0 @@ -{ - config, - pkgs, - ... -}: { - age.secrets.mail-gmail = { - file = ../../../../secrets/mail-gmail.age; - owner = config.users.users.devin.name; - }; - - age.secrets.mail-icloud = { - file = ../../../../secrets/mail-icloud.age; - owner = config.users.users.devin.name; - }; - - launchd.user.agents.mbsync-mail = { - serviceConfig = { - ProgramArguments = [ - "${pkgs.isync}/bin/mbsync" - "iCloud" - "Gmail" - ]; - - RunAtLoad = true; - StartInterval = 900; # every 15 minutes - - StandardOutPath = "/Users/devin/Library/Logs/mbsync-mail.out.log"; - StandardErrorPath = "/Users/devin/Library/Logs/mbsync-mail.err.log"; - - EnvironmentVariables = { - HOME = "/Users/devin"; - }; - }; - }; - - home-manager.users.devin = {...}: { - programs.mbsync.enable = true; - programs.msmtp.enable = true; - - programs.aerc = { - enable = true; - - extraConfig = { - general = { - unsafe-accounts-conf = true; - }; - - ui = { - sort = "-r date"; - }; - - viewer = { - alternatives = "text/html,text/plain"; - pager = "${pkgs.less}/bin/less -R"; - }; - - filters = { - "text/plain" = "${pkgs.coreutils}/bin/cat"; - "text/html" = "${pkgs.elinks}/bin/elinks -dump"; - }; - }; - }; - - accounts.email.maildirBasePath = "Mail"; - - accounts.email.accounts = { - iCloud = { - primary = true; - - address = "devin@devins.page"; - realName = "Devin Singh"; - - userName = "devinkid1@icloud.com"; - passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.mail-icloud.path}"; - - imap.host = "imap.mail.me.com"; - imap.port = 993; - smtp.host = "smtp.mail.me.com"; - smtp.port = 587; - - mbsync = { - enable = true; - - groups.iCloud = { - channels = { - inbox = { - farPattern = "INBOX"; - nearPattern = "Inbox"; - extraConfig.Create = "Near"; - }; - - sent = { - farPattern = "Sent Messages"; - nearPattern = "Sent"; - extraConfig.Create = "Near"; - }; - - drafts = { - farPattern = "Drafts"; - nearPattern = "Drafts"; - extraConfig.Create = "Near"; - }; - - junk = { - farPattern = "Junk"; - nearPattern = "Junk"; - extraConfig.Create = "Near"; - }; - - trash = { - farPattern = "Deleted Messages"; - nearPattern = "Trash"; - extraConfig.Create = "Near"; - }; - }; - }; - }; - - msmtp.enable = true; - aerc.enable = true; - }; - - Gmail = { - address = "devinkid1@gmail.com"; - realName = "Devin Singh"; - - userName = "devinkid1@gmail.com"; - passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.mail-gmail.path}"; - - flavor = "gmail.com"; - - mbsync = { - enable = true; - - groups.Gmail = { - channels = { - inbox = { - farPattern = "INBOX"; - nearPattern = "Inbox"; - extraConfig.Create = "Near"; - }; - - sent = { - farPattern = "[Gmail]/Sent Mail"; - nearPattern = "Sent"; - extraConfig.Create = "Near"; - }; - - drafts = { - farPattern = "[Gmail]/Drafts"; - nearPattern = "Drafts"; - extraConfig.Create = "Near"; - }; - - junk = { - farPattern = "[Gmail]/Spam"; - nearPattern = "Junk"; - extraConfig.Create = "Near"; - }; - - trash = { - farPattern = "[Gmail]/Trash"; - nearPattern = "Trash"; - extraConfig.Create = "Near"; - }; - }; - }; - }; - - msmtp.enable = true; - aerc.enable = true; - }; - - Outlook = { - address = "devinkid1@outlook.com"; - realName = "Devin Singh"; - - flavor = "outlook.office365.com"; - }; - }; - }; -} diff --git a/hosts/darwin/d-macbook/programs/restray.nix b/hosts/darwin/d-macbook/programs/restray.nix deleted file mode 100644 index 876c9fd..0000000 --- a/hosts/darwin/d-macbook/programs/restray.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ - config, - pkgs, - inputs, - ... -}: { - age.secrets.restray-bluepill-rest = { - file = ../../../../secrets/restray-bluepill-rest.age; - owner = "devin"; - group = "staff"; - }; - age.secrets.restray-onedrive = { - file = ../../../../secrets/restray-onedrive.age; - owner = "devin"; - group = "staff"; - }; - - environment.systemPackages = with pkgs; [ - inputs.restray.packages.${pkgs.system}.default - restic - ]; - - home-manager.sharedModules = [ - inputs.restray.homeManagerModules.default - ]; - - home-manager.users.devin = { - programs.restray = { - enable = true; - gui = { - scheduleDisplay = "last"; - terminal = "Ghostty"; - }; - profiles = { - "bluepill-rest" = { - envFile = config.age.secrets.restray-bluepill-rest.path; - retryLock = "5m"; - schedule = { - cron = "30 * * * *"; - onBattery = true; - backup = true; - prune = true; - check = false; - }; - backup = { - paths = [ - "/Users/devin/Desktop" - "/Users/devin/Documents" - "/Users/devin/Movies" - "/Users/devin/Music" - "/Users/devin/Pictures" - "/Users/devin/Library/Mobile Documents" - ]; - args = ["--skip-if-unchanged" "--one-file-system" "--exclude-caches" "--exclude-cloud-files" "--exclude" "/Users/devin/Music/Logic Pro Library.bundle"]; - }; - prune.args = ["--repack-smaller-than" "64M" "--host" "d-macbook" "--keep-last" "4" "--keep-hourly" "24" "--keep-daily" "14" "--keep-weekly" "4"]; - }; - "onedrive" = { - envFile = config.age.secrets.restray-onedrive.path; - retryLock = "5m"; - schedule = { - cron = "30 0 * * *"; - onBattery = true; - backup = true; - prune = true; - check = false; - }; - backup = { - paths = [ - "/Users/devin/Desktop" - "/Users/devin/Documents" - "/Users/devin/Movies" - "/Users/devin/Music" - "/Users/devin/Pictures" - "/Users/devin/Library/Mobile Documents" - ]; - args = ["--skip-if-unchanged" "--one-file-system" "--exclude-caches" "--exclude-cloud-files" "--exclude" "/Users/devin/Music/Logic Pro Library.bundle"]; - }; - prune.args = ["--repack-smaller-than" "64M" "--host" "d-macbook" "--keep-last" "4" "--keep-daily" "7"]; - }; - }; - }; - }; -} diff --git a/hosts/darwin/d-macbook/users/devin/restray.nix b/hosts/darwin/d-macbook/users/devin/restray.nix new file mode 100644 index 0000000..8dbd550 --- /dev/null +++ b/hosts/darwin/d-macbook/users/devin/restray.nix @@ -0,0 +1,76 @@ +{ + config, + inputs, + pkgs, + ... +}: { + age.secrets.restray-bluepill-rest = { + file = ../../../../../secrets/restray-bluepill-rest.age; + }; + age.secrets.restray-onedrive = { + file = ../../../../../secrets/restray-onedrive.age; + }; + + home.packages = with pkgs; [ + inputs.restray.packages.${pkgs.system}.default + restic + ]; + + imports = [inputs.restray.homeManagerModules.default]; + + programs.restray = { + enable = true; + gui = { + scheduleDisplay = "last"; + terminal = "Ghostty"; + }; + profiles = { + "bluepill-rest" = { + envFile = config.age.secrets.restray-bluepill-rest.path; + retryLock = "5m"; + schedule = { + cron = "30 * * * *"; + onBattery = true; + backup = true; + prune = true; + check = false; + }; + backup = { + paths = [ + "${config.home.homeDirectory}/Desktop" + "${config.home.homeDirectory}/Documents" + "${config.home.homeDirectory}/Movies" + "${config.home.homeDirectory}/Music" + "${config.home.homeDirectory}/Pictures" + "${config.home.homeDirectory}/Library/Mobile Documents" + ]; + args = ["--skip-if-unchanged" "--one-file-system" "--exclude-caches" "--exclude-cloud-files" "--exclude" "${config.home.homeDirectory}/Music/Logic Pro Library.bundle"]; + }; + prune.args = ["--repack-smaller-than" "64M" "--host" "d-macbook" "--keep-last" "4" "--keep-hourly" "24" "--keep-daily" "14" "--keep-weekly" "4"]; + }; + "onedrive" = { + envFile = config.age.secrets.restray-onedrive.path; + retryLock = "5m"; + schedule = { + cron = "30 0 * * *"; + onBattery = true; + backup = true; + prune = true; + check = false; + }; + backup = { + paths = [ + "${config.home.homeDirectory}/Desktop" + "${config.home.homeDirectory}/Documents" + "${config.home.homeDirectory}/Movies" + "${config.home.homeDirectory}/Music" + "${config.home.homeDirectory}/Pictures" + "${config.home.homeDirectory}/Library/Mobile Documents" + ]; + args = ["--skip-if-unchanged" "--one-file-system" "--exclude-caches" "--exclude-cloud-files" "--exclude" "${config.home.homeDirectory}/Music/Logic Pro Library.bundle"]; + }; + prune.args = ["--repack-smaller-than" "64M" "--host" "d-macbook" "--keep-last" "4" "--keep-daily" "7"]; + }; + }; + }; +} diff --git a/hosts/darwin/default.nix b/hosts/darwin/default.nix index b40faac..c3fbb71 100644 --- a/hosts/darwin/default.nix +++ b/hosts/darwin/default.nix @@ -17,6 +17,7 @@ inputs.nixpkgs.lib.mapAttrs ( ) { d-macbook = [ ../../modules/users/devin + ../../modules/users/devin/desktop ]; bluellama = [ diff --git a/modules/common/default.nix b/modules/common/default.nix index caaa22f..e991b67 100644 --- a/modules/common/default.nix +++ b/modules/common/default.nix @@ -1,6 +1,12 @@ -{pkgs, ...}: { +{ + inputs, + pkgs, + ... +}: { age.identityPaths = ["/etc/ssh/ssh_host_ed25519_key"]; + home-manager.extraSpecialArgs = {inherit inputs;}; + nix = { optimise.automatic = true; settings = { diff --git a/modules/users/devin/desktop/default.nix b/modules/users/devin/desktop/default.nix new file mode 100644 index 0000000..26b49a7 --- /dev/null +++ b/modules/users/devin/desktop/default.nix @@ -0,0 +1,11 @@ +{inputs, ...}: { + home-manager.users.devin = {config, ...}: { + age.identityPaths = [ + "${config.home.homeDirectory}/.config/age/keys.txt" + ]; + imports = [ + inputs.agenix.homeManagerModules.default + ./mail.nix + ]; + }; +} diff --git a/modules/users/devin/desktop/mail.nix b/modules/users/devin/desktop/mail.nix new file mode 100644 index 0000000..90cba12 --- /dev/null +++ b/modules/users/devin/desktop/mail.nix @@ -0,0 +1,201 @@ +{ + config, + lib, + pkgs, + ... +}: { + age.secrets.mail-gmail = { + file = ../../../../secrets/mail-gmail.age; + }; + + age.secrets.mail-icloud = { + file = ../../../../secrets/mail-icloud.age; + }; + + systemd.user.services.mbsync-mail = lib.mkIf pkgs.stdenv.isLinux { + Unit = { + Description = "Synchronize mail with mbsync"; + }; + Service = { + Type = "oneshot"; + ExecStart = "${pkgs.isync}/bin/mbsync iCloud Gmail"; + Environment.HOME = config.home.homeDirectory; + }; + }; + + systemd.user.timers.mbsync-mail = lib.mkIf pkgs.stdenv.isLinux { + Unit = { + Description = "Synchronize mail with mbsync periodically"; + }; + Timer = { + OnBootSec = "1m"; + OnUnitActiveSec = "15m"; + Unit = "mbsync-mail.service"; + }; + Install.WantedBy = ["timers.target"]; + }; + + launchd.agents.mbsync-mail = lib.mkIf pkgs.stdenv.isDarwin { + enable = true; + config = { + ProgramArguments = [ + "${pkgs.isync}/bin/mbsync" + "iCloud" + "Gmail" + ]; + + RunAtLoad = true; + StartInterval = 900; + + StandardOutPath = "${config.home.homeDirectory}/Library/Logs/mbsync-mail.out.log"; + StandardErrorPath = "${config.home.homeDirectory}/Library/Logs/mbsync-mail.err.log"; + + EnvironmentVariables.HOME = config.home.homeDirectory; + }; + }; + + programs.mbsync.enable = true; + programs.msmtp.enable = true; + + programs.aerc = { + enable = true; + + extraConfig = { + general = { + unsafe-accounts-conf = true; + }; + + ui = { + sort = "-r date"; + }; + + viewer = { + alternatives = "text/html,text/plain"; + pager = "${pkgs.less}/bin/less -R"; + }; + + filters = { + "text/plain" = "${pkgs.coreutils}/bin/cat"; + "text/html" = "${pkgs.elinks}/bin/elinks -dump"; + }; + }; + }; + + accounts.email.maildirBasePath = "Mail"; + + accounts.email.accounts = { + iCloud = { + primary = true; + + address = "devin@devins.page"; + realName = "Devin Singh"; + + userName = "devinkid1@icloud.com"; + passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.mail-icloud.path}"; + + imap.host = "imap.mail.me.com"; + imap.port = 993; + smtp.host = "smtp.mail.me.com"; + smtp.port = 587; + + mbsync = { + enable = true; + + groups.iCloud = { + channels = { + inbox = { + farPattern = "INBOX"; + nearPattern = "Inbox"; + extraConfig.Create = "Near"; + }; + + sent = { + farPattern = "Sent Messages"; + nearPattern = "Sent"; + extraConfig.Create = "Near"; + }; + + drafts = { + farPattern = "Drafts"; + nearPattern = "Drafts"; + extraConfig.Create = "Near"; + }; + + junk = { + farPattern = "Junk"; + nearPattern = "Junk"; + extraConfig.Create = "Near"; + }; + + trash = { + farPattern = "Deleted Messages"; + nearPattern = "Trash"; + extraConfig.Create = "Near"; + }; + }; + }; + }; + + msmtp.enable = true; + aerc.enable = true; + }; + + Gmail = { + address = "devinkid1@gmail.com"; + realName = "Devin Singh"; + + userName = "devinkid1@gmail.com"; + passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets.mail-gmail.path}"; + + flavor = "gmail.com"; + + mbsync = { + enable = true; + + groups.Gmail = { + channels = { + inbox = { + farPattern = "INBOX"; + nearPattern = "Inbox"; + extraConfig.Create = "Near"; + }; + + sent = { + farPattern = "[Gmail]/Sent Mail"; + nearPattern = "Sent"; + extraConfig.Create = "Near"; + }; + + drafts = { + farPattern = "[Gmail]/Drafts"; + nearPattern = "Drafts"; + extraConfig.Create = "Near"; + }; + + junk = { + farPattern = "[Gmail]/Spam"; + nearPattern = "Junk"; + extraConfig.Create = "Near"; + }; + + trash = { + farPattern = "[Gmail]/Trash"; + nearPattern = "Trash"; + extraConfig.Create = "Near"; + }; + }; + }; + }; + + msmtp.enable = true; + aerc.enable = true; + }; + + Outlook = { + address = "devinkid1@outlook.com"; + realName = "Devin Singh"; + + flavor = "outlook.office365.com"; + }; + }; +} diff --git a/secrets/draupnir-at.age b/secrets/draupnir-at.age index 2724677..9749d52 100644 --- a/secrets/draupnir-at.age +++ b/secrets/draupnir-at.age @@ -1,7 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 BB/f2A fqm+zBnKdyxRE5FQImvaZ5xeJ4YwjyocSG66NeYBEVk -bRCxgFU74HTdXbypip0h6s/xpfaczuxXVIpW6AgMbu4 --> ssh-ed25519 VQdGGQ bXTRb6bpWA0z2R6Kg+GZlrJJ+dv3alK5L058T8LC7w8 -inJ+xGeaHE1ieB0iq70AnCzbGBFjfdzwoSEhgen/c3w ---- 9EhiVjBie8/k1G4uHKTV/uUNTPJgwMmTZanZ2eywIC4 -����!����Dm�>���8&o�%D�+E&���a���mk�J�� ��ؾ)C�ȱ���,^ \ No newline at end of file +-> ssh-ed25519 BB/f2A WVW6cZy0FQ1ybwvYnZyCp0V5iv+07la2cywdFkdrpHA +RNQeBdzGm8vlkIPDKriUhBUOF1TCPz2ecDxzp0jvCwI +-> ssh-ed25519 VQdGGQ 2WK7d3A6yxIcLb76jpY1iFLft56AdLGFbpgpJCtYFx4 +Hs57PqG0lctmQeCnPdLepADi3ZxfxN3F4ceRFdvbbdo +--- F8ELapgXsmIs/7OceHABd8RQ7MC6/a4YZZkGjjHEje0 +����� ��͢v�����o�����Y'�����F�+����qѪ��F� �J�A�^�� ���� \ No newline at end of file diff --git a/secrets/mail-gmail.age b/secrets/mail-gmail.age index 29def62..44612e9 100644 --- a/secrets/mail-gmail.age +++ b/secrets/mail-gmail.age @@ -1,5 +1,5 @@ age-encryption.org/v1 --> ssh-ed25519 VQdGGQ 3gUuO7bTQ2IB54d1gNJRH2lQyGIYbTeONmhfSkfYWQ0 -y0U0GFkj1MwxmiAYWlM/z0WxzL6guK7LEAggwyH/hAA ---- EnIyA5TLQbd9h+hQUXoUI7Y3AlKXtvuDItNSvvEhGcw -V���_^R�t��se�/1� 0��Ӏ�WA�L]�����2zy�B�TO� \ No newline at end of file +-> X25519 9PgWkgsCbdClyanXdZTDz5K1IL+tUgQIqSz2a9X7PXI +bVWhw5paLSGU/pqxUuQjm+l/bxh7JwDTCBl8GXAvXAE +--- ZOrX1A4T64blu2Fe/VqCNmzUYYeKIjpt3ppI9aRcsSY +��g�L��:�d����R�'����L��I��5��<��ˉ�c"Bx�4y \ No newline at end of file diff --git a/secrets/mail-icloud.age b/secrets/mail-icloud.age index 90cac1a..9531475 100644 --- a/secrets/mail-icloud.age +++ b/secrets/mail-icloud.age @@ -1,5 +1,6 @@ age-encryption.org/v1 --> ssh-ed25519 VQdGGQ aCqmShCRG11l+bZOh9WLZsnRPB89xXzBj234Q+ft/ms -0CYOb1/B7KFRL0MSy/SIsIsXHBHC4AyqaJWulqPsbfM ---- GHDUhxorO0ySbjsGPq6TH8V3PRzt8Mm6kdigECa5FYU -�ם��6ͷ��R�w��ֳ��΂�~mօQO��sg�w�k��&�Vu��S���� \ No newline at end of file +-> X25519 vNFBqtB4SCzdpsYHFf9W9Q0mcuIw6R6x0yDbf/19Y1Q +ZWR7+/0jHZBsfWovDO8y0RW95nNU3sa2QzApEoImZPU +--- UuvPDOWkaK3YZKaviw9MsaiJA4uU/0uKHFqEi8dM1ug +=�mZ���Cڵ���Zs9�Vg�q}>)�=$yMˢ ++js#y9ݯ�>)}� \ No newline at end of file diff --git a/secrets/msmtp.age b/secrets/msmtp.age index 7a4848ed8ec198408c524dc856211671761b6075..56d2ccbf9a58dff44ab35cadd25a988acd479181 100644 GIT binary patch delta 303 zcmcb_bctz#PJKwQU#fGazqd z0av+pV7O(nQ$&7MS%rawsdr4|qqG_m6a!yKxCzr0BLUD11 zZfc5=si~o*LResmyL+I5sar^Zw~?W7PC;RCV3J8>X1!-gX=IdzPg+4(Qh9N4qJN=< zb6HiHc~(v+S9wLLc6yR`NTPeFd0<9WWOi_-MNU#ds#i*4a#ChuVp60_afol3ql-^E zm#(g^f~BExMrue%lzU-XiJPxSQi!%iM44-3N`$^)sYO+hd0}`~zMp%3XkkD(S89K1 zUfZN^P8vV;n?o+CdTsob+T#AaJ$vC-7RPJm{$C`yjy}KecY38|Nv^(jxs#irdw!a$X<1N6L6LE` zE0B zijQZ8d$D^tS4Ch@R%k$OhM`4exVvw#UxvG@lYT*!Uxl%OuZdA^fp0-dj+sYhl)tAV zm#(g^f?2S>qkcwUg>!IvWu|AKr*>p7a$uHsNkO7nL8wzen6qV>c4ksK7k~7J z(midJ*EEW>LcI6OzwO>OsbtM2rtJ)yxB1C$+%oOXIhFZctOp*Jn$6&UzvJ#>ZUCrP BX(j*w diff --git a/secrets/navidrome.age b/secrets/navidrome.age index d620bb080b57b5d4f4a12c4a3ff0aaaf5803b454..b8e836049e31cd680f95df1d3267d04a5dd1e930 100644 GIT binary patch delta 523 zcmZ3(vW8`XPQ6EQrKgKwZdIzeX=rG6xj~6>iL-NJuA^&yR9IPJkdJegeo|OQs9%0o zAeVV&aFu_qS6OyyRiJlPie;utNky=)t3jrzYfz#=T5_aMnoF>6Xl0INGMBEMLUD11 zZfc5=si~o*LResmyL+I5OL}0LPo7tfMRHh@Wl?~$d40M|R7i++nYL%COOdH}acNkJ ze_^?IzI%=%S7Mc`o1baEZ;7^3hCzvTRH%1RS(!H4>&g&0_cQTU8Sd1qWYz_VT>#~)qu;R>5 zIZWb4c=m=A3gQ9J0`7I`a1e%%*NN5F{i^!t-kFtb6IuiT8f3< zit~bVo_3q4a0>=KU|aaj$jb0e%jb=Tq5D!Yk7b@S=Pl)EtvBMa(}JFzCqdwAAS5a}WQ#(!I7eCbr{s4FBS`x a7wng*p7ift!#(@`>PrT3EbZTaO$7ia^xGl; delta 523 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 delta 2564 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 diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 170a634..df8da41 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -2,8 +2,8 @@ let bluepill = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMlO7ODA+//BwvI4IEr+7vTgVTQl1rvs/DMr67F6Ztr4"; bluepill-proxy = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJl9k6d9zNhRAFv1cnSHEZ3i4qSLOnzE4ekHxMuRdkhi"; d-macbook = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIExg7LMVUJNVIZrUXRMIDgK70IjlG/fZG3hgTR20sEu6"; + devin = "age1reah3h72zsk29ahhd0eskyque2s3exjvpt695mrytc6wqzetpcdqqr758y"; in { - "bluesky-pds.age".publicKeys = [bluepill d-macbook]; "draupnir-at.age".publicKeys = [bluepill d-macbook]; "msmtp.age".publicKeys = [bluepill d-macbook]; "navidrome.age".publicKeys = [bluepill d-macbook]; @@ -11,9 +11,9 @@ in { "tranquil-pds.age".publicKeys = [bluepill d-macbook]; "transmission.age".publicKeys = [bluepill d-macbook]; - "restray-bluepill-rest.age".publicKeys = [bluepill d-macbook]; - "restray-onedrive.age".publicKeys = [bluepill d-macbook]; + "restray-bluepill-rest.age".publicKeys = [bluepill devin]; + "restray-onedrive.age".publicKeys = [bluepill devin]; - "mail-gmail.age".publicKeys = [d-macbook]; - "mail-icloud.age".publicKeys = [d-macbook]; + "mail-gmail.age".publicKeys = [devin]; + "mail-icloud.age".publicKeys = [devin]; } diff --git a/secrets/slskd.age b/secrets/slskd.age index 0a4a92e32d7d75dccef25b566198c3b3a8e3e6f4..d51274be4496fe86cf724d9b88deef7d73ecac56 100644 GIT binary patch delta 397 zcmZ3_yq>!F7l19@W>~H!m_QnfRyR z@Fq^SuSW5npHBTbwyE;Rr2GYI*XQdlt~`|VgdeT{*!z9ezSXDdUj^3%Wpz)?+4(|kTE@>yYuR3MSH7uy3jjzjp}YV9 delta 397 zcmZ3_yqk=XSi`tT4`C5MM+9FSGUcJ znz$ebrh295{hv-JZ%fMjq*yKSSt()vjLw34_1#0foXDij#p5)zKe0DPf$jocWA12xVdwdM_OK3u}PpwMR=fPQCLWZ1(&X!LUD11 zZfc5=si~o*LResmyL+I5ewby6TWXq5rf0T)l(|!7Wxat{lxs$ISZ2DBN3v&em41a~ zQiz|AVRmLdm!+YhXiE~+TM5T8+SE=Hq zw5L|ON9$G0BD6SUK5e>wT_Ex^kIch#!=UQAYQ|3-R|OJH*z-w*h+Klou&s^D^2CRpp(l@zThnKQ1zFhqR0DC#jTL1t6 delta 516 zcmZ3+vW#VdPJN}Jf24;^n0`=-zpGJHXl1TXh^fB0 zk8y=-P_l~!SDL%CMR~Dll2bvBSBXKWzJ5iqn^$sxxqhK}hl{QDU}FMVh}$pkJ7QOM!PlaEe!sZ;5Muu&ZlIV7ayd7ss_7 zYjiJgdDUO?lAUuyBO~DCO0jnLpo@pLCVIv&-92!itno`r6ko(cUIFWqjkb&XIlonL ze*ZtK;lAmM-fLXP%BMRol}m3a-Y>Xx%Q@%CyBTb~3zb-+PC-jX{EhSkzhRaYwCS{vCs22)n*iEozRopc&zruRpGK~ zEpgT(%kmvu%}=;LyFYiYm!xuxfPZi}n(%B-()Q{$$Xc||-qs`KFAG?9~Ss>d%byLy1}zs|48 S(ueFPm^#=xudIB;A_4%gBGHZj diff --git a/secrets/transmission.age b/secrets/transmission.age index 1de60e9df6cbc455a86ced480497c48c2f82724a..b4075549fc1988f0bdad956d2bf3db92f5fbefa1 100644 GIT binary patch delta 316 zcmcc5bf0O0PQ68#aiXJRK}ddpVVGZTs#B>&NpfL;Yp8cgxVDovPYnsnV*?OT3&Xtx21EUhoMPEWng$|c1cxbzJ+NrmxZR? zI(E<9R;GO6dzHI=uVj3A)Yl}xV4`rjcgu`rPS{XecG$M OV5wH1PsLsaGfn{A1Z@WZ delta 316 zcmcc5bf0O0PJO1gqkn*ti?5qwdP+`Icv+R1o1c?YNo1*hYGPGowzr8%p|^i=woj<3L7`VbI+w1ULUD11 zZfc5=si~o*LResmyL+I5S&>0SX?j&bnzv^UxayNma#{EQKDm(cBO|= zMp%GFnMJq-mv^amuC_^5ih;Rdn0csvYFTMkR%(g9L9&T!dX%4Qd6;&PsbOVedAeUd zm#(g^f{~|Dk++etqj!0grE|G+l95|lx?_k(j+vWBL}k8fnPsYLMY6tMezuP*SDIi& zhoDvS4^x+GqW!H(HSgQi{vTiDofRDRGPCphU+yJq7rKiE@>^~-UXmrYly~Dy3zlUo OydKo;*}9sez7GKSux;4@ -- 2.51.2