refactor(shell): nixify remaining shell config

home/modules/fzf/default.nix

@@ -0,0 +1,31 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  options.fzf.enable = lib.mkEnableOption "fzf";
+
+  config = lib.mkIf config.fzf.enable {
+    programs.fzf = {
+      enable = true;
+      enableBashIntegration = lib.mkDefault true;
+      defaultCommand = "rg --files";
+      defaultOptions = [
+        "--pointer='❭'"
+        "--height 10%"
+      ];
+      fileWidget = {
+        command = "rg --files";
+        options = [ "--preview 'bat {} | head -500'" ];
+      };
+    };
+
+    home.packages = with pkgs; [
+      ripgrep
+      bat
+    ];
+  };
+}

home/modules/readline/default.nix

@@ -0,0 +1,46 @@
+{ lib, config, ... }:
+
+{
+  options.readline.enable = lib.mkEnableOption "readline";
+
+  config = lib.mkIf config.readline.enable {
+    programs.readline = {
+      enable = true;
+      includeSystemConfig = true;
+      variables = {
+        editing-mode = "vi";
+        keymap = "vi";
+        show-mode-in-prompt = true;
+        vi-ins-mode-string = ''"\1\e[1;32m\2■ \1\e[0m\2"'';
+        vi-cmd-mode-string = ''"\1\e[1;31m\2■ \1\e[0m\2"'';
+
+        show-all-if-ambiguous = true;
+        show-all-if-unmodified = false;
+        completion-ignore-case = true;
+        completion-map-case = true;
+        completion-display-width = 0;
+        page-completions = false;
+        completion-query-items = 128;
+        visible-stats = true;
+        skip-completed-text = true;
+        mark-symlinked-directories = true;
+        colored-completion-prefix = true;
+      };
+      extraConfig = ''
+        $if mode=vi
+          set keyseq-timeout 200
+          set keymap vi-command
+          "\e[A": history-search-backward
+          "\e[B": history-search-forward
+          j: history-search-forward
+          k: history-search-backward
+          set keymap vi-insert
+          "jj": vi-movement-mode
+          "\e[A": history-search-backward
+          "\e[B": history-search-forward
+          "\C-l": clear-screen
+        $endif
+      '';
+    };
+  };
+}

home/modules/shell/bash-aliases.nix

