From 2c83e2c3a798da8e34e37d51eeb281106139cafd Mon Sep 17 00:00:00 2001
From: Frank LoTurco <floturcocantsee@protonmail.com>
Date: Fri, 23 Oct 2026 16:48:11 -0400
Subject: [PATCH] refactor: fix duplicated fastfetch invocations

---
 features/bash.nix             | 16 ----------------
 features/zsh.nix              | 15 ---------------
 home/frank.nix                |  3 +++
 hosts/shared/darwin.nix       |  3 ++-
 hosts/shared/nixos-pc.nix     |  3 ++-
 hosts/shared/nixos-server.nix |  3 ++-
 6 files changed, 9 insertions(+), 34 deletions(-)
 delete mode 100644 features/bash.nix
 delete mode 100644 features/zsh.nix

diff --git a/features/bash.nix b/features/bash.nix
deleted file mode 100644
index 8d4b021..0000000
--- a/features/bash.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ pkgs, ... }:
-{
-  imports = [
-    ./starship.nix
-  ];
-
-  programs.bash = {
-    enable = true;
-
-    interactiveShellInit = ''
-      eval "$(devenv hook bash)"
-      eval "$(jump shell)"
-      clear;fastfetch
-    '';
-  };
-}
diff --git a/features/zsh.nix b/features/zsh.nix
deleted file mode 100644
index 4c36cd2..0000000
--- a/features/zsh.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ _, ... }:
-{
-  programs.zsh = {
-    enable = true;
-    enableCompletion = true;
-    enableAutosuggestions = true;
-    enableSyntaxHighlighting = true;
-
-    interactiveShellInit = ''
-      eval "$(jump shell)"
-      eval "$(devenv hook zsh)"
-      clear;fastfetch
-    '';
-  };
-}
diff --git a/home/frank.nix b/home/frank.nix
index c9bc8cd..0d465f9 100644
--- a/home/frank.nix
+++ b/home/frank.nix
@@ -65,6 +65,9 @@
       if pkgs.stdenv.hostPlatform.isDarwin then
         {
           enable = true;
+          enableCompletion = true;
+          autosuggestion.enable = true;
+          syntaxHighlighting.enable = true;
 
           initContent = ''
             eval "$(jump shell)"
diff --git a/hosts/shared/darwin.nix b/hosts/shared/darwin.nix
index edd4d7c..aa7bca4 100644
--- a/hosts/shared/darwin.nix
+++ b/hosts/shared/darwin.nix
@@ -3,9 +3,10 @@
   imports = [
     ./nix-package-manager.nix
     ../../features/sops.nix
-    ../../features/zsh.nix
   ];
 
+  programs.zsh.enable = true;
+
   # Only use homebrew for casks.
   homebrew.enable = true;
 
diff --git a/hosts/shared/nixos-pc.nix b/hosts/shared/nixos-pc.nix
index 2c6da6c..83a823c 100644
--- a/hosts/shared/nixos-pc.nix
+++ b/hosts/shared/nixos-pc.nix
@@ -6,7 +6,6 @@
 }:
 {
   imports = [
-    ../../features/bash.nix
     ../../features/nix-ld.nix
     ../../features/docker.nix
     ../../features/vim.nix
@@ -140,6 +139,8 @@
   security.rtkit.enable = true;
 
   programs = {
+    bash.enable = true;
+
     firefox.enable = true;
 
     gnupg.agent = {
diff --git a/hosts/shared/nixos-server.nix b/hosts/shared/nixos-server.nix
index a9149c5..4a6931d 100644
--- a/hosts/shared/nixos-server.nix
+++ b/hosts/shared/nixos-server.nix
@@ -4,7 +4,6 @@
 }:
 {
   imports = [
-    ../../features/bash.nix
     ../../features/vim.nix
     ../../features/docker.nix
     ../../features/libvirt.nix
@@ -17,6 +16,8 @@
     ./nix-package-manager.nix
   ];
 
+  programs.bash.enable = true;
+
   services = {
     openssh.enable = true;
     resolved.enable = false;