feat: change some misc stuff and trim filetree

home-manager/stvnliu/shells/aliases/default.nix

@@ -3,10 +3,11 @@
   cd = "z";
   cdi = "zi";
   cat = "${pkgs.bat}/bin/bat";
+  ls = "${pkgs.lsd}/bin/lsd";
   ll = "ls -l";
   rm = "${pkgs.trash-cli}/bin/trash";
   osupdate = "${pkgs.nh}/bin/nh os switch";
   homeupdate = "${pkgs.nh}/bin/nh home switch";
-  #batmon = "watch -n0 upower -i /org/freedesktop/UPower/devices/battery_BAT1";
+  batmon = "watch -n0 upower -i /org/freedesktop/UPower/devices/battery_BAT1";
   inception = "${pkgs.pipx}/bin/pipx run copier copy --trust gh:DataChefHQ/Inception .";
 }

home-manager/stvnliu/shells/default.nix

@@ -23,9 +23,9 @@ in
     config = {
       myShells = {
         zsh.enable = false;
-        fish.enable = false;
+        fish.enable = true;
-        nushell.enable = true;
+        #nushell.enable = true;
-        defaultShell = "${config.programs.nushell.package}/bin/nu";
+        defaultShell = "${config.programs.fish.package}/bin/fish";
         prompts.starship.enable = true;
       };
     };

home-manager/stvnliu/shells/starship/presets/pure-direnv.toml

@@ -31,12 +31,12 @@ style = "bright-black"
 [git_status]
 format = "[[(*$conflicted$untracked$modified$staged$renamed$deleted)](218) ($ahead_behind$stashed)]($style)"
 style = "cyan"
-conflicted = "​"
+conflicted = "!"
-untracked = "​"
+untracked = "U"
-modified = "​"
+modified = "*"
-staged = "​"
+staged = "+"
-renamed = "​"
+renamed = "R"
-deleted = "​"
+deleted = "-"
 stashed = "≡"
 
 [git_state]

home-manager/stvnliu/stylix.nix

@@ -17,10 +17,10 @@ in {
       };
       monospace = {
         name = config.desktopFontFullName;
-        package = pkgs.nerd-fonts.jetbrains-mono;
+        package = pkgs.nerd-fonts.intone-mono;
       };
       sizes = {
-        terminal = 24;
+        terminal = 18;
         applications = 12;
       };
     };

home-manager/stvnliu/swaywm.nix

@@ -1,14 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}: {
-  wayland.windowManager.sway = {
-    enable = true;
-    config = rec {
-      modifier = "Mod4";
-      terminal = "${pkgs.foot}/bin/foot -f '${config.desktopFontFullName}:size=24' zsh";
-    };
-  };
-}