From 35b69479d2d0b33a35c7d3fb32f554e5be2c7e02 Mon Sep 17 00:00:00 2001
From: Charlie Root <charlie@charlieroot.dev>
Date: Sat, 20 Apr 2024 22:59:53 +0200
Subject: [PATCH] addded kitty and fixed dwm

---
 hosts/vali/mars/dwm/dwm-6.5/config.h  |   2 +-
 hosts/vali/mars/dwm/dwm-6.5/dwm       | Bin 62656 -> 62656 bytes
 hosts/vali/mars/dwm/dwm-6.5/dwm.o     | Bin 57904 -> 57904 bytes
 hosts/vali/mars/dwm/dwm.nix           |  15 ++----
 hosts/vali/mars/dwm/st-0.9.2/config.h |   3 +-
 hosts/vali/mars/dwm/st-0.9.2/st       | Bin 96648 -> 96648 bytes
 hosts/vali/mars/dwm/st-0.9.2/x.o      | Bin 75272 -> 75272 bytes
 hosts/vali/mars/programs.nix          |   2 +
 modules/cli/default.nix               |   3 +-
 modules/cli/fish.nix                  |  66 ++++++++++++++++++++++++++
 modules/other/xdg.nix                 |  10 +++-
 11 files changed, 87 insertions(+), 14 deletions(-)
 create mode 100644 modules/cli/fish.nix

diff --git a/hosts/vali/mars/dwm/dwm-6.5/config.h b/hosts/vali/mars/dwm/dwm-6.5/config.h
index 3f512af..9acb871 100644
--- a/hosts/vali/mars/dwm/dwm-6.5/config.h
+++ b/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 */
diff --git a/hosts/vali/mars/dwm/dwm-6.5/dwm b/hosts/vali/mars/dwm/dwm-6.5/dwm
index 5424031efddfa2f90be022e761ff0b34bb3996d2..027a9773a00907a21beaca0a62e9a2049098fff5 100755
GIT binary patch
delta 432
zcmX@`lKH?(<_Q-#U#K&H!HbPI|4JwrT4a`4RvHy%B_*2WWK?Ek6ciL%6sF{qXP72t
z6(kyLJ|J1ewAn#sg77ATJ5h}3o9}jUaIj`)mXuUZem<#ebHd~V6-A!O4qzkS2S8{6
zC?71yz`!6f`QdhXMv2LcJJcCvCo}Gln7rXF`(%$D5{{}+mFiGh6H04C>3NeNCh9`@
z`cT>sN*ixpxWk=^@&4qOyW#~oWFd;#q4pk_9J$+{v0(Db-SW&0(hie1s;6!?*dxFa
z`5J2KS12uT0iy8-j6Vg!{{!VSK=}+%TR%W)7AXAyN^?w}c_5t8bo0jp`g)A_Co8_!
t=WLLM7}YR2^1V4{feeIKFnQ*CbIt=$-hs(C-<xy6T+bo9S?a?w76349Z`1$)

delta 406
zcmX@`lKH?(<_Q-#cc?Rf!H$hL|4MA;kxF4=1@kxO%S;rWT)=9u$>2^DW6I{cT^t-t
z#U+zpO)A?QJ2_cJk#n*GSmFBs2+a%Sg9RBF7z8Ij+%C^3I+<~YI-}HN#vKxqH@sz^
z?6E__Q3<M21xl+yX$>enZxX~rEht|HO6x&sgUt(fxHB=XocwZEyx<KPh+=lAy%Q!!
z?)GPNn7negJhPXy!{mqRshbV<2(U!HfSURVN()?oX#5J}Pl51%Lir3({$D8n1Jrg#
zDE$CRvre9QAe_-?^Tz}FdW<V4E56s~^pb`c<uy6-y*Z}?)P)X{XTCS*oB-ubn0)iS
QITy_JH)J+TeOSf<0IHN^4*&oF

