reorganise home manager file

1 files changed, 15 insertions, 8 deletions

diff --git a/nixpkgs/kusanagi.nix b/nixpkgs/kusanagi.nix
index 8021273..2c97fce 100644
--- a/nixpkgs/kusanagi.nix
+++ b/nixpkgs/kusanagi.nix
@@ -9,18 +9,21 @@ in {
   imports = [ ./common.nix ];
 
   programs.bash.profileExtra = ''
-    ln -sf /Z/lx/.ssh ~/.ssh
-    mkdir -p ~/.gnupg
-    ln -sf /Z/lx/.gnupg/pubring.kbx ~/.gnupg/
-    ln -sf /Z/lx/.gnupg/trustdb.gpg ~/.gnupg/
-    ln -sf /Z/lx/.gnupg/private-keys-v1.d ~/.gnupg/
     ln -sf /Z/lx/Downloads ~/Downloads
-    ln -sf /Z/lx/.cargo ~/.cargo
+
+    ln -sf /Z/lx/app/openssh ~/.ssh
+    mkdir -p ~/.gnupg
+    ln -sf /Z/lx/app/gnupg/pubring.kbx ~/.gnupg/
+    ln -sf /Z/lx/app/gnupg/trustdb.gpg ~/.gnupg/
+    ln -sf /Z/lx/app/gnupg/private-keys-v1.d ~/.gnupg/
+    ln -sf /Z/lx/app/cargo ~/.cargo
 
     ln -sf /Z/lx/app/arduino/Arduino ~/Arduino
     ln -sf /Z/lx/app/arduino/.arduino15 ~/.arduino15
   '';
 
+  programs.bash.shellAliases.z = "cd /Z/lx";
+
   nixpkgs.config.packageOverrides = pkgs: {
     nur = import nurSrc { inherit pkgs; };
   };
@@ -58,13 +61,17 @@ in {
   home.homeDirectory = "/home/lx";
   xdg.userDirs.download = "/home/lx/Downloads";
 
-  programs.bash.shellAliases.z = "cd /Z/lx";
-
   services.gpg-agent.enable = true;
   services.gpg-agent.enableSshSupport = false;
   services.gpg-agent.pinentryFlavor = "qt";
   services.gpg-agent.extraConfig = "no-allow-external-cache";
 
+  programs.keychain = {
+    enable = true;
+    enableBashIntegration = true;
+    keys = [ "/Z/lx/app/openssh/id_ed25519" ];
+  };
+
   services.syncthing.extraOptions = [ "--home=/Z/lx/app/syncthing" ];
 }