From 633205fd3a1a47b6e1d5c3d0df8a6cf0a55ee246 Mon Sep 17 00:00:00 2001
From: Julia Lange <public@julialange.org>
Date: Thu, 10 Jul 2025 12:16:39 -0700
Subject: [PATCH 1/2] Ssh, change default port to 22

To preserve current connections Onizuka's port was manually reverted to
the old 922 default, with the intention to follow that
---
 hosts/onizuka/host.nix                | 5 ++++-
 nixosModules/services/ssh/service.nix | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/hosts/onizuka/host.nix b/hosts/onizuka/host.nix
index d2dbc49..d03088d 100644
--- a/hosts/onizuka/host.nix
+++ b/hosts/onizuka/host.nix
@@ -12,7 +12,10 @@
   system.timezone = "America/Los_Angeles";
   system.users.bigWheels = [ "pan" ];
 
-  sshd.enable = true;
+  sshd = {
+    enable = true;
+    port = 922;
+  };
   tailscale.enable = true;
 
   tuigreet.enable = true;
diff --git a/nixosModules/services/ssh/service.nix b/nixosModules/services/ssh/service.nix
index addf235..43c8991 100644
--- a/nixosModules/services/ssh/service.nix
+++ b/nixosModules/services/ssh/service.nix
@@ -4,7 +4,7 @@
   options.sshd = {
     enable = lib.mkEnableOption "Enables ssh daemon";
     port = lib.mkOption {
-      default = 922;
+      default = 22;
       type = lib.types.port;
     };
   };

From 8b54a7251c20a222c2c884e288c9c9d0860dd745 Mon Sep 17 00:00:00 2001
From: Julia Lange <public@julialange.org>
Date: Tue, 1 Jul 2025 10:44:39 -0700
Subject: [PATCH 2/2] Neovim, add typescript support

---
 hmModules/apps/neovim/app.nix               | 15 +++++++++++++--
 hmModules/apps/neovim/plugin/treesitter.nix |  1 +
 hosts/onizuka/users/pan/user.nix            |  1 +
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/hmModules/apps/neovim/app.nix b/hmModules/apps/neovim/app.nix
index 4ef6b51..d655103 100644
--- a/hmModules/apps/neovim/app.nix
+++ b/hmModules/apps/neovim/app.nix
@@ -8,6 +8,7 @@
       go.enable = lib.mkEnableOption "Enables go support";
       nix.enable = lib.mkEnableOption "Enables nix support";
       rust.enable = lib.mkEnableOption "Enables rust support";
+      typescript.enable = lib.mkEnableOption "Enables typescript support";
     };
     themes = {
       catppuccin.enable = lib.mkEnableOption "Enables catppuccin theme";
@@ -118,6 +119,16 @@
           go-nvim
         ]);
 
+        typescript-pkg = lopts cfgl.typescript.enable (with pkgs.vimPlugins; [
+          {
+            plugin = typescript-tools-nvim;
+            type = "lua";
+            config = ''
+              require("typescript-tools").setup {}
+            '';
+          }
+        ]);
+
         catppuccin-pkg = lopts cfgt.catppuccin.enable (with pkgs.vimPlugins; [
           {
             plugin = catppuccin-nvim;
@@ -151,8 +162,8 @@
             '';
           }
         ]);
-      in comments ++ fugitive ++ luasnip-pkg ++ lualine ++
-        nix-pkg ++ rust-pkg ++ go-pkg ++ wiki ++ catppuccin-pkg;
+      in comments ++ fugitive ++ luasnip-pkg ++ lualine ++ nix-pkg ++ rust-pkg
+      ++ go-pkg ++ wiki ++ catppuccin-pkg ++ typescript-pkg;
     };
   };
 }
diff --git a/hmModules/apps/neovim/plugin/treesitter.nix b/hmModules/apps/neovim/plugin/treesitter.nix
index d1e9fe3..a6bb8c0 100644
--- a/hmModules/apps/neovim/plugin/treesitter.nix
+++ b/hmModules/apps/neovim/plugin/treesitter.nix
@@ -25,6 +25,7 @@ in {
         p.tree-sitter-go
         p.tree-sitter-nix
         p.tree-sitter-rust
+        p.tree-sitter-typescript
       ];
     in with pkgs.vimPlugins; [
       {
diff --git a/hosts/onizuka/users/pan/user.nix b/hosts/onizuka/users/pan/user.nix
index 2efdf12..bc112d7 100644
--- a/hosts/onizuka/users/pan/user.nix
+++ b/hosts/onizuka/users/pan/user.nix
@@ -58,6 +58,7 @@
     c.enable = true;
     nix.enable = true;
     rust.enable = true;
+    typescript.enable = true;
   };
   neovim.plugins = {
     comments.enable = true;