feat: complete overhaul. hyprland -> dwl; foot -> ghostty; nushell -> fish; stylix: completely custom again

home/pc/common/programs/carapace.nix

@@ -1,7 +1,7 @@
-{...}:
+{ ... }:
 {
-    programs.carapace = {
-        enable = true;
-        enableNushellIntegration = true;
-    };
+  programs.carapace = {
+    enable = true;
+    enableFishIntegration = true;
+  };
 }

home/pc/common/programs/default.nix

@@ -6,12 +6,13 @@
     ./btop.nix
     ./carapace.nix
     ./fastfetch.nix
+    ./fish.nix
     ./git.nix
     ./hyfetch.nix
     ./mako.nix
     ./ncspot.nix
     ./nix-search-tv.nix
-    ./nushell.nix
+    #./nushell.nix
     ./starship.nix
     ./tmux.nix
     ./vesktop.nix

home/pc/common/programs/fish.nix

@@ -0,0 +1,51 @@
+{ pkgs, ... }:
+{
+  home.packages = [
+    pkgs.nix-your-shell
+    pkgs.lolcat
+    pkgs.kittysay
+    pkgs.eza
+  ];
+
+  programs.fish = {
+    enable = true;
+    shellInit = ''
+      function fish_prompt
+        string join ' ' -- (set_color magenta) $(prompt_pwd) :3 (set_color normal)
+      end
+
+      function fish_greeting
+        echo hii autumn :3\nthe time is $(date +%T) | kittysay | lolcat
+      end
+
+      function ls --description "List directory contents"
+        eza --icons=always $argv
+      end
+
+      function nix-shell --description "Start an interactive shell based on a Nix expression"
+        nix-your-shell  fish nix-shell -- $argv
+      end
+
+      function nix --description "Reproducible and declarative configuration management"
+        nix-your-shell  fish nix -- $argv
+      end
+    '';
+
+    shellInitLast = ''
+      set fish_color_normal green 
+      set fish_color_command magenta --bold
+      set fish_color_quote yellow
+      set fish_color_redirection white
+      set fish_color_end magenta 
+      set fish_color_error red --bold
+      set fish_color_param blue
+      set fish_color_valid_path blue 
+      set fish_color_option blue
+      set fish_color_comment brblack --italics
+      set fish_color_operator yellow
+      set fish_color_escape blue --italics
+      set fish_color_autosuggestion brblack
+      set fish_color_cancel brblack
+    '';
+  };
+}

home/pc/common/programs/foot.nix

@@ -1,12 +0,0 @@
-{ config, lib, ... }:
-{
-  programs.foot = {
-    enable = true;
-    settings = {
-      main.font = lib.mkForce "${config.stylix.fonts.monospace.name}:size=19";
-      main.font-size-adjustment = 1;
-      cursor.style = "beam";
-      key-bindings.spawn-terminal = "none";
-    };
-  };
-}

home/pc/common/programs/starship.nix

@@ -1,5 +1,6 @@
-{...}: {
+{ ... }:
+{
   programs.starship = {
-    enable = true;
+    #enable = true;
   };
 }

home/pc/common/programs/waybar.nix

@@ -4,7 +4,7 @@
     {
         "position": "top",
         "spacing": 4,
-        "modules-left": ["custom/icon", "ext/workspaces", "tray"],
+        "modules-left": ["custom/icon", "dwl/tags", "tray"],
         "modules-center": ["clock"],
         "modules-right": ["pulseaudio", "cpu", "memory", "temperature", "battery"],
         "custom/icon": {
@@ -15,7 +15,8 @@
             "spacing": 10
         },
         "clock": {
-            "format": "{:%Y/%m/%d - %A - %R}"
+            "format": "{:%Y/%m/%d - %A - %R}",
+            "tooltip": false
         },
         "cpu": {
             "format": " {usage}%",
@@ -64,11 +65,16 @@
       * {
         font-family: "${config.stylix.fonts.serif.name}";
       	font-size: 16px;
-      	min-height: 10px;
+      	min-height: 16px;
+      }
+
+      window#waybar {
+        margin-top: 6px;
+        padding-left: 10px;
+        padding-right: 10px;
       }
 
       #custom-icon,
-      #workspaces,
       #tray,
       #clock,
       #pulseaudio, 
@@ -76,47 +82,24 @@
       #memory,
       #temperature,
       #battery {
-        border-width: 2px;
-        border-style: solid;
-        border-color: #${config.stylix.base16Scheme.palette.base0D};
-        border-radius: 10px;
       	margin-top: 6px;
       	margin-left: 8px;
       	padding-left: 10px;
       	margin-bottom: 0px;
       	padding-right: 10px;
-      	border-radius: 10px;
-      	transition: none;
-      	color: #${config.stylix.base16Scheme.palette.base05};
+        color: #${config.stylix.base16Scheme.palette.base05};
       	background: #${config.stylix.base16Scheme.palette.base00};
+        border: 2px solid #${config.stylix.base16Scheme.palette.base0D};
       }
 
       #custom-icon {
         margin-left: 10px;
       }
+
       #memory {
         margin-right: 10px;
       }
 
-
-      window#waybar {
-      	background: transparent;
-      }
-
-      window#waybar.hidden {
-      	opacity: 0.2;
-      }
-
-      #window {
-      	margin-top: 6px;
-      	padding-left: 10px;
-      	padding-right: 10px;
-      	border-radius: 10px;
-      	transition: none;
-        color: transparent;
-      	background: transparent;
-      }
-
       #battery.critical:not(.charging) {
         animation-name: blink;
         animation-duration: 0.5s;
@@ -131,8 +114,23 @@
         }
       }
 
-      #workspaces button.active {
+      #tags {
+      	margin-top: 6px;
+      	margin-left: 8px;
+      	padding-left: 10px;
+      	margin-bottom: 0px;
+      	padding-right: 10px;
+        border: 2px solid #${config.stylix.base16Scheme.palette.base0D};
+      }
+
+      #tags button.occupied {
+        color: #${config.stylix.base16Scheme.palette.base0B};
+      	background: #${config.stylix.base16Scheme.palette.base00};
+      }
+
+      #tags button.focused {
         color: #${config.stylix.base16Scheme.palette.base0D};
+        background: #${config.stylix.base16Scheme.palette.base00};
       }
     '';
   };

home/pc/common/programs/zoxide.nix

@@ -2,6 +2,6 @@
 {
   programs.zoxide = {
     enable = true;
-    enableNushellIntegration = true;
+    enableFishIntegration = true;
   };
 }