Move a bunch of things around

home/features/cli/bat.nix

@@ -1,8 +1,10 @@
 {
   # Enabling this produces an uglier theme for some reason.
-  # options.stylix.targets.bat.enable =true;
+  # options.stylix.targets.bat.enable = true;
   programs.bat = {
     enable = true;
     config.theme = "base16-256";
   };
+
+  home.shellAliases.cat = "bat";
 }

home/features/cli/default.nix

@@ -16,21 +16,42 @@
 
   # Install clis
   home.packages = with pkgs; [
-    ranger # Terminal file explorer
-    comma # Intstall and run programs by sticking a , before them
-    bc # Calculator
+    # {{{ System information 
+    acpi # Battery stats
+    neofetch # Display system information
+    tokei # Useless but fun line of code counter (sloc alternative)
+    bottom # System monitor
+    # }}}
+    # {{{ Storage 
     ncdu # TUI disk usage
     du-dust # Similar to du and ncdu in purpose.
+    # }}}
+    # {{{ Alternatives to usual commands
     ripgrep # Better grep
     fd # Better find
     sd # Better sed
     httpie # Better curl
+    # }}}
+    # {{{ Misc  
+    ranger # Terminal file explorer
+    comma # Intstall and run programs by sticking a , before them
+    bc # Calculator
     ouch # Unified compression / decompression tool
     mkpasswd # Hash passwords
-    neofetch # Display system information
-    tokei # Useless but fun line of code counter (sloc alternative)
-    bottom # System monitor
     inputs.agenix.packages.${pkgs.system}.agenix # Secret encryption
-    inputs.deploy-rs.packages.${pkgs.system}.default # Deployment
+    # }}}
   ];
+
+  # Set up common aliases
+  home.shellAliases = {
+    # {{{ Storage
+    # -h = humans readable units
+    df = "df -h";
+    du = "du -h";
+
+    # short for `du here`
+    # -d = depth
+    duh = "du -hd 1";
+    # }}}
+  };
 }

home/features/cli/fish/default.nix

@@ -1,33 +1,27 @@
-{ pkgs, config, ... }:
+{ pkgs, config, lib, ... }:
 {
   programs.fish = {
     enable = true;
 
-    shellAbbrs = {
-      battery = "acpi";
-    };
-
-    shellAliases = {
-      cat = "bat";
-      df = "df -h";
-      du = "du -h";
-      duh = "du -hd 1"; # short for du here
-      pdf = "zathura --fork"; # Open a pdf reader
-    };
-
-    # with pkgs.fishPlugins;
-    plugins = [
-      # Jump to directories by typing "z <directory-name>"
-      {
-        name = "z";
-        src = pkgs.fetchFromGitHub {
-          owner = "jethrokuan";
-          repo = "z";
-          rev = "85f863f20f24faf675827fb00f3a4e15c7838d76";
-          sha256 = "1kaa0k9d535jnvy8vnyxd869jgs0ky6yg55ac1mxcxm8n0rh2mgq";
-        };
-      }
-    ];
+    plugins =
+      let
+        plugins = with pkgs.fishPlugins; [
+          z # Jump to directories by typing "z <directory-name>"
+          grc # Adds color to a bunch of built in commands
+          done # Trigger a notification when long commands finish execution
+          puffer # Text expansion (i.e. expanding .... to ../../../)
+          sponge # Remove failed commands and whatnot from history
+          forgit # Git tui thingy? (I'm still trying this one out)
+          fzf-fish # Fuzzy finder for things like files
+          colored-man-pages # Self explainatory:)
+        ];
+      in
+      # For some reason home-manager expects a slightly different format 🤔
+      lib.forEach plugins
+        (plugin: {
+          name = plugin.pname;
+          inherit (plugin) src;
+        });
 
     interactiveShellInit = builtins.readFile ./config.fish;
   };