home/apps: move eza and fzf to bash module

homeManagerModules/apps/bash/default.nix

@@ -5,26 +5,40 @@
   ...
 }: {
   config = lib.mkIf config.alyraffauf.apps.bash.enable {
-    programs.bash = {
+    programs = {
-      enable = true;
+      eza = {
-      enableCompletion = true;
+        enable = true;
-      enableVteIntegration = true;
+        extraOptions = ["--group-directories-first" "--header"];
-      shellOptions = [
+        git = true;
-        "autocd"
+        icons = true;
-        "cdspell"
+      };
-        "checkjobs"
+
-        "checkwinsize"
+      fzf = {
-        "dirspell"
+        enable = true;
-        "dotglob"
+        tmux.enableShellIntegration = true;
-        "extglob"
+      };
-        "globstar"
+
-        "histappend"
+      bash = {
-      ];
+        enable = true;
-      initExtra = ''
+        enableCompletion = true;
-        export PS1="[\[$(tput setaf 27)\]\u\[$(tput setaf 135)\]@\[$(tput setaf 45)\]\h:\[$(tput setaf 33)\]\w] \[$(tput sgr0)\]$ "
+        enableVteIntegration = true;
-      '';
+        shellOptions = [
-      shellAliases = {
+          "autocd"
-        cat = lib.getExe pkgs.bat;
+          "cdspell"
+          "checkjobs"
+          "checkwinsize"
+          "dirspell"
+          "dotglob"
+          "extglob"
+          "globstar"
+          "histappend"
+        ];
+        initExtra = ''
+          export PS1="[\[$(tput setaf 27)\]\u\[$(tput setaf 135)\]@\[$(tput setaf 45)\]\h:\[$(tput setaf 33)\]\w] \[$(tput sgr0)\]$ "
+        '';
+        shellAliases = {
+          cat = lib.getExe pkgs.bat;
+        };
       };
     };
   };

homeManagerModules/apps/default.nix

@@ -9,11 +9,9 @@
     ./bash
     ./chromium
     ./emacs
-    ./eza
     ./fastfetch
     ./firefox
     ./fuzzel
-    ./fzf
     ./keepassxc
     ./librewolf
     ./mako

homeManagerModules/apps/eza/default.nix

@@ -1,15 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}: {
-  config = lib.mkIf config.alyraffauf.apps.eza.enable {
-    programs.eza = {
-      enable = true;
-      extraOptions = ["--group-directories-first" "--header"];
-      git = true;
-      icons = true;
-    };
-  };
-}

homeManagerModules/apps/fzf/default.nix

@@ -1,13 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}: {
-  config = lib.mkIf config.alyraffauf.apps.fzf.enable {
-    programs.fzf = {
-      enable = true;
-      tmux.enableShellIntegration = true;
-    };
-  };
-}

homeManagerModules/options.nix

@@ -19,11 +19,9 @@
           };
         };
         emacs.enable = lib.mkEnableOption "Emacs text editor.";
-        eza.enable = lib.mkEnableOption "Eza ls alternative.";
         fastfetch.enable = lib.mkEnableOption "Fastfetch.";
         firefox.enable = lib.mkEnableOption "Firefox web browser.";
         fuzzel.enable = lib.mkEnableOption "Fuzzel app launcher.";
-        fzf.enable = lib.mkEnableOption "Fzf fuzzy file finder.";
         keepassxc = {
           enable = lib.mkEnableOption "KeePassXC password manager.";
           settings = lib.mkOption {

homes/aly.nix

@@ -253,12 +253,9 @@
         package = pkgs.brave;
       };
       emacs.enable = true;
-      eza.enable = true;
       fastfetch.enable = true;
       firefox.enable = true;
-      fzf.enable = true;
       keepassxc.enable = true;
-      neofetch.enable = true;
       neovim.enable = true;
       tmux.enable = true;
       vsCodium.enable = true;

homes/dustin.nix

@@ -35,9 +35,7 @@
       alacritty.enable = true;
       bash.enable = true;
       chromium.enable = true;
-      eza.enable = true;
       firefox.enable = true;
-      fzf.enable = true;
       vsCodium.enable = true;
     };
     desktop = {

homes/morgan.nix

@@ -33,9 +33,7 @@
       alacritty.enable = true;
       bash.enable = true;
       chromium.enable = true;
-      eza.enable = true;
       firefox.enable = true;
-      fzf.enable = true;
       vsCodium.enable = true;
     };
     theme = {