From c98b5706caf742fbb421c66e47c0a1b1894004ff Mon Sep 17 00:00:00 2001
From: Dennis <me@dnsc.io>
Date: Thu, 8 May 2025 21:52:46 +0200
Subject: [PATCH] Updates ssh and work config

---
 home/darwin-work.nix         |  2 ++
 home/darwin.nix              |  1 +
 home/modules/fish/work.nix   | 12 +++++++++---
 home/modules/ssh/default.nix | 26 ++++++++++++++++++++++++++
 4 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 home/modules/ssh/default.nix

diff --git a/home/darwin-work.nix b/home/darwin-work.nix
index 96b56cf..d4b0cb5 100644
--- a/home/darwin-work.nix
+++ b/home/darwin-work.nix
@@ -8,6 +8,8 @@
   home.sessionVariables = {
     EDITOR = "nvim";
     GOPATH = "$HOME/go";
+    JAVA_HOME = "/Library/Java/JavaVirtualMachines/zulu-17.jdk/Contents/Home"; 
+    ANDROID_HOME = "$HOME/Library/Android/sdk";
   };
 
   xdg.enable = true;
diff --git a/home/darwin.nix b/home/darwin.nix
index c88a93a..2e2e5bf 100644
--- a/home/darwin.nix
+++ b/home/darwin.nix
@@ -13,6 +13,7 @@
   xdg.enable = true;
 
   imports = [
+    ./modules/ssh
     ./modules/git
     ./modules/fish
     ./modules/atuin
diff --git a/home/modules/fish/work.nix b/home/modules/fish/work.nix
index 4692a0f..a4289be 100644
--- a/home/modules/fish/work.nix
+++ b/home/modules/fish/work.nix
@@ -3,6 +3,9 @@
     enable = true;
 
     functions = {
+      # TODO: Add these two functions from work config
+      cdr = '''';
+      rr = '''';
       ff = ''
         set RG_PREFIX "rg --column --line-number --no-heading --color=always --smart-case "
         set INITIAL_QUERY "$argv"
@@ -49,9 +52,6 @@
     interactiveShellInit = ''
       fish_config theme choose "Rosé Pine"
 
-      set -gx JAVA_HOME /Library/Java/JavaVirtualMachines/zulu-17.jdk/Contents/Home 
-      set -gx ANDROID_HOME /Users/dennis/Library/Android/sdk
-
       set hn (prompt_hostname)
       set fish_cursor_default     block      blink
       set fish_cursor_insert      line       blink
@@ -74,8 +74,14 @@
     shellAbbrs = {
       lg = "lazygit";
       g = "git";
+      gco = "git checkout";
       frc = "source ~/.config/fish/**/*.fish";
       t = "todo.sh";
+      p = "pnpm";
+      pa = "pnpm add";
+      pad = "pnpm add -D";
+      pi = "pnpm install";
+      px = "pnpm dlx";
     };
   };
 
diff --git a/home/modules/ssh/default.nix b/home/modules/ssh/default.nix
new file mode 100644
index 0000000..e6a0bf2
--- /dev/null
+++ b/home/modules/ssh/default.nix
@@ -0,0 +1,26 @@
+{
+  programs.ssh = {
+    enable = true;
+    addKeysToAgent = "yes";
+    matchBlocks = {
+      "dnsc-server" = {
+        hostname = "100.103.199.4";
+        user = "dennis";
+        identityFile = "/Users/dennis/.ssh/id_ed25519";
+        identitiesOnly = true;
+      };
+      "dnsc-server-i" = {
+        hostname = "192.168.178.69";
+        user = "dennis";
+        identityFile = "/Users/dennis/.ssh/id_ed25519";
+        identitiesOnly = true;
+      };
+      "dnsc-vps-sm" = {
+        hostname = "100.65.82.77";
+        user = "dennis";
+        identityFile = "/Users/dennis/.ssh/id_ed25519";
+        identitiesOnly = true;
+      };
+    };
+  };
+}