diff --git a/homeManagerModules/apps/bash/default.nix b/homeManagerModules/apps/bash/default.nix index 017b8993..0961b91c 100644 --- a/homeManagerModules/apps/bash/default.nix +++ b/homeManagerModules/apps/bash/default.nix @@ -5,26 +5,40 @@ ... }: { config = lib.mkIf config.alyraffauf.apps.bash.enable { - programs.bash = { - enable = true; - enableCompletion = true; - enableVteIntegration = true; - shellOptions = [ - "autocd" - "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; + programs = { + eza = { + enable = true; + extraOptions = ["--group-directories-first" "--header"]; + git = true; + icons = true; + }; + + fzf = { + enable = true; + tmux.enableShellIntegration = true; + }; + + bash = { + enable = true; + enableCompletion = true; + enableVteIntegration = true; + shellOptions = [ + "autocd" + "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; + }; }; }; }; diff --git a/homeManagerModules/apps/default.nix b/homeManagerModules/apps/default.nix index fde431b7..5f47d98e 100644 --- a/homeManagerModules/apps/default.nix +++ b/homeManagerModules/apps/default.nix @@ -9,11 +9,9 @@ ./bash ./chromium ./emacs - ./eza ./fastfetch ./firefox ./fuzzel - ./fzf ./keepassxc ./librewolf ./mako diff --git a/homeManagerModules/apps/eza/default.nix b/homeManagerModules/apps/eza/default.nix deleted file mode 100644 index 1de1d841..00000000 --- a/homeManagerModules/apps/eza/default.nix +++ /dev/null @@ -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; - }; - }; -} diff --git a/homeManagerModules/apps/fzf/default.nix b/homeManagerModules/apps/fzf/default.nix deleted file mode 100644 index e7c98a3a..00000000 --- a/homeManagerModules/apps/fzf/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: { - config = lib.mkIf config.alyraffauf.apps.fzf.enable { - programs.fzf = { - enable = true; - tmux.enableShellIntegration = true; - }; - }; -} diff --git a/homeManagerModules/options.nix b/homeManagerModules/options.nix index ffa259e5..9d0f3bb6 100644 --- a/homeManagerModules/options.nix +++ b/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 { diff --git a/homes/aly.nix b/homes/aly.nix index a70eee34..2b766387 100644 --- a/homes/aly.nix +++ b/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; diff --git a/homes/dustin.nix b/homes/dustin.nix index fcfcd50a..ad9bfba6 100644 --- a/homes/dustin.nix +++ b/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 = { diff --git a/homes/morgan.nix b/homes/morgan.nix index 756e7b31..26123449 100644 --- a/homes/morgan.nix +++ b/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 = {