diff --git a/hosts/vali/mars/dwm/dwm-6.5/dwm.o b/hosts/vali/mars/dwm/dwm-6.5/dwm.o
index 16a9fb0b210345759e64b77487522356433a3a0e..4fb9219987d1c8c5d024763921e921540ab33dbd 100644
GIT binary patch
delta 281
zcmdmRgc*e5oLRFoOG+v?Cpg!#Y<}P_(ay*^`R6%(NlqpP2;hWJj0_A6{0s~XyptWz
z>oW>YE<7(TDF#*3fTl)n^1}1tk_u4S323rPlP{hZmsEkuE<lr2o6LAYTv7uny8%sB
zYqH@5aY-Gh>;W`cz0HXi>KPfIOn!J#oblb{pBMERKTg)Xq|f+ua^xj_#-EcrFX=P>
moxJmsJ`*F;<X4yWF&b=Md0Cx{(P{F<yXK6CHgn!nX8{03Cq9J$

delta 282
zcmdmRgc*e5oSBMCHYYpRvP`xM<l6k)U9g>zY4Xo=`jTu+3=qHxp%@t$82A|&7`P@o
zp4VsOn_PHaTv8aSrU6Zj^yG!-#U*8-vJ=o`<tJY}FD|JFm0f@)t2~+Ug1DqARCWWJ
ztomfb3*wTRP}u`$vf7&yFVr(KKAimUqB!I0$v-dZGrpUwc}bt~)8xoY`i$QucV5zG
n{55&!C4HuUjFVqo+Q+E7dF5qwE=K#w7w?)g?%&LLPn`t-Bm_Si

diff --git a/hosts/vali/mars/dwm/dwm.nix b/hosts/vali/mars/dwm/dwm.nix
index 8360022..fd2c9a0 100644
--- a/hosts/vali/mars/dwm/dwm.nix
+++ b/hosts/vali/mars/dwm/dwm.nix
@@ -12,22 +12,17 @@ in {
       windowManager.dwm = {
           enable = true;
       };
-      displayManager.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";
-#          defaultSession = "dwm";
+      displayManager = {
+          sddm.enable = true;
+          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";
       };
     };
     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; }))
-    ];
-
   };
 }
diff --git a/hosts/vali/mars/dwm/st-0.9.2/config.h b/hosts/vali/mars/dwm/st-0.9.2/config.h
index 2a6a93a..a7ddde6 100644
--- a/hosts/vali/mars/dwm/st-0.9.2/config.h
+++ b/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 */
diff --git a/hosts/vali/mars/dwm/st-0.9.2/st b/hosts/vali/mars/dwm/st-0.9.2/st
index a27a3e331758543f784aff2e1edfc514a5aaf618..6feef36151490e86415b089f6e31cc695b80f86b 100755
GIT binary patch
delta 8812
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
USjK41+3*fxMZ@-mWsJ|608&Sg2mk;8

delta 8814
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
F697ssgeCw0

diff --git a/hosts/vali/mars/dwm/st-0.9.2/x.o b/hosts/vali/mars/dwm/st-0.9.2/x.o
index f3af8e01d0fb2b405affe3272de9ea8db61668c6..5188aa0b13a060cfe6a721d8d1831f9e9b802f36 100644
GIT binary patch
delta 77
zcmeA;!_skvWy1+?Rj<?%r=rBnykZ64{JeYxzto}>1-JaX603sDiqxFq%&JsdL$k?G
hyp=a|_!Mw%ZU_}P#8|L>qBx^C7vsF`D-{{zSpbgb93%h$

delta 72
zcmeA;!_skvWy1+?8K2Cg)S|?a%=|nB-~7CMtAfmm)STkXs#IGe<H>Kml{fSI6mm}f
d;KZ@HAynWHW5)K0;*8>4jMKKSRAh{20RSOk8x8;f

diff --git a/hosts/vali/mars/programs.nix b/hosts/vali/mars/programs.nix
index b346d4c..1b5e47e 100644
--- a/hosts/vali/mars/programs.nix
+++ b/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
diff --git a/modules/cli/default.nix b/modules/cli/default.nix
index 117462f..b94d6d3 100644
--- a/modules/cli/default.nix
+++ b/modules/cli/default.nix
@@ -3,6 +3,7 @@ _: {
         ./git.nix
         ./starship.nix
         ./zsh.nix
-	./neovim.nix
+      	./neovim.nix
+        ./fish.nix
     ];
 }
diff --git a/modules/cli/fish.nix b/modules/cli/fish.nix
new file mode 100644
index 0000000..257f729
--- /dev/null
+++ b/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;
+              };
+        };
+    };
+}
diff --git a/modules/other/xdg.nix b/modules/other/xdg.nix
index 09c8966..7075aeb 100644
--- a/modules/other/xdg.nix
+++ b/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 ];
                 };
             };
+
         };
     };
 }