From d457331ea6d089da3cee7565d4a73ef9d1c2d02e Mon Sep 17 00:00:00 2001
From: chase <chase@cathoderaytube.net>
Date: Mon, 19 May 2025 15:36:40 -0400
Subject: [PATCH] Removed zsh, fixed ssh-agent config

---
 configuration.nix | 27 ++++++++++++++++++---------
 flake.lock        | 24 ++++++++++++------------
 home.nix          | 26 ++++++--------------------
 3 files changed, 36 insertions(+), 41 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index efec79d..89e4fd9 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -116,15 +116,16 @@
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
-  # Install zsh
-  programs.zsh.enable = true;
+  # Bash config
+  programs.bash = {
+    blesh.enable = true;
+  };
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.chase = {
     isNormalUser = true;
     description = "Chase";
     extraGroups = [ "networkmanager" "wheel" ];
-	shell = pkgs.zsh;
   };
 
   # Install firefox.
@@ -171,7 +172,8 @@
   environment.systemPackages = with pkgs; [
     alacritty
     audacity
-    bitwarden
+    bitwarden-cli
+	bitwarden-desktop
     emacs-pgtk
     fastfetch
     ffmpeg
@@ -204,10 +206,11 @@
   ];
 
   # ssh agent
-  programs.mtr.enable = true;
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
+  # programs.mtr.enable = true;
+  programs.gnupg.agent.enable = true;
+
+  programs.ssh = {
+	enableAskPassword = false;
   };
 
   # List services that you want to enable:
@@ -217,7 +220,13 @@
   security.polkit.enable = true;
 
   # Enable the OpenSSH daemon.
-  # services.openssh.enable = true;
+  services.openssh = {
+    enable = true;
+	settings = {
+	  PasswordAuthentication = false;
+	  KbdInteractiveAuthentication = false;
+    };
+  };
 
   # Open ports in the firewall.
   # networking.firewall.allowedTCPPorts = [ ... ];
diff --git a/flake.lock b/flake.lock
index 6f5ba63..d497e70 100644
--- a/flake.lock
+++ b/flake.lock
@@ -99,11 +99,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1747225851,
-        "narHash": "sha256-4IbmZrNOdXP143kZEUzxBS5SqyxUlaSHLgdpeJfP2ZU=",
+        "lastModified": 1747565775,
+        "narHash": "sha256-B6jmKHUEX1jxxcdoYHl7RVaeohtAVup8o3nuVkzkloA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6bf057fc8326e83bda05a669fc08d106547679fb",
+        "rev": "97118a310eb8e13bc1b9b12d67267e55b7bee6c8",
         "type": "github"
       },
       "original": {
@@ -186,11 +186,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1747503792,
-        "narHash": "sha256-Okd5cu0jxGa+x4xpfMX9S8QH/zddaFUQvw97V6H2W3E=",
+        "lastModified": 1747610850,
+        "narHash": "sha256-b41pc9J8b9fxRFHBQRKoTXZHpAsKW5eJbNsTMris2Mo=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "705b97c4ac93148820012c701fe39445cf76a590",
+        "rev": "eb3b38d40baca5c05ddbc1507b3d3f02a0ccb164",
         "type": "github"
       },
       "original": {
@@ -389,11 +389,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1746904237,
-        "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=",
+        "lastModified": 1747542820,
+        "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956",
+        "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043",
         "type": "github"
       },
       "original": {
@@ -412,11 +412,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1747251912,
-        "narHash": "sha256-zgHG2yUpPRkcz0lJNVFFY47ohKYlZ0IIR+y7vmHfQRs=",
+        "lastModified": 1747676902,
+        "narHash": "sha256-jksy3fqyf4zUPIrAL8RFIHEECXITHtsyV9hp0VHmlLY=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "fde7d7ed44baaa2cffcd570c18bb7981d2696d72",
+        "rev": "d4ae72a58d239b565c34323f9f02aac91901f9c7",
         "type": "github"
       },
       "original": {
diff --git a/home.nix b/home.nix
index db6b1dc..e4f1728 100644
--- a/home.nix
+++ b/home.nix
@@ -19,13 +19,14 @@
   };
 
   programs.bash = {
-    enable = false;
-    shellAliases = {
-      ll = "ls -l";
-      ".." = "cd ..";
-    };
+    enable = true;
+	enableCompletion = true;
+	bashrcExtra = ''
+      export SSH_AUTH_SOCK=/home/chase/.bitwarden-ssh-agent.sock
+    '';
   };
 
+
   programs.firefox = {
     enable = true;
     nativeMessagingHosts = [ pkgs.firefoxpwa ];
@@ -109,21 +110,6 @@
 
   programs.git-credential-oauth.enable =true;
 
-  programs.zsh = {
-    enable = true;
-	enableCompletion = true;
-	autosuggestion.enable = true;
-	syntaxHighlighting.enable = true;
-	localVariables = {
-	  SSH_AUTH_SOCK = [ "/home/chase/.bitwarden-ssh-agent.sock" ];
-    };
-    shellAliases = {
-      ll = "ls -l";
-      ".." = "cd ..";
-    };
-    history.size = 10000;
-  };
-  
   home.packages = with pkgs; [
     runelite
   ];