From e013fc8aed5b3cfc6cdb8a1e5446aa25769f8c98 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Wed, 30 Aug 2023 22:30:05 -0500
Subject: [PATCH] Ready to merge

---
 os/linux/nix/daniel.nix           | 18 ++++++++++++++----
 os/linux/nix/machines/thinker.nix |  5 +++--
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/os/linux/nix/daniel.nix b/os/linux/nix/daniel.nix
index 564a5cf..d22aad0 100644
--- a/os/linux/nix/daniel.nix
+++ b/os/linux/nix/daniel.nix
@@ -14,6 +14,20 @@
 
   ];
 
+  programs.password-store = {
+    enable = true;
+    package = (pkgs.pass.withExtensions (exts: [ exts.pass-otp ]));
+  };
+
+  programs.zellij = {
+    # TODO: enable after port config
+    enable = false;
+    enableFishIntegration = true;
+    settings = {
+      # TODO: port config
+    };
+  };
+
   programs.broot = {
     enable = true;
     enableFishIntegration = true;
@@ -211,10 +225,6 @@
     # TODO: rtx?
     # TODO: homebrew?
     # TODO: asdf?
-    # TODO: direnv?
-    # TODO: pass and pass-otp
-    # TODO: kitty integration
-    # TODO: zellij and/or tmux?
     functions = {
       d = ''
         # --wraps=cd --description "Quickly jump to NICE_HOME (or given relative or absolute path) and list files."
diff --git a/os/linux/nix/machines/thinker.nix b/os/linux/nix/machines/thinker.nix
index 60aef01..2f347a9 100644
--- a/os/linux/nix/machines/thinker.nix
+++ b/os/linux/nix/machines/thinker.nix
@@ -204,7 +204,6 @@ in
     noto-fonts
     openssl
     pamixer
-    (pass.withExtensions (exts: [ exts.pass-otp ]))
     pavucontrol
     pciutils
     pgcli
@@ -223,6 +222,7 @@ in
     swaybg
     swayidle
     swaylock
+    tmux
     traceroute
     unzip
     vlc
@@ -236,6 +236,7 @@ in
     wofi
     xh
     zathura
+    zellij
     zstd
   ];
 
@@ -338,7 +339,7 @@ in
     enable = true;
     allowPing = true;
     checkReversePath = "loose";
-    allowedTCPPorts = [ 22 ];
+    allowedTCPPorts = [ ];
     allowedUDPPorts = [ ];
   };