@@ -0,0 +1,54 @@
+{
+  ".." = "cd ..";
+
+  ls = "ls --color=auto";
+  l = "ls -1p";
+  ll = "ls -lhp";
+  lt = "ls -lhtp";
+  la = "ls -lhap";
+  lta = "ls -lhatp";
+  ldir = "ls -dp"; # list directories
+  grep = "grep --color=auto";
+
+  rm = "rm -I --preserve-root";
+  mv = "mv -iv";
+  cp = "cp -iv";
+  ln = "ln -i";
+  mkdir = "mkdir -pv";
+  chown = "chown --preserve-root";
+  chmod = "chmod --preserve-root";
+  chgrp = "chgrp --preserve-root";
+
+  ip = "ip --color";
+  ipa = "ip -brief address";
+  ipl = "ip -brief link";
+  ipr = "ip route";
+  df = "df -kTh";
+  fzfpac = "pacman -Slq | fzf -m --preview 'pacman -Si {1}' | xargs -ro sudo pacman -S";
+  path = ''echo -e ''${PATH//:/\\n}''; # Pretty print path variables
+
+  # Programs
+  h = "history";
+  o = "xdg-open";
+  v = "nvim";
+  vf = "fzf --bind 'enter:become(nvim {})'";
+  g = "git";
+  k = "kubectl";
+  t = "task";
+  tsh = "tasksh";
+  z = "zathura --fork";
+  f = "fzf";
+  fm = "pcmanfm &>/dev/null &";
+  mm = "micromamba";
+
+  # Languages
+  r5 = "plt-r5rs --no-prim";
+  hs = "ghci";
+  pl = "swipl";
+  py = "python";
+  r = "R";
+
+  azerty = "setxkbmap be";
+  qwerty = "setxkbmap us";
+  cole = "setxkbmap us -variant colemak";
+}

home/modules/shell/bash-js.bash

@@ -0,0 +1,31 @@
+# shellcheck shell=bash
+
+yarn() {
+  if [[ -f "package-lock.json" ]]; then
+    echo "WARNING: package-lock.json exists"
+    read -p "Are you sure you want to run yarn? [y/N] " -n 1 -r
+    echo
+    if [[ $REPLY =~ ^[Yy]$ ]]; then
+      command yarn "$@"
+    else
+      echo "Aborted"
+    fi
+  else
+    command yarn "$@"
+  fi
+}
+
+npm() {
+  if [[ -f "yarn.lock" ]]; then
+    echo "WARNING: yarn.lock exists"
+    read -p "Are you sure you want to run npm? [y/N] " -n 1 -r
+    echo
+    if [[ $REPLY =~ ^[Yy]$ ]]; then
+      command npm "$@"
+    else
+      echo "Aborted"
+    fi
+  else
+    command npm "$@"
+  fi
+}

home/modules/shell/bash.nix

@@ -37,7 +37,12 @@ in
     programs.bash = {
       enable = true;
       enableCompletion = true;
-
+      shellAliases =
+        lib.optionalAttrs cfg.aliases.all (import ./bash-aliases.nix)
+        // lib.optionalAttrs cfg.aliases.lang-js {
+          js = "node";
+          ts = "ts-node";
+        };
       historySize = 999999;
       historyFileSize = -1; # unlimited
       historyControl = [
@@ -52,29 +57,15 @@ in
         "ls"
         "cd"
       ];
-
       initExtra = ''
         for f in ${homeDirectory}/.bashrc.d/*; do
           [ -f "$f" ] && source "$f"
         done
-
-        ${lib.optionalString cfg.aliases.all "source ${homeDirectory}/.bash_aliases/all"}
-        ${lib.optionalString cfg.aliases.lang-js "source ${homeDirectory}/.bash_aliases/lang-js"}
-
+        ${lib.optionalString cfg.aliases.lang-js (builtins.readFile ./bash-js.bash)}
         ${cfg.extraInit}
       '';
     };
 
-    home.file = {
-      ".inputrc".source = dotsPath + "/.inputrc";
-      ".bashrc.d/prompt".source = dotsPath + "/.bashrc.d/prompt";
-    }
-    // lib.optionalAttrs cfg.aliases.all {
-      ".bash_aliases/all".source = dotsPath + "/.bash_aliases/all";
-    }
-    // lib.optionalAttrs cfg.aliases.lang-js {
-      ".bash_aliases/lang-js".source = dotsPath + "/.bash_aliases/lang-js";
-    };
     home.sessionPath = lib.optional cfg.addBinToPath "${dotsPath}/.bin";
   };
 }

home/modules/shell/default.nix

@@ -7,13 +7,23 @@
 {
   imports = [
     ./bash.nix
-    ./utils.nix
     ./prompt.nix
+    ./utils.nix
   ];
 
-  options.shell.enable = lib.mkEnableOption "shell";
+  options = {
+    shell.enable = lib.mkEnableOption "shell";
+    prompt.enable = lib.mkEnableOption "shell prompt" // {
+      default = config.shell.enable;
+    };
+    utils.enable = lib.mkEnableOption "shell utilities" // {
+      default = config.shell.enable;
+    };
+  };
 
   config = lib.mkIf config.shell.enable {
+    fzf.enable = lib.mkDefault true;
+    readline.enable = lib.mkDefault true;
     tmux.enable = lib.mkDefault true;
   };
 }

home/modules/shell/prompt.nix

@@ -5,7 +5,7 @@
 }:
 
 {
-  config = lib.mkIf config.shell.enable {
+  config = lib.mkIf config.prompt.enable {
     programs.starship = {
       enable = true;
       settings = {

home/modules/shell/utils.nix

@@ -1,26 +1,12 @@
 {
-  config,
   lib,
+  config,
   pkgs,
   ...
 }:
 
 {
-  config = lib.mkIf config.shell.enable {
-    programs.fzf = {
-      enable = true;
-      enableBashIntegration = lib.mkDefault true;
-      defaultCommand = "rg --files";
-      defaultOptions = [
-        "--pointer='❭'"
-        "--height 10%"
-      ];
-      fileWidget = {
-        command = "rg --files";
-        options = [ "--preview 'bat {} | head -500'" ];
-      };
-    };
-
+  config = lib.mkIf config.utils.enable {
     home.packages = with pkgs; [
       ripgrep
       bat

home/modules/tmux/default.nix

@@ -6,13 +6,10 @@
   ...
 }:
 
-let
-  cfg = config.tmux;
-in
 {
   options.tmux.enable = lib.mkEnableOption "tmux";
 
-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf config.tmux.enable {
     home.packages = with pkgs; [
       tmuxp
       reptyr