rework system, programs, desktop, cli and base aspects

aspects/base/base.nix

@@ -1,48 +0,0 @@
-{ inputs, ... }:
-{
-  flake.modules.nixos.base =
-    { lib, pkgs, ... }:
-    {
-      imports = with inputs.self.modules.nixos; [
-        boot
-        console
-        firewall
-        locale
-        nix
-        security
-        ssh
-      ];
-      environment = {
-        systemPackages = with pkgs; [
-          git
-          fastfetch
-          nixos-firewall-tool
-          sysz
-          wget
-          yazi
-        ];
-        shellAliases = {
-          cat = "${lib.getExe pkgs.bat} --paging=never --style=plain";
-          ls = "${lib.getExe pkgs.eza} --git --icons --group-directories-first";
-          tree = "ls --tree";
-        };
-      };
-
-      programs = {
-        command-not-found.enable = false;
-        fish = {
-          enable = true;
-        };
-      };
-
-      services = {
-        dbus.implementation = "broker";
-        irqbalance.enable = true;
-        fstrim.enable = true;
-        tailscale = {
-          enable = true;
-          extraUpFlags = [ "--operator=user" ];
-        };
-      };
-    };
-}

aspects/base/bash.nix

@@ -0,0 +1,16 @@
+{ ... }:
+{
+  flake.modules.homeManager.bash =
+    {
+      config,
+      lib,
+      pkgs,
+      ...
+    }:
+    {
+      programs.bash = {
+        enable = true;
+        historyFile = "~/.cache/bash_history";
+      };
+    };
+}

aspects/base/fish.nix

@@ -0,0 +1,47 @@
+{ ... }:
+{
+  flake.modules = {
+    nixos.fish =
+      { ... }:
+      {
+        programs.fish.enable = true;
+      };
+    homeManager.fish =
+      {
+        config,
+        lib,
+        pkgs,
+        ...
+      }:
+      {
+        programs.fish = {
+          enable = true;
+          interactiveShellInit = ''
+            set fish_greeting
+            ${lib.getExe pkgs.nix-your-shell} fish | source
+          '';
+          loginShellInit = "${lib.getExe pkgs.nix-your-shell} fish | source";
+          plugins = [
+            {
+              name = "bang-bang";
+              src = pkgs.fetchFromGitHub {
+                owner = "oh-my-fish";
+                repo = "plugin-bang-bang";
+                rev = "f969c618301163273d0a03d002614d9a81952c1e";
+                sha256 = "sha256-A8ydBX4LORk+nutjHurqNNWFmW6LIiBPQcxS3x4nbeQ=";
+              };
+            }
+            {
+              name = "z";
+              src = pkgs.fetchFromGitHub {
+                owner = "jethrokuan";
+                repo = "z";
+                rev = "067e867debee59aee231e789fc4631f80fa5788e";
+                sha256 = "sha256-emmjTsqt8bdI5qpx1bAzhVACkg0MNB/uffaRjjeuFxU=";
+              };
+            }
+          ];
+        };
+      };
+  };
+}