From a85615d0f43f91d36aeaadb5baf58b0174b40d77 Mon Sep 17 00:00:00 2001 From: Swarsel Date: Mon, 16 Dec 2024 15:28:52 +0100 Subject: [PATCH] feat: freshrss and minor adjustments --- SwarselSystems.org | 134 ++++++++++++++-------------- hosts/nixos/nbl-imba-2/default.nix | 1 + hosts/nixos/sync/default.nix | 1 - hosts/nixos/winters/default.nix | 1 + modules/home/nixos.nix | 4 + modules/nixos/setup.nix | 1 + profiles/common/home/programs.nix | 7 +- profiles/common/home/sops.nix | 2 +- profiles/common/home/zsh.nix | 9 +- profiles/server/nixos/default.nix | 1 + profiles/server/nixos/emacs.nix | 17 ---- profiles/server/nixos/freshrss.nix | 36 ++++++++ programs/emacs/init.el | 62 +++---------- secrets/general/secrets.yaml | 5 +- secrets/server/winters/secrets.yaml | 6 +- secrets/sync/secrets.yaml | 4 +- 16 files changed, 142 insertions(+), 149 deletions(-) create mode 100644 profiles/server/nixos/freshrss.nix diff --git a/SwarselSystems.org b/SwarselSystems.org index 11724c80..1fa7afb1 100644 --- a/SwarselSystems.org +++ b/SwarselSystems.org @@ -1396,6 +1396,7 @@ My work machine. Built for more security, this is the gold standard of my config isLaptop = true; isNixos = true; isBtrfs = true; + flakePath = "/home/swarsel/.dotfiles"; # temperatureHwmon = { # isAbsolutePath = true; # path = "/sys/devices/platform/thinkpad_hwmon/hwmon/"; @@ -1596,6 +1597,7 @@ My work machine. Built for more security, this is the gold standard of my config transmission = true; syncthing = true; monitoring = true; + freshrss = true; }; }; @@ -1815,7 +1817,6 @@ This machine mainly acts as an external sync helper. It manages the following th enable = true; forgejo = true; ankisync = true; - emacs = true; }; }; @@ -2842,6 +2843,7 @@ I usually use =mutableUsers = false= in my NixOS configuration. However, on a ne options.swarselsystems.server.emacs = lib.mkEnableOption "enable emacs server on server"; options.swarselsystems.server.forgejo = lib.mkEnableOption "enable forgejo on server"; options.swarselsystems.server.ankisync = lib.mkEnableOption "enable ankisync on server"; + options.swarselsystems.server.freshrss = lib.mkEnableOption "enable freshrss on server"; } #+end_src @@ -3130,6 +3132,10 @@ These are some extra options that will be used if the machine also runs NixOS. F #+begin_src nix :noweb yes :tangle modules/home/nixos.nix { lib, config, ... }: { + options.swarselsystems.flakePath = lib.mkOption { + type = lib.types.str; + default = ""; + }; options.swarselsystems.isNixos = lib.mkEnableOption "nixos host"; config.swarselsystems.startup = lib.mkIf (!config.swarselsystems.isNixos) [ { @@ -5079,6 +5085,7 @@ Also, the system state version is set here. No need to touch it. ./emacs.nix ./forgejo.nix ./ankisync.nix + ./freshrss.nix ]; } #+end_src @@ -6606,20 +6613,44 @@ Here we just define some aliases for rebuilding the system, and we allow some in startWithGraphical = false; }; + }; + + } +#+end_src + +**** FreshRSS + +#+begin_src nix :tangle profiles/server/nixos/freshrss.nix + { lib, config, ... }: + { + config = lib.mkIf config.swarselsystems.server.freshrss { + + users.users.freshrss = { + extraGroups = [ "users" ]; + group = "freshrss"; + isSystemUser = true; + }; + + users.groups.freshrss = {}; + + sops.secrets.fresh = { owner = "freshrss"; }; + + services.freshrss = { + enable = true; + virtualHost = "signpost.swarsel.win"; + baseUrl = "https://signpost.swarsel.win"; + # authType = "none"; + dataDir = "/Vault/data/tt-rss"; + defaultUser = "Swarsel"; + passwordFile = config.sops.secrets.fresh.path; + }; + services.nginx = { virtualHosts = { "signpost.swarsel.win" = { - enableACME = false; - forceSSL = false; + enableACME = true; + forceSSL = true; acmeRoot = null; - locations = { - "/" = { - proxyPass = "http://localhost:9812"; - extraConfig = '' - client_max_body_size 0; - ''; - }; - }; }; }; }; @@ -7490,7 +7521,7 @@ I use sops-nix to handle secrets that I want to have available on my machines at leon = { path = "/run/user/1000/secrets/leon"; }; swarselmail = { path = "/run/user/1000/secrets/swarselmail"; }; github_notif = { path = "/run/user/1000/secrets/github_notif"; }; - # caldav = { path = "${config.home.homeDirectory}/.emacs.d/.caldav"; }; + fever = { path = "${config.home.homeDirectory}/.emacs.d/.fever"; }; }; }; } @@ -7744,13 +7775,16 @@ Sets environment variables. Here I am only setting the EDITOR variable, most var This section is for programs that require no further configuration. zsh Integration is enabled by default for these. #+begin_src nix :tangle profiles/common/home/programs.nix - _: + { pkgs, ... }: { programs = { bottom.enable = true; imv.enable = true; sioyek.enable = true; - bat.enable = true; + bat = { + enable = true; + extraPackages = with pkgs.bat-extras; [ batdiff batman batgrep batwatch ]; + }; carapace.enable = true; wlogout.enable = true; swayr.enable = true; @@ -8085,10 +8119,9 @@ Here we set some aliases (some of them should be shellApplications instead) as w shellAliases = lib.recursiveUpdate { hg = "history | grep"; - hmswitch = "cd ~/.dotfiles; home-manager --flake .#$(whoami)@$(hostname) switch; cd -;"; - nswitch = "cd ~/.dotfiles; sudo nixos-rebuild --flake .#$(hostname) switch; cd -;"; - nswitch-stay = "cd ~/.dotfiles; git restore flake.lock; sudo nixos-rebuild --flake .#$(hostname) switch; cd -;"; - edithome = "e -w ~/.dotfiles/SwarselSystems.org"; + hmswitch = "home-manager --flake ${config.swarselsystems.flakePath}#$(whoami)@$(hostname) switch"; + nswitch = "sudo nixos-rebuild --flake ${config.swarselsystems.flakePath}#$(hostname) switch"; + nboot = "sudo nixos-rebuild --flake ${config.swarselsystems.flakePath}#$(hostname) boot"; magit = "emacsclient -nc -e \"(magit-status)\""; config = "git --git-dir=$HOME/.cfg/ --work-tree=$HOME"; g = "git"; @@ -8097,6 +8130,8 @@ Here we set some aliases (some of them should be shellApplications instead) as w passpull = "cd ~/.local/share/password-store; git pull; cd -;"; hotspot = "nmcli connection up local; nmcli device wifi hotspot;"; cd = "z"; + cd-orig = "cd"; + cat-orig = "cat"; cdr = "cd \"$( (find /home/swarsel/Documents/GitHub -maxdepth 1 && echo /home/swarsel/.dotfiles) | fzf )\""; nix-ldd = "LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH ldd"; fs-diff = "sudo mount -o subvol=/ /dev/mapper/cryptroot /mnt ; fs-diff"; @@ -12374,64 +12409,26 @@ This mode is not automatically activated anywhere because I only rarely need it. #+begin_src emacs-lisp - ;; (setq elfeed-feeds - ;; '("https://www.coindesk.com/arc/outboundfeeds/rss/" - ;; "https://feed.phenx.de/lootscraper_gog_game.xml" - ;; "https://feed.phenx.de/lootscraper_ubisoft_game.xml" - ;; "https://hnrss.org/frontpage" - ;; "https://www.derstandard.at/rss/inland" - ;; "https://www.derstandard.at/rss/international" - ;; "https://www.derstandard.at/rss/kultur" - ;; "https://www.derstandard.at/rss/wissenschaft" - ;; "https://www.rfc-editor.org/rfcrss.xml" - ;; "https://waitbutwhy.com/feed" - ;; "https://steamcommunity.com/groups/freegamesfinders/rss/")) - - (use-package elfeed - :ensure t - :bind (:map elfeed-search-mode-map - ; ("A" . bjm/elfeed-show-all) - ; ("E" . bjm/elfeed-show-emacs) - ; ("D" . bjm/elfeed-show-daily) - ("q" . bjm/elfeed-save-db-and-bury))) - - - (require 'elfeed) - - ;; Load elfeed-org - (use-package elfeed-org - :config - (elfeed-org) - (setq rmh-elfeed-org-files (list "~/.elfeed/elfeed.org")) - ) + (use-package elfeed) (use-package elfeed-goodies) (elfeed-goodies/setup) - (use-package elfeed-web) - - ;;functions to support syncing .elfeed between machines - ;;makes sure elfeed reads index from disk before launching - (defun bjm/elfeed-load-db-and-open () - "Wrapper to load the elfeed db from disk before opening" - (interactive) - (elfeed-db-load) - (elfeed) - (elfeed-search-update--force) - (elfeed-update)) - - ;;write to disk when quiting - (defun bjm/elfeed-save-db-and-bury () - "Wrapper to save the elfeed db to disk before burying buffer" - (interactive) - (elfeed-db-save) - (quit-window)) - (setq elfeed-db-directory "~/.elfeed/db/") - (global-set-key (kbd "C-c w") 'bjm/elfeed-load-db-and-open) + (use-package elfeed-protocol + :after elfeed) + (elfeed-protocol-enable) + (setq elfeed-use-curl t) + (setq elfeed-set-timeout 36000) + (setq elfeed-protocol-enabled-protocols '(fever)) + (setq elfeed-protocol-fever-update-unread-only t) + (setq elfeed-protocol-fever-fetch-category-as-tag t) + (setq elfeed-protocol-feeds '(("fever+https://Swarsel@signpost.swarsel.win" + :api-url "https://signpost.swarsel.win/api/fever.php" + :password-file "~/.emacs.d/.fever"))) (define-key elfeed-show-mode-map (kbd ";") 'visual-fill-column-mode) (define-key elfeed-show-mode-map (kbd "j") 'elfeed-goodies/split-show-next) @@ -12442,6 +12439,7 @@ This mode is not automatically activated anywhere because I only rarely need it. #+end_src + *** darkroom :PROPERTIES: :CUSTOM_ID: h:94d4a0dc-b0d7-4702-b760-beeaa6da2b8f diff --git a/hosts/nixos/nbl-imba-2/default.nix b/hosts/nixos/nbl-imba-2/default.nix index 5c26295e..dede7ab4 100644 --- a/hosts/nixos/nbl-imba-2/default.nix +++ b/hosts/nixos/nbl-imba-2/default.nix @@ -90,6 +90,7 @@ in isLaptop = true; isNixos = true; isBtrfs = true; + flakePath = "/home/swarsel/.dotfiles"; # temperatureHwmon = { # isAbsolutePath = true; # path = "/sys/devices/platform/thinkpad_hwmon/hwmon/"; diff --git a/hosts/nixos/sync/default.nix b/hosts/nixos/sync/default.nix index a6faf931..cbfb8cfe 100644 --- a/hosts/nixos/sync/default.nix +++ b/hosts/nixos/sync/default.nix @@ -86,7 +86,6 @@ in enable = true; forgejo = true; ankisync = true; - emacs = true; }; }; diff --git a/hosts/nixos/winters/default.nix b/hosts/nixos/winters/default.nix index 6215b88b..725adf91 100644 --- a/hosts/nixos/winters/default.nix +++ b/hosts/nixos/winters/default.nix @@ -63,6 +63,7 @@ in transmission = true; syncthing = true; monitoring = true; + freshrss = true; }; }; diff --git a/modules/home/nixos.nix b/modules/home/nixos.nix index f4cbd9d8..b5bbd596 100644 --- a/modules/home/nixos.nix +++ b/modules/home/nixos.nix @@ -1,5 +1,9 @@ { lib, config, ... }: { + options.swarselsystems.flakePath = lib.mkOption { + type = lib.types.str; + default = ""; + }; options.swarselsystems.isNixos = lib.mkEnableOption "nixos host"; config.swarselsystems.startup = lib.mkIf (!config.swarselsystems.isNixos) [ { diff --git a/modules/nixos/setup.nix b/modules/nixos/setup.nix index 7f7fa569..46b63e2d 100644 --- a/modules/nixos/setup.nix +++ b/modules/nixos/setup.nix @@ -31,4 +31,5 @@ in options.swarselsystems.server.emacs = lib.mkEnableOption "enable emacs server on server"; options.swarselsystems.server.forgejo = lib.mkEnableOption "enable forgejo on server"; options.swarselsystems.server.ankisync = lib.mkEnableOption "enable ankisync on server"; + options.swarselsystems.server.freshrss = lib.mkEnableOption "enable freshrss on server"; } diff --git a/profiles/common/home/programs.nix b/profiles/common/home/programs.nix index 2d8fe844..be8bac86 100644 --- a/profiles/common/home/programs.nix +++ b/profiles/common/home/programs.nix @@ -1,10 +1,13 @@ -_: +{ pkgs, ... }: { programs = { bottom.enable = true; imv.enable = true; sioyek.enable = true; - bat.enable = true; + bat = { + enable = true; + extraPackages = with pkgs.bat-extras; [ batdiff batman batgrep batwatch ]; + }; carapace.enable = true; wlogout.enable = true; swayr.enable = true; diff --git a/profiles/common/home/sops.nix b/profiles/common/home/sops.nix index 6c70f8a4..c02bd140 100644 --- a/profiles/common/home/sops.nix +++ b/profiles/common/home/sops.nix @@ -17,7 +17,7 @@ in leon = { path = "/run/user/1000/secrets/leon"; }; swarselmail = { path = "/run/user/1000/secrets/swarselmail"; }; github_notif = { path = "/run/user/1000/secrets/github_notif"; }; - # caldav = { path = "${config.home.homeDirectory}/.emacs.d/.caldav"; }; + fever = { path = "${config.home.homeDirectory}/.emacs.d/.fever"; }; }; }; } diff --git a/profiles/common/home/zsh.nix b/profiles/common/home/zsh.nix index 0189c0c2..7e342e0c 100644 --- a/profiles/common/home/zsh.nix +++ b/profiles/common/home/zsh.nix @@ -5,10 +5,9 @@ shellAliases = lib.recursiveUpdate { hg = "history | grep"; - hmswitch = "cd ~/.dotfiles; home-manager --flake .#$(whoami)@$(hostname) switch; cd -;"; - nswitch = "cd ~/.dotfiles; sudo nixos-rebuild --flake .#$(hostname) switch; cd -;"; - nswitch-stay = "cd ~/.dotfiles; git restore flake.lock; sudo nixos-rebuild --flake .#$(hostname) switch; cd -;"; - edithome = "e -w ~/.dotfiles/SwarselSystems.org"; + hmswitch = "home-manager --flake ${config.swarselsystems.flakePath}#$(whoami)@$(hostname) switch"; + nswitch = "sudo nixos-rebuild --flake ${config.swarselsystems.flakePath}#$(hostname) switch"; + nboot = "sudo nixos-rebuild --flake ${config.swarselsystems.flakePath}#$(hostname) boot"; magit = "emacsclient -nc -e \"(magit-status)\""; config = "git --git-dir=$HOME/.cfg/ --work-tree=$HOME"; g = "git"; @@ -17,6 +16,8 @@ passpull = "cd ~/.local/share/password-store; git pull; cd -;"; hotspot = "nmcli connection up local; nmcli device wifi hotspot;"; cd = "z"; + cd-orig = "cd"; + cat-orig = "cat"; cdr = "cd \"$( (find /home/swarsel/Documents/GitHub -maxdepth 1 && echo /home/swarsel/.dotfiles) | fzf )\""; nix-ldd = "LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH ldd"; fs-diff = "sudo mount -o subvol=/ /dev/mapper/cryptroot /mnt ; fs-diff"; diff --git a/profiles/server/nixos/default.nix b/profiles/server/nixos/default.nix index 2cd2b729..01692397 100644 --- a/profiles/server/nixos/default.nix +++ b/profiles/server/nixos/default.nix @@ -36,5 +36,6 @@ in ./emacs.nix ./forgejo.nix ./ankisync.nix + ./freshrss.nix ]; } diff --git a/profiles/server/nixos/emacs.nix b/profiles/server/nixos/emacs.nix index 1e123429..88201a64 100644 --- a/profiles/server/nixos/emacs.nix +++ b/profiles/server/nixos/emacs.nix @@ -10,23 +10,6 @@ startWithGraphical = false; }; - services.nginx = { - virtualHosts = { - "signpost.swarsel.win" = { - enableACME = false; - forceSSL = false; - acmeRoot = null; - locations = { - "/" = { - proxyPass = "http://localhost:9812"; - extraConfig = '' - client_max_body_size 0; - ''; - }; - }; - }; - }; - }; }; } diff --git a/profiles/server/nixos/freshrss.nix b/profiles/server/nixos/freshrss.nix new file mode 100644 index 00000000..0e42e15e --- /dev/null +++ b/profiles/server/nixos/freshrss.nix @@ -0,0 +1,36 @@ +{ lib, config, ... }: +{ + config = lib.mkIf config.swarselsystems.server.freshrss { + + users.users.freshrss = { + extraGroups = [ "users" ]; + group = "freshrss"; + isSystemUser = true; + }; + + users.groups.freshrss = { }; + + sops.secrets.fresh = { owner = "freshrss"; }; + + services.freshrss = { + enable = true; + virtualHost = "signpost.swarsel.win"; + baseUrl = "https://signpost.swarsel.win"; + # authType = "none"; + dataDir = "/Vault/data/tt-rss"; + defaultUser = "Swarsel"; + passwordFile = config.sops.secrets.fresh.path; + }; + + services.nginx = { + virtualHosts = { + "signpost.swarsel.win" = { + enableACME = true; + forceSSL = true; + acmeRoot = null; + }; + }; + }; + }; + +} diff --git a/programs/emacs/init.el b/programs/emacs/init.el index 52d6540c..de87fe27 100644 --- a/programs/emacs/init.el +++ b/programs/emacs/init.el @@ -1251,64 +1251,26 @@ create a new one." (setq olivetti-body-width 100) (setq olivetti-recall-visual-line-mode-entry-state t)) -;; (setq elfeed-feeds -;; '("https://www.coindesk.com/arc/outboundfeeds/rss/" -;; "https://feed.phenx.de/lootscraper_gog_game.xml" -;; "https://feed.phenx.de/lootscraper_ubisoft_game.xml" -;; "https://hnrss.org/frontpage" -;; "https://www.derstandard.at/rss/inland" -;; "https://www.derstandard.at/rss/international" -;; "https://www.derstandard.at/rss/kultur" -;; "https://www.derstandard.at/rss/wissenschaft" -;; "https://www.rfc-editor.org/rfcrss.xml" -;; "https://waitbutwhy.com/feed" -;; "https://steamcommunity.com/groups/freegamesfinders/rss/")) - -(use-package elfeed - :ensure t - :bind (:map elfeed-search-mode-map - ; ("A" . bjm/elfeed-show-all) - ; ("E" . bjm/elfeed-show-emacs) - ; ("D" . bjm/elfeed-show-daily) - ("q" . bjm/elfeed-save-db-and-bury))) - - -(require 'elfeed) - -;; Load elfeed-org -(use-package elfeed-org - :config - (elfeed-org) - (setq rmh-elfeed-org-files (list "~/.elfeed/elfeed.org")) - ) +(use-package elfeed) (use-package elfeed-goodies) (elfeed-goodies/setup) -(use-package elfeed-web) - -;;functions to support syncing .elfeed between machines -;;makes sure elfeed reads index from disk before launching -(defun bjm/elfeed-load-db-and-open () - "Wrapper to load the elfeed db from disk before opening" - (interactive) - (elfeed-db-load) - (elfeed) - (elfeed-search-update--force) - (elfeed-update)) - -;;write to disk when quiting -(defun bjm/elfeed-save-db-and-bury () - "Wrapper to save the elfeed db to disk before burying buffer" - (interactive) - (elfeed-db-save) - (quit-window)) - (setq elfeed-db-directory "~/.elfeed/db/") -(global-set-key (kbd "C-c w") 'bjm/elfeed-load-db-and-open) +(use-package elfeed-protocol + :after elfeed) +(elfeed-protocol-enable) +(setq elfeed-use-curl t) +(setq elfeed-set-timeout 36000) +(setq elfeed-protocol-enabled-protocols '(fever)) +(setq elfeed-protocol-fever-update-unread-only t) +(setq elfeed-protocol-fever-fetch-category-as-tag t) +(setq elfeed-protocol-feeds '(("fever+https://Swarsel@signpost.swarsel.win" + :api-url "https://signpost.swarsel.win/api/fever.php" + :password-file "~/.emacs.d/.fever"))) (define-key elfeed-show-mode-map (kbd ";") 'visual-fill-column-mode) (define-key elfeed-show-mode-map (kbd "j") 'elfeed-goodies/split-show-next) diff --git a/secrets/general/secrets.yaml b/secrets/general/secrets.yaml index 9bdb063b..4501047f 100644 --- a/secrets/general/secrets.yaml +++ b/secrets/general/secrets.yaml @@ -2,6 +2,7 @@ mrswarsel: ENC[AES256_GCM,data:2PA5eSGe0U8hgSxEMYgwadcISA==,iv:pR0OHRTWM5tCv8gd1 nautilus: ENC[AES256_GCM,data:lcN8hZT1MGHwSHGJdYaeUGUDaw==,iv:8wtRxFAC/axTDnrTj3LNSdXlOIuGRf0Y0NIC+lZauOw=,tag:KOgF0geY64ZP+RdkZ63h9w==,type:str] leon: ENC[AES256_GCM,data:2EScIa4/zFoia61VeMO3HwjDCA==,iv:sPRMBtlq95i5pcffn+hJS8Cupb+aVl0cgXTobEJka5o=,tag:x70G7BdzlNGpty3qfpe/xQ==,type:str] caldav: ENC[AES256_GCM,data:CTRi3zjtVZKjdMHGotpLYRvAN5y3wIukl6uRGJg+83iT9ihIJWZLHPFfu+0SDbrWJcdLfOf5582SJR+dEbJTM4LQ7M8CglqQ5y+JrA==,iv:4mcrEScfd/Fls6D+Ht+VyPsy0MMDdS+uTb6kUJO8zaU=,tag:UMI7Y1SY2z7/ojKjVB8yqw==,type:str] +fever: ENC[AES256_GCM,data:Bn2ejbRLzZFoNVQ=,iv:oLILnbGWtbUYLxzO8+uY7dQsdpqjn3ZxR2ds603nOA4=,tag:8yMX6TRJcQIK+JTLq2g+4w==,type:str] restic: ENC[AES256_GCM,data:u7xDJNe8F3fF9LY=,iv:swtX7j87JL3U0QVZMMeeGMKvASOddwEATq/XmqXALPA=,tag:dlmbo1VkZea/ZaNB7ISfow==,type:str] swarselmail: ENC[AES256_GCM,data:lLklyM5g10V169WSKYURHubCvO2eeMYVhsLjIrfl/dI=,iv:DdzbyjHv6GKeeX3f7p4/02mrctmCsxO2f/VIPf2rAd0=,tag:it7+PBO/kVbeAadHz5/YLg==,type:str] swarseluser: ENC[AES256_GCM,data:Yauk2ZYZ6bUB0RMdsghWhhGZtZPBJvlB1K2ZKe94OGlTiDSxi+PmLU6E0fA5514228yDU7+7Rmvspxmb2Bj0tHTh1/YXJjF0zg==,iv:dLXNOLujvJs6pAD4iFlmiZZ7Xd8IyLYkIM+o2SS5xGg=,tag:nJg5K5CP7sNkY5UFpf375A==,type:str] @@ -83,8 +84,8 @@ sops: a3VncGhOYkdZY1NtZlI0bllkQ1d0aVUKkkI0QF0NMAT1eZeddlRxQstEodH8thuv QaXjRtUnzoAsLife63EDLsUN71XGlQzY5Gv/Ovi46YqF/CHN9QplGQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-10-19T22:44:11Z" - mac: ENC[AES256_GCM,data:WkszgL1GEtg4x8mepLPiUcWukbxbbV2GX74ie0GPGpKN9J28XXrkxG8RhHSaWhAJkW3OQwchh+ZzUpIpAceJTfP/SpmjC87Rt53GjxmJnO4JmarVnMZSFG1aYVT+AWxCCMvScCZRM3MFY1f8I7r6G6m5DCVtba+3ypKj/+AgDJc=,iv:1ZtoDaFPBQT8iInL5zmBmoLTavqwP/IF/plcDvwv44M=,tag:A0W0261XwBip88JRMW24dQ==,type:str] + lastmodified: "2024-12-16T16:58:01Z" + mac: ENC[AES256_GCM,data:lCviR1wZSczhqqjGztecB5XAYjHSh7rEtk0ffKkcAHkiCm8Lefc288MiM8pvxPqLUANHdfick9uMQqdUEgl25fuk7T62IoFOfXSS9gN9xpiOjw0C72gZmomhZ/IOYFtcw77jrS5C2FmXRBjCS/fvaOO41liLg/KYJQdnyT6D0OA=,iv:AOuzPidkMEDBgym8hOimLabQJ6JpxAyggfa6w2I1rWE=,tag:paR5w7yT7vpORfkiMcHgag==,type:str] pgp: - created_at: "2024-09-25T07:33:58Z" enc: |- diff --git a/secrets/server/winters/secrets.yaml b/secrets/server/winters/secrets.yaml index 4ea790d1..4f8a8ab4 100644 --- a/secrets/server/winters/secrets.yaml +++ b/secrets/server/winters/secrets.yaml @@ -35,6 +35,8 @@ swarseluser: ENC[AES256_GCM,data:XvmOHYFNhb/bAYAZ/kmUWbbmRy/WrxSYri/Y5k+SH4N7ZIj nextcloudadminpass: ENC[AES256_GCM,data:ZOCsu4/ijfheBfY9ZR5DBXSB,iv:bNlTLKQblnt2eYJqVgXwCaGAyAw2yhlb9Whsz0LBhm4=,tag:VQAWP/b8IghzXDFLJxXZ4Q==,type:str] grafanaadminpass: ENC[AES256_GCM,data:TBu0WOdvE+9CAH8EVm8=,iv:/usKOYscSXpo8tiSV/Las9eucBeYnpwG5DM9gJg8bfU=,tag:/LZqwuPWQyjSZURnsqq3hA==,type:str] prometheusadminpass: ENC[AES256_GCM,data:NYUbSnAl0f3FUtvCjvJHFr2wMRsVsbVIeg==,iv:TP4NMwJsft8aEixxJBJCX/0I6BJVBnltFYJDKuXq1hM=,tag:yMY+KZsRjbn8ItgKgjzqSA==,type:str] +#ENC[AES256_GCM,data:QnIF/xhWguX5tw==,iv:yTUBtPaZk6BXi+SC1P/OOtnc2x9UZ/jXirD5oaxhyQY=,tag:c33L5r5BaPZN6zkwduBCwQ==,type:comment] +fresh: ENC[AES256_GCM,data:aPF8D96BvgDXhcc=,iv:Ubq3/sUmBipRanLgkAXXeAfXAz51AuR+NojMifsy8S0=,tag:mHf0YYYxulLXAIByqmnOsA==,type:str] sops: kms: [] gcp_kms: [] @@ -50,8 +52,8 @@ sops: SHJMUFJSeGRQcTIyU1U5RXkvQi9NMzQKm8SP9jQ4fuIuddzqP+m6EJg7+zkX53jz bHaMPuLTaIHaaSDlVYe5stpyPDlZQ0NSGWV+HaIXkLZNfNM71hWYBQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-10-18T21:26:59Z" - mac: ENC[AES256_GCM,data:wvK/aa9ninmY+S66u6f2sP0bWV3bUbuEPS4J80M8YCA2J1p9mU5ndFWL6DSmzCslhO99a6+Y/AalLhkjVJn1Ok8CcxhCgbaSbZ7zniGe7sY0pK/6pPdSEHEzljNzx0M6KCoHeD9/a4VY5kPeq1t+IjqdtIBV3xhP0/SMaeypk0M=,iv:jTGcGnDZln3KZc6G8x0ENk6m5Zwq3Z+CafyATL4WbIc=,tag:i0ii+jwnyDCLxS07K82oIg==,type:str] + lastmodified: "2024-12-16T14:43:24Z" + mac: ENC[AES256_GCM,data:vDSegkEgy255XQ3NYqfZXOxV21QYIPeEmM5U5B51PQBcs13CEMwTcKx26wDznsUrqU/N9xnpHaZlYBYjCqul7uhuLG6Le3a30b4la8MNtZRsIoRJqhVlim1II+X/kcrm3RlCJ6r8g8AjAj4SDXdamkXQ02+ckeS8wwNhREBbZsA=,iv:Ik/PE5mJQY+x1xvmJGE3AWK2sVUqYGNcz4zYasxZBaU=,tag:rBrILXohBC9T47PY3sYwYg==,type:str] pgp: - created_at: "2024-09-23T20:03:08Z" enc: |- diff --git a/secrets/sync/secrets.yaml b/secrets/sync/secrets.yaml index 38e0069f..7414492d 100644 --- a/secrets/sync/secrets.yaml +++ b/secrets/sync/secrets.yaml @@ -16,8 +16,8 @@ sops: ckc3MmZZTVFyRGFaTVlVM29ra3JkbzQKNYhBd9oMS/jn2Oqyx9LpqJjQUx2mEZ/B aUNbenlCRr8KCc+yBXuTyI31LPXJ3YHsI1cfp1K/LGzCY2F0uk4rSw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-12-15T16:12:07Z" - mac: ENC[AES256_GCM,data:hMx5qjmUgTS6cOzO2e0tFB3DwJzbruwPn0J1TIa6XbmgvcDThiOAxsfKRQUrc/uWd/1Ehke+VPdt77d8hgUoe+NuUQY592Lx78DhfdaVQkwR62MfKf1Y3unRjjGjILIK935qcesTPXm10hRUenxf8r0eXGMlYnFn3pLTTVOD7mw=,iv:FGdr2xJCRYGAlNt0r0Zkt/Abre/pCXebM6o+VkTcB7I=,tag:aeRgsVSNH4QE6S69sgUXCQ==,type:str] + lastmodified: "2024-12-16T17:08:33Z" + mac: ENC[AES256_GCM,data:+2WUsrKqCEviPWhNo+Rx818gkaVLJUsCnnR+kdCgIQ0il9I3Kc3e8ZdA1TYX0cIe8D3pGswBx0PecnNiduSeVMAQL65AFUSzFbX9OA03Xs+SVVpmfuzK1xaRNRrl4ILsGyQV+qHGSjVHILoEM+r4rBQ/iwQV9zj6Px9Zs8qdVcY=,iv:Qlm1LXXmE+y96JP55dsKELgDcyz7+Hm1HbOXktsyzuI=,tag:C6TWZSgpw/wX2jGC8/kmjg==,type:str] pgp: - created_at: "2024-02-01T01:06:36Z" enc: |-