added stuff

modules/cli/fish.nix

@@ -6,6 +6,8 @@
 }: with lib; let
     cfg = config.modules.programs.fish;
     username = config.modules.other.system.username;
+    hostname = config.modules.other.system.hostname;
+    gitPath = config.modules.other.system.gitPath;
 in {
     options.modules.programs.fish = {
         enable = mkEnableOption "fish";
@@ -27,39 +29,32 @@ in {
         };
 
         home-manager.users.${username} = {
+              home.packages = with pkgs; [ nix-output-monitor ];
+              programs.zoxide.enable = true;
+              programs.zoxide.enableFishIntegration = true;
               programs.fish = {
                   enable = true;
                   interactiveShellInit = "set fish_greeting";
                   plugins = [
                        { name = "grc"; src = pkgs.fishPlugins.grc.src; }
-                       { name = "z"; src = pkgs.fishPlugins.z.src; }
                        { name = "sponge"; src = pkgs.fishPlugins.sponge.src; }
                        { name = "done"; src = pkgs.fishPlugins.done.src; }
                        { name = "colored_man_pages"; src = pkgs.fishPlugins.colored-man-pages.src; }
                        { name = "tide"; src = pkgs.fishPlugins.tide.src; }
                   ];
-                  shellAliases = {
-
-                      cl = "clear";
-                      cp = "cp -ivr";
+                  shellAbbrs = {
+                      c = "clear";
+                      cc = "cd ~ && clear";
                       mv = "mv -iv";
                       rm = "trash -v";
+                      ls = "eza";
                       l = "eza -a --icons";
-                      e = "eza -lha --icons --git";
-                      untar = "tar -xvf";
-                      untargz = "tar -xzf";
-                      mnt = "udisksctl mount -b";
-                      umnt = "udisksctl unmount -b";
-                      v = "nvim";
+                      la = "eza -lha --icons --git";
                       kys = "shutdown now";
-                      gpl = "curl https://www.gnu.org/licenses/gpl-3.0.txt -o LICENSE";
-                      agpl = "curl https://www.gnu.org/licenses/agpl-3.0.txt -o LICENSE";
-                      g = "git";
-                      gs = "g stash";
-                      n = "nix";
-                      woman = "man";
-                      open = "xdg-open";
-                      ":q" = "exit";
+                      cd = "z";
+                      nv = "nvim";
+                      update = "sudo -p 'password: ' echo 'Your daughter is just a fork of your wife.' && sudo nixos-rebuild switch --flake \"${gitPath}#${hostname}\" --log-format internal-json |& nom --json";
+                      flake = "cd '${gitPath}'";
                   } // cfg.extraAliases;
               };
         };

modules/gui/gtk.nix

@@ -1,9 +1,5 @@
-{
-    config,
-    lib,
-    pkgs,
-    ...
-}: with lib; let
+{ config, lib, pkgs, ... }:
+with lib; let
     cfg = config.modules.themes.gtk;
     username = config.modules.other.system.username;
     hmCfg = config.home-manager.users.${username};