From f13ccab5db2e7475f9fce51f98db3f1048e8b9fb Mon Sep 17 00:00:00 2001
From: Eclypsed <Ec1ypsed@proton.me>
Date: Thu, 25 Sep 2025 14:10:41 -0400
Subject: [PATCH] Added Bitwarden for SSH, additional changes to nvf, firefox,
 and general style changes

---
 modules/home/firefox.nix            | 11 ++++++++++-
 modules/home/nvf.nix                | 23 ++++++++++++++++-------
 modules/home/packages.nix           |  1 +
 modules/home/zsh.nix                |  3 +++
 modules/overlays/heybrochecklog.nix | 10 ++++------
 modules/system/packages.nix         |  8 --------
 modules/system/services.nix         |  5 +----
 modules/system/user.nix             |  2 +-
 8 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/modules/home/firefox.nix b/modules/home/firefox.nix
index 139cd18..8896ad9 100644
--- a/modules/home/firefox.nix
+++ b/modules/home/firefox.nix
@@ -103,10 +103,19 @@
                 ];
               }
             ];
-
             icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
             definedAliases = [ "@np" ];
           };
+          chat-gpt = {
+            name = "ChatGPT";
+            urls = [
+              {
+                template = "https://chatgpt.com?q={searchTerms}&temporary-chat=true";
+              }
+            ];
+            iconMapObj."64" = "https://chatgpt.com/favicon.ico";
+            definedAliases = [ "@gpt" ];
+          };
         };
       };
       settings = {
diff --git a/modules/home/nvf.nix b/modules/home/nvf.nix
index 0d8caf8..88d3426 100644
--- a/modules/home/nvf.nix
+++ b/modules/home/nvf.nix
@@ -26,6 +26,10 @@
           registers = "unnamedplus";
         };
 
+        comments.comment-nvim = {
+          enable = true;
+        };
+
         lsp = {
           enable = true;
           formatOnSave = true;
@@ -71,16 +75,11 @@
             key = "<A-e>";
             mode = [ "n" ];
             silent = true;
-            action = "<cmd>Neotree focus<CR>";
-          }
-          {
-            key = "<C-e>";
-            mode = [ "n" ];
-            silent = true;
-            action = "<cmd>Neotree close<CR>";
+            action = "<cmd>Neotree toggle<CR>";
           }
           {
             key = "<C-s>";
+            desc = "Save";
             mode = [
               "n"
               "i"
@@ -88,6 +87,16 @@
             ];
             action = "<cmd>w<CR>";
           }
+          {
+            key = "<C-z>";
+            desc = "Undo";
+            mode = [
+              "n"
+              "i"
+              "v"
+            ];
+            action = "<cmd>u<CR>";
+          }
 
           # Window Navigation
           {
diff --git a/modules/home/packages.nix b/modules/home/packages.nix
index 9024c90..ff7f8e3 100644
--- a/modules/home/packages.nix
+++ b/modules/home/packages.nix
@@ -9,6 +9,7 @@
     discord
     sqlitebrowser
     drawio
+    bitwarden-desktop
 
     # Libre Office
     libreoffice-qt
diff --git a/modules/home/zsh.nix b/modules/home/zsh.nix
index cb04c77..76d47f0 100644
--- a/modules/home/zsh.nix
+++ b/modules/home/zsh.nix
@@ -12,6 +12,9 @@
       enableCompletion = true;
       autosuggestion.enable = true;
       syntaxHighlighting.enable = true;
+      sessionVariables = {
+        SSH_AUTH_SOCK = "/home/eclypse/.bitwarden-ssh-agent.sock";
+      };
     };
   };
 }
diff --git a/modules/overlays/heybrochecklog.nix b/modules/overlays/heybrochecklog.nix
index c09a41b..b035919 100644
--- a/modules/overlays/heybrochecklog.nix
+++ b/modules/overlays/heybrochecklog.nix
@@ -1,5 +1,4 @@
-self: super: with super.python3Packages;
-let
+self: super: with super.python3Packages; rec {
   pprp = buildPythonPackage rec {
     pname = "pprp";
     version = "0.2.7";
@@ -12,14 +11,13 @@ let
     format = "setuptools";
     doCheck = false;
   };
-in
-{
-  heybrochecklog = buildPythonApplication {
+
+  heybrochecklog = buildPythonApplication rec {
     pname = "heybrochecklog";
     version = "1.4.7";
 
     src = super.fetchurl {
-      url = "https://github.com/doujincafe/hbcl/releases/download/v1.4.7/heybrochecklog-1.4.7.tar.gz";
+      url = "https://github.com/doujincafe/hbcl/releases/download/v${version}/heybrochecklog-${version}.tar.gz";
       sha256 = "sha256-nCJJvzw/BoCEGDIX62zZr1ZI/b0W5nnFOZlMw4Btcnw=";
     };
 
diff --git a/modules/system/packages.nix b/modules/system/packages.nix
index ca52fb5..25daadf 100644
--- a/modules/system/packages.nix
+++ b/modules/system/packages.nix
@@ -36,14 +36,6 @@
     systemPackages = with pkgs; [
       vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
       git
-      sshfs
-      # (catppuccin-sddm.override {
-      #   flavor = "mocha";
-      #   accent = "pink";
-      #   font = "FiraCode";
-      #   background = "${../../wallpapers/lanterns_of_twilight.png}";
-      #   loginBackground = true;
-      # })
     ];
   };
 }
diff --git a/modules/system/services.nix b/modules/system/services.nix
index 287dcbe..f96b181 100644
--- a/modules/system/services.nix
+++ b/modules/system/services.nix
@@ -19,10 +19,7 @@
     };
 
     # Enable the KDE Plasma Desktop Environment.
-    displayManager.sddm = {
-      enable = true;
-      # theme = "catppuccin-mocha-pink";
-    };
+    displayManager.sddm.enable = true;
     desktopManager.plasma6.enable = true;
 
     # Enable CUPS to print documents.
diff --git a/modules/system/user.nix b/modules/system/user.nix
index 2b128ad..cc9b44d 100644
--- a/modules/system/user.nix
+++ b/modules/system/user.nix
@@ -23,7 +23,7 @@
       programs.home-manager.enable = true;
     };
 
-    backupFileExtension = "backup5";
+    backupFileExtension = "backup11";
   };
 
   users.mutableUsers = false;