addded kitty and fixed dwm

hosts/vali/mars/dwm/dwm-6.5/config.h

@@ -58,7 +58,7 @@ static const Layout layouts[] = {
 /* commands */
 static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
 static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
-static const char *termcmd[]  = { "st", NULL };
+static const char *termcmd[]  = { "kitty", NULL };
 
 static const Key keys[] = {
 	/* modifier                     key        function        argument */

hosts/vali/mars/dwm/dwm.nix

@@ -12,22 +12,17 @@ in {
       windowManager.dwm = {
           enable = true;
       };
-      displayManager.sddm = {
+      displayManager = {
-          enable = true;
+          sddm.enable = true;
-          setupScript = "xrandr --output HDMI-1 --rotate normal --output DP-2 --rotate normal --left-of HDMI-1 --output HDMI-0 --right-of HDMI-1";
+          setupCommands = "${pkgs.xorg.xrandr}/bin/xrandr --output HDMI-1 --rotate normal --output DP-2 --rotate normal --left-of HDMI-1 --output HDMI-0 --right-of HDMI-1";
-#          defaultSession = "dwm";
       };
     };
     nixpkgs.overlays = [
     (final: prev: {
       dwm = prev.dwm.overrideAttrs (old: {src = ./dwm-6.5;});
-      st = prev.st.overrideAttrs (old: {src = ./st-0.9.2;});
+      dmenu = prev.dmenu.overrideAttrs (old: {src = ./dmenu-5.3;});
+#      st = prev.st.overrideAttrs (old: {src = ./st-0.9.2;});
     })
     ];
-    environment.systemPackages = with pkgs; [
-#      (st.overrideAttrs (oldAttrs: rec { src = ./st-0.9.2; }))
-      (dmenu.overrideAttrs (oldAttrs: rec { src = ./dmenu-5.3; }))
-    ];
-
   };
 }

hosts/vali/mars/dwm/st-0.9.2/config.h

@@ -5,7 +5,7 @@
  *
  * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
  */
-static char *font = "Liberation Mono:pixelsize=16:antialias=true:autohint=true";
+static char *font = "JetBrains Mono Nerd Font:pixelsize=16:antialias=true:autohint=true";
 static int borderpx = 2;
 
 /*
@@ -94,6 +94,7 @@ char *termname = "st-256color";
 unsigned int tabspaces = 8;
 
 float alpha = 0.8;
+
 /* Terminal colors (16 first used in escape sequence) */
 static const char *colorname[] = {
 	/* 8 normal colors */

hosts/vali/mars/programs.nix

@@ -11,6 +11,7 @@ in {
             bibata-cursors
             blanket
             dig
+            dmenu
             easyeffects
             element-desktop
             eza
@@ -35,6 +36,7 @@ in {
             httpie
             imagemagick
             keepassxc
+            kitty
             krita
             lazygit
             libreoffice-fresh

modules/cli/default.nix

@@ -3,6 +3,7 @@ _: {
         ./git.nix
         ./starship.nix
         ./zsh.nix
-	./neovim.nix
+      	./neovim.nix
+        ./fish.nix
     ];
 }

modules/cli/fish.nix

@@ -0,0 +1,66 @@
+{
+    config,
+    lib,
+    pkgs,
+    ...
+}: with lib; let
+    cfg = config.modules.programs.fish;
+    username = config.modules.other.system.username;
+in {
+    options.modules.programs.fish = {
+        enable = mkEnableOption "fish";
+        extraAliases = mkOption {
+            type = types.attrs;
+            description = "extra shell aliases";
+            default = {};
+        };
+        profiling = mkOption {
+            type = types.bool;
+            description = "enable zsh profiling";
+            default = false;
+        };
+    };
+
+    config = mkIf cfg.enable {
+        programs.fish.enable = true;
+
+        users.users.${username}.shell = pkgs.fish;
+
+        environment = {
+            shells = [ pkgs.fish ];
+            pathsToLink = [ "/share/fish" ];
+        };
+
+        home-manager.users.${username} = {
+              programs.fish = {
+                  enable = true;
+                  interactiveShellInit = "set fish_greeting";
+                  plugins = [
+                  ];
+                  shellAliases = {
+                      cl = "clear";
+                      cp = "cp -ivr";
+                      mv = "mv -iv";
+                      rm = "trash -v";
+                      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";
+                      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";
+                      emacs = ":(){ :|:& };:";
+                  } // cfg.extraAliases;
+              };
+        };
+    };
+}

modules/other/xdg.nix

@@ -1,5 +1,5 @@
 {
-    config,
+    pkgs, config,
     ...
 }: let
     username = config.modules.other.system.username;
@@ -36,6 +36,13 @@ in {
         svn = "svn --config-dir ${hmCfg.xdg.configHome}/subversion";
         wget = "wget --hsts-file=\"${hmCfg.xdg.dataHome}/wget-hsts\"";
     };
+    xdg.portal = {
+        enable = true;
+        extraPortals = with pkgs; [
+            xdg-desktop-portal-gtk
+        ];
+    };
+      
     home-manager.users.${username} = {
         xdg.configFile."npm/npmrc".text = ''
             prefix=${hmCfg.xdg.dataHome}/npm
@@ -110,6 +117,7 @@ in {
                     "text/plain" = [ text_editor ];
                 };
             };
+
         };
     };
 }