From 015da14be2b051d8b233125c1ecb3d9999ab6750 Mon Sep 17 00:00:00 2001
From: Gabe Venberg <gabevenberg@gmail.com>
Date: Sun, 31 Mar 2024 16:23:56 -0500
Subject: [PATCH] refined IRC setup.

---
 modules/home-manager/terminal/gpg.nix          |  4 ++--
 modules/home-manager/terminal/nushell/env.nu   |  3 ---
 modules/home-manager/terminal/nvim/default.nix |  6 ++++++
 modules/home-manager/terminal/pass.nix         |  4 ++++
 modules/home-manager/terminal/ssh-agent.nix    | 11 +++++++++++
 modules/home-manager/terminal/tiny-irc.nix     | 13 ++++++++++---
 6 files changed, 33 insertions(+), 8 deletions(-)
 create mode 100644 modules/home-manager/terminal/ssh-agent.nix

diff --git a/modules/home-manager/terminal/gpg.nix b/modules/home-manager/terminal/gpg.nix
index ff5f8eb..d497bc7 100644
--- a/modules/home-manager/terminal/gpg.nix
+++ b/modules/home-manager/terminal/gpg.nix
@@ -6,8 +6,8 @@
 }: {
   programs.gpg.enable = true;
 
-  services.gpg-agent={
-    enable=true;
+  services.gpg-agent = {
+    enable = true;
     enableSshSupport = true;
   };
 }
diff --git a/modules/home-manager/terminal/nushell/env.nu b/modules/home-manager/terminal/nushell/env.nu
index 2b3b764..067ff04 100644
--- a/modules/home-manager/terminal/nushell/env.nu
+++ b/modules/home-manager/terminal/nushell/env.nu
@@ -17,12 +17,9 @@ path add ($env.HOME | path join ".nix-profile" "bin")
 path add ('/opt')
 $env.PATH = ($env.PATH | uniq)
 
-$env.EDITOR = nvim
-$env.VISUAL = nvim
 $env.PIPENV_VENV_IN_PROJECT = 1
 $env.POETRY_VIRTUALENVS_IN_PROJECT = 1
 $env.XDG_DATA_HOME = ( $env.HOME | path join ".local" "share" )
-$env.PASSWORD_STORE_DIR = ($env.XDG_DATA_HOME | path join "password-store")
 
 $env.NU_LIB_DIRS = [
     ...
diff --git a/modules/home-manager/terminal/nvim/default.nix b/modules/home-manager/terminal/nvim/default.nix
index 7baf16b..58f2433 100644
--- a/modules/home-manager/terminal/nvim/default.nix
+++ b/modules/home-manager/terminal/nvim/default.nix
@@ -21,6 +21,12 @@
     EDITOR = "nvim";
     VISUAL = "nvim";
   };
+
+  programs.nushell.extraEnv = ''
+    $env.EDITOR = nvim
+    $env.VISUAL = nvim
+  '';
+
   imports = [
     ./keybinds.nix
     ./options.nix
diff --git a/modules/home-manager/terminal/pass.nix b/modules/home-manager/terminal/pass.nix
index c05ed3a..6791cab 100644
--- a/modules/home-manager/terminal/pass.nix
+++ b/modules/home-manager/terminal/pass.nix
@@ -11,4 +11,8 @@
   home.packages = with pkgs; [
     ripasso-cursive
   ];
+
+  programs.nushell.extraEnv = ''
+    $env.PASSWORD_STORE_DIR = ($env.XDG_DATA_HOME | path join "password-store")
+  '';
 }
diff --git a/modules/home-manager/terminal/ssh-agent.nix b/modules/home-manager/terminal/ssh-agent.nix
new file mode 100644
index 0000000..46dcc7e
--- /dev/null
+++ b/modules/home-manager/terminal/ssh-agent.nix
@@ -0,0 +1,11 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
+  services.ssh-agent.enable = true;
+  programs.nushell.extraEnv = ''
+    $env.SSH_AUTH_SOCK = $"($env.XDG_RUNTIME_DIR)/ssh-agent"
+  '';
+}
diff --git a/modules/home-manager/terminal/tiny-irc.nix b/modules/home-manager/terminal/tiny-irc.nix
index e650ec4..4b803bd 100644
--- a/modules/home-manager/terminal/tiny-irc.nix
+++ b/modules/home-manager/terminal/tiny-irc.nix
@@ -19,11 +19,18 @@
             "#linux"
             "#lobsters"
             "#nixos"
+            "#rust"
+            "#git"
+            "#programming"
+            "#hardware"
+            "#neovim"
+            "#kernel"
+            "#gamingonlinux"
           ];
           sasl = {
-            username="toric";
-            password={
-              command= "pass show libera";
+            username = "toric";
+            password = {
+              command = "pass show libera";
             };
           };
         }