Add gojo and haze fastfetch files

home/global/common/gaming/switch.nix

@@ -158,7 +158,6 @@ let
 in
 {
   home.packages = with pkgs; [
-    citron-emu
     ryubing
     borgbackup
     borgtui
@@ -196,34 +195,35 @@ in
       };
     };
 
-    citron-emu = {
-      name = "Citron w/ Borg Backups";
-      comment = "Citron Emulator with Borg Backups";
-      exec = mkLaunchCommand {
-        savePath = "${homeDir}/.local/share/citron/nand/user/save";
-        backupPath = "/pool/Backups/Switch/CitronSaves";
-        maxBackups = 30;
-        command = "citron-emu";
-      };
-      icon = "applications-games";
-      type = "Application";
-      terminal = false;
-      categories = [
-        "Game"
-        "Emulator"
-      ];
-      mimeType = [
-        "application/x-nx-nca"
-        "application/x-nx-nro"
-        "application/x-nx-nso"
-        "application/x-nx-nsp"
-        "application/x-nx-xci"
-      ];
-      prefersNonDefaultGPU = true;
-      settings = {
-        StartupWMClass = "Citron";
-        GenericName = "Nintendo Switch Emulator";
-      };
-    };
+    # FIXME: change to edenemu
+    # citron-emu = {
+    #   name = "Citron w/ Borg Backups";
+    #   comment = "Citron Emulator with Borg Backups";
+    #   exec = mkLaunchCommand {
+    #     savePath = "${homeDir}/.local/share/citron/nand/user/save";
+    #     backupPath = "/pool/Backups/Switch/CitronSaves";
+    #     maxBackups = 30;
+    #     command = "citron-emu";
+    #   };
+    #   icon = "applications-games";
+    #   type = "Application";
+    #   terminal = false;
+    #   categories = [
+    #     "Game"
+    #     "Emulator"
+    #   ];
+    #   mimeType = [
+    #     "application/x-nx-nca"
+    #     "application/x-nx-nro"
+    #     "application/x-nx-nso"
+    #     "application/x-nx-nsp"
+    #     "application/x-nx-xci"
+    #   ];
+    #   prefersNonDefaultGPU = true;
+    #   settings = {
+    #     StartupWMClass = "Citron";
+    #     GenericName = "Nintendo Switch Emulator";
+    #   };
+    # };
   };
 }

home/global/core/fastfetch/host/gojo.txt

@@ -0,0 +1,13 @@
+      
+   [?25l      ▄▄▄   ▄▄▄  ▄▄▄      
+         ▄▄▄▄   ▄▄▄▄▄▄▄      
+      ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄  ▄▄   
+      ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ ▄░▄   
+      ▄▄▄▄▄        ▄▄▄▄▄▄   
+   ▄▄▄▄▄▄▄▄          ▄▄▄▄▄▄▄░
+      ▄▄▄▄▄▄        ▄▄▄      
+      ░▄▄ ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄   
+      ▄   ▄▄▄▄▄▄▄▄▄░░▄▄▄▄    
+         ▄▄▄▄▄▄▄   ▄░▄       
+         ▄▄▄ ▄▄▄▄   ▄▄▄      
+   [?25h

home/global/core/fastfetch/host/haze.txt

@@ -0,0 +1,13 @@
+      
+   [?25l      ▄▄▄   ▄▄▄  ▄▄▄      
+         ▄▄▄▄   ▄▄▄▄▄▄▄      
+      ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄  ▄▄   
+      ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ ▄░▄   
+      ▄▄▄▄▄        ▄▄▄▄▄▄   
+   ▄▄▄▄▄▄▄▄          ▄▄▄▄▄▄▄░
+      ▄▄▄▄▄▄        ▄▄▄      
+      ░▄▄ ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄   
+      ▄   ▄▄▄▄▄▄▄▄▄░░▄▄▄▄    
+         ▄▄▄▄▄▄▄   ▄░▄       
+         ▄▄▄ ▄▄▄▄   ▄▄▄      
+   [?25h

home/global/core/ssh.nix

@@ -8,7 +8,7 @@
 }:
 let
   ## Get the current user's SSH config ##
-  userSsh = secretsSpec.users.${hostSpec.user}.ssh;
+  userSsh = secretsSpec.users.${hostSpec.username}.ssh;
 
   ## Generate local key paths for the config ##
   sshKeysMap = lib.mapAttrs (name: _: "${hostSpec.home}/.ssh/${name}") userSsh.privateKeys;

hosts/global/core/user.nix

@@ -46,7 +46,7 @@ in
         "video"
       ])
     ];
-    openssh.authorizedKeys.keys = builtins.attrValues config.secretsSpec.ssh.publicKeys or [ ];
+    openssh.authorizedKeys.keys = user.ssh.publicKeys or [ ];
   };
 
   # Special sudo config for user
@@ -69,7 +69,7 @@ in
   users.users.root = {
     shell = pkgs.bash;
     hashedPassword = lib.mkForce hostSpec.hashedPassword;
-    openssh.authorizedKeys.keys = builtins.attrValues config.secretsSpec.ssh.publicKeys or [ ];
+    openssh.authorizedKeys.keys = user.ssh.publicKeys or [ ];
   };
 }
 // lib.optionalAttrs (inputs ? "home-manager") {

modules/global/secret-spec.nix

@@ -70,7 +70,15 @@ in
                   privateKeys = lib.mkOption {
                     type = lib.types.attrsOf lib.types.path;
                     description = "SSH private key file paths keyed by name";
-                    readOnly = true;
+                    default = { };
+                    apply =
+                      _:
+                      let
+                        userName = config.hostSpec.username;
+                        userConfig = config.secretsSpec.users.${userName} or { };
+                        privateKeyContents = userConfig.ssh.privateKeyContents or { };
+                      in
+                      lib.mapAttrs (name: content: mkSshKeyFile "${userName}-${name}" content) privateKeyContents;
                   };
                   config = lib.mkOption {
                     type = lib.types.path;
@@ -104,7 +112,15 @@ in
                   privateKey = lib.mkOption {
                     type = lib.types.path;
                     description = "GPG private key file path";
-                    readOnly = true;
+                    default = null;
+                    apply =
+                      _:
+                      let
+                        userName = config.hostSpec.username;
+                        userConfig = config.secretsSpec.users.${userName} or { };
+                        privateKeyContent = userConfig.gpg.privateKeyContents or "";
+                      in
+                      if privateKeyContent != "" then mkGpgKeyFile userName privateKeyContent else null;
                   };
                   trust = lib.mkOption {
                     type = lib.types.str;
@@ -247,26 +263,4 @@ in
       default = { };
     };
   };
-
-  config.secretsSpec.users = lib.mapAttrs (
-    userName: userConfig:
-    userConfig
-    // {
-      ## Auto-generate SSH private key files ##
-      ssh = userConfig.ssh // {
-        privateKeys = lib.mapAttrs (
-          name: content: mkSshKeyFile "${userName}-${name}" content
-        ) userConfig.ssh.privateKeyContents;
-      };
-
-      ## Auto-generate GPG private key file ##
-      gpg = userConfig.gpg // {
-        privateKey =
-          if userConfig.gpg.privateKeyContents != "" then
-            mkGpgKeyFile "${userName}-gpg" userConfig.gpg.privateKeyContents
-          else
-            null;
-      };
-    }
-  ) config.secretsSpec.users;
 }