refactor: ran deadnix

users/rouven/modules/accounts/default.nix

@@ -1,14 +1,14 @@
-{ pkgs, lib, ... }:
+{ config, pkgs, ... }:
 let
   gpg-default-key = "116987A8DD3F78FF8601BF4DB95E8FE6B11C4D09";
 in
 {
-  sops.secrets = {
-    "email/rfive" = { };
-    "email/tu-dresden" = { };
-    "email/ifsr" = { };
-    "email/agdsn" = { };
-    "email/google" = { };
+  age.secrets = {
+    "mail/rfive".file = ../../../../secrets/rouven/mail/rfive.age;
+    "mail/tu-dresden".file = ../../../../secrets/rouven/mail/tu-dresden.age;
+    "mail/ifsr".file = ../../../../secrets/rouven/mail/ifsr.age;
+    "mail/agdsn".file = ../../../../secrets/rouven/mail/agdsn.age;
+    "mail/google".file = ../../../../secrets/rouven/mail/google.age;
   };
   programs = {
     aerc = {
@@ -56,7 +56,7 @@ in
       gpg.key = gpg-default-key;
       realName = "Rouven Seifert";
       userName = address;
-      passwordCommand = "${pkgs.coreutils}/bin/cat $XDG_RUNTIME_DIR/secrets/email/rfive";
+      passwordCommand = "${pkgs.coreutils}/bin/cat ${config.age.secrets."mail/rfive".path}";
       imap = {
         host = "mail.rfive.de";
         port = 993;

users/rouven/modules/default.nix

@@ -2,13 +2,13 @@
 {
   imports = [
     ./accounts
+    # ./age
     ./foot
     ./git
     ./gpg
     ./helix
     ./wayland
     ./mpv
-    ./sops
     ./spotify
     ./ssh
     ./theme

users/rouven/modules/sops/default.nix

@@ -1,8 +0,0 @@
-{ config, ... }:
-{
-  sops = {
-    age.sshKeyPaths = [ "/home/${config.home.username}/.ssh/id_ed25519" ];
-    age.generateKey = false;
-    defaultSopsFile = ../../../../secrets/${config.home.username}.yaml;
-  };
-}

users/rouven/modules/spotify/default.nix

@@ -1,15 +1,17 @@
 { config, pkgs, ... }:
 {
   home.packages = [ pkgs.spotify-tui ];
-  sops.secrets."spotify" = { };
+  age.secrets.spotify = {
+    file = ../../../../secrets/rouven/spotify.age;
+  };
   services.spotifyd = {
     enable = true;
     settings = {
       global = {
         username = config.accounts.email.accounts."gmail".address;
-        password_cmd = "${pkgs.coreutils}/bin/cat $XDG_RUNTIME_DIR/secrets/spotify";
+        password_cmd = "${pkgs.coreutils}/bin/cat ${config.age.secrets.spotify.path}";
       };
     };
   };
-  systemd.user.services.spotifyd.Unit.After = [ "sops-nix.service" ];
+  systemd.user.services.spotifyd.Unit.After = [ "agenix.service" ];
 }

users/rouven/modules/ssh/default.nix

@@ -1,11 +1,8 @@
 { ... }:
 let
-  git = "/run/user/1000/secrets/ssh/git/private";
+  git = "~/.ssh/git";
 in
 {
-  sops.secrets = {
-    "ssh/git/private" = { };
-  };
   programs.ssh = rec {
     enable = true;
     compression = true;