From 1b7d65b87f949df5d0a84a0a7484c5dee68f96b6 Mon Sep 17 00:00:00 2001
From: coast <coasteen@proton.me>
Date: Wed, 5 Nov 2025 05:55:26 +0330
Subject: [PATCH] nix changes, switch to alacritty, add new niri keybind,
 etc...

---
 config/eww/eww.scss                           |   8 +++---
 config/niri/config.kdl                        |   8 ++++--
 ...oast%.local%src%config%waybar%config.jsonc | Bin 89712 -> 92703 bytes
 ...e%coast%.local%src%config%waybar%style.css | Bin 72025 -> 78156 bytes
 config/nvim/undo/%home%coast%.wezterm.lua     | Bin 11761 -> 14460 bytes
 config/rofi/gruvbox.rasi                      |   2 +-
 config/waybar/config.jsonc                    |   6 ++--
 config/waybar/style.css                       |   6 ++--
 nixos/configuration/configuration.nix         |   5 ++--
 nixos/flake.nix                               |   1 +
 nixos/home-configuration/apps/alacritty.nix   |  26 ++++++++++++++++++
 nixos/home-configuration/apps/zsh.nix         |   3 --
 nixos/home-configuration/configuration.nix    |  17 ++++++------
 13 files changed, 56 insertions(+), 26 deletions(-)
 create mode 100644 nixos/home-configuration/apps/alacritty.nix

diff --git a/config/eww/eww.scss b/config/eww/eww.scss
index b782201..6bda398 100644
--- a/config/eww/eww.scss
+++ b/config/eww/eww.scss
@@ -1,13 +1,13 @@
 * {
   all: unset;
   background: transparent;
-  font-family: "Fira Code Nerd Font";
+  font-family: "JetBrainsMono Nerd Font";
   border-radius: 10px;
 }
 
-$bg: #1d2021;
-$bg1: #282828;
-$bg2: #32302f;
+$bg: #2a2a2a;
+$bg1: #2a2a2a;
+$bg2: #2a2a2a;
 $fg: #ebdbb2;
 $fgdim: #bdae93;
 $accent: #d79921;
diff --git a/config/niri/config.kdl b/config/niri/config.kdl
index 181635b..af2f6ae 100644
--- a/config/niri/config.kdl
+++ b/config/niri/config.kdl
@@ -84,9 +84,11 @@ screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png"
 spawn-at-startup "waybar"
 spawn-at-startup "swww-daemon"
 spawn-at-startup "swww img --outputs HDMI-A-1 ~/Wallpapers/wall9.png"
+spawn-at-startup "eww daemon"
+spawn-at-startup "eww open-many year month day"
 
 window-rule {
-    match app-id=r#"^org\.wezfurlong\.wezterm$"#
+    match app-id=r#"^org\.wezfurlong\.alacritty$"#
     default-column-width {}
 }
 
@@ -107,7 +109,7 @@ window-rule {
 
 binds {
     Mod+Shift+Slash { show-hotkey-overlay; }
-    Mod+Return hotkey-overlay-title="Open a Terminal: wezterm" { spawn "wezterm"; }
+    Mod+Return hotkey-overlay-title="Open a Terminal: alacritty" { spawn "alacritty"; }
     Mod+R hotkey-overlay-title="Run an Application: rofi" { spawn-sh "rofi -show drun -config ~/.config/rofi/gruvbox.rasi"; }
 	Mod+Shift+Return hotkey-overlay-title="Run an application: rofi (run)" { spawn-sh "rofi -show run -config ~/.config/rofi/gruvbox.rasi"; }
     Super+Alt+L hotkey-overlay-title="Lock the Screen: swaylock" { spawn "swaylock"; }
@@ -174,6 +176,8 @@ binds {
     Mod+Ctrl+U         { move-column-to-workspace-down; }
     Mod+Ctrl+I         { move-column-to-workspace-up; }
 
+	Mod+Shift+P			{ spawn-sh "pkill waybar && waybar & disown && eww kill && eww daemon && eww open-many year month day"; }
+
     Mod+Shift+Page_Down { move-workspace-down; }
     Mod+Shift+Page_Up   { move-workspace-up; }
     Mod+Shift+M         { move-workspace-down; }
diff --git a/config/nvim/undo/%home%coast%.local%src%config%waybar%config.jsonc b/config/nvim/undo/%home%coast%.local%src%config%waybar%config.jsonc
index cc87a71a88ec5f5dd820ada412c405e461f84e0d..2efa0c02167dae4b4a41974c221d678bd133821e 100644
GIT binary patch
delta 642
zcmeychjsoH*7~r_-1(t-F8NOxn0@UQG#uW#?3Qn_xyqlnjWNXwXI0HKSJDhANvq%2
zbd!&Pfgux!`SkTUIhB$UOG;9UDwTAAA_5>$AZ7&O4L}S6AR2}lGP!2hvw&nR7~(I0
zWPyMQOg0v8EoQtK$+&vEZxo{{ljtg-=o+vLgjfxv1U7$o;K?{~fubzX95b*v3=Cf-
zfHM3bS%^Xg#z|8oSWO#&;*&S*7N34Wg^`7ciE;9+ow9-;L)Jo-fv7c`8@}Z;GIPza
zn0$d%WU|2z7Ga2ayg*5iM>0UFCST+fnO>*D$T9gqFpJ3}kPs3Og|bZ>!9D`Hc^#58
z$U465jTVgAAbTu9_OOBi59CTtuq%Na-syn`jKY%@Bv=@~O%{|8pZ-CHkzEv|bv+Qn
z0LWOr?S)~CIgCsYlNd86e`J<n)SJx5A~QKb1f)AqL{1W<5ESGv05Sv|LfaFg7&92f
zXIO*7&K%-bkUv3TmpR#sM}d(K6lhHBjFS^j%8DY}4l)d6sK92$>)=SR07ilxG&13l
gAP6!Dh(U3TmOfyf<)1uZi8zxe*oN&zF^vBh0fza8U;qFB

delta 127
zcmbP#h4sT8*5t6v-1(t-F8NOxm^aFYJ{P=yQ@zwj^qZ^Pgp*s&{yCd6Z31V`PqqDz
z*x6q)Ffe2SF%u^zkhB1?fS3`8R{=2yfM^(I$mHs>WdX^WHRf;4XM7pS$gn*!icytm
KyJ808KSlt<1|&HE

diff --git a/config/nvim/undo/%home%coast%.local%src%config%waybar%style.css b/config/nvim/undo/%home%coast%.local%src%config%waybar%style.css
index 09a655241e2c51814a0ce3503f53436d34d79b6d..a0767fd4be1f9bb7239939a92157988eb6c4f683 100644
GIT binary patch
delta 1282
zcmaJ<O=uHA6y8aq&5xil?e>RQHZ3BeF$Nk7wQADDl8V}TFrXEa^iLPsq`!z@ZP&JG
zuoWqT=%p0#D2OqLH$~`0TCg4zy@(24D;}&R6!E>;8M7kwgKuZ%&3o^g_uhVZVp;xT
z@x|1>g|n$h`m1EFnpx`44lZ7-cr`q8$oc%W`u6+syHNYXZ(5@H=Er=yBuO1q*>E3#
zO(}3E&<4x`5x5FUsy#PsAz*3JX79`r4;g*>h@3Z-T?5l~pui|>BKgyv7BaWuv8eWY
zr)aRX)YbuJjIN+BqRPoIKfxkx!4JR=)cC<@!@GbMUx5X4PvDsYb;Cl-3tDaLg(2xj
z1>7_NBS0bTuk9b{9qLYwbg5~D?v42)_#gyIBT%-LYa4BN$De?blfW^w0VeXd*ZPSm
zm!f3d?cSpRdeW(3Z%?vM?Y-Kd)HJJuNhO@_>ZV856?(3)&xsXGv0(i(X-rXG^KXj3
zqEUR>5Itp#rd7XOw4rdqiTQDK8SXjFy$0}^w00xFs;sA<gVj!BHgwN2Uu$kiA2)Rt
z<hxN5@z<5ZWxa`K<O|vmygkOcFmHzIra`xKJNIPMkz5jeb4j-C<_RllTZvqW?Hy-s
z`lPYVKA<&!fBiD?&Udmm1@!^r#X+DLaM9`qYbPC>ksbR3nl9&)XviUxRT^~cBEGqo
zu15UTSIzJ-0Br~n1IoIA{k*u{3S2YOh4*r-=p@2eSGm(qp4w=`1iVvNnTBVMaafZ;
zYu;aXoJ6rEfeWy4@Iy@ORr~xE)(rmG1YG<H5=AFik4c7l7ON}A!Q%!{0M(0%^zh?t
zjsI6Vs<$NpahoXFG9`L;8K+rhtPky|p2+8Rv=I7f$wF^Eux_e2#%epJE5;!XU&<hA
Qi|e%wU~SK=W^zXU4V|LmCIA2c

delta 124
zcmX@}h~?%c7X7fy-1(t-F8NOxm@~sTUK>d*>+;ZVk1KAI=kONH2#-&fX;wUWLCS3A
z!TAgf3`vvOf9UH086rR|1jL*`Tm!@)0HR@-A(N}_4+|qu#JaI^Y9*s0Bg59&j8RP6
Ke@ih2iU9yDydZD@

diff --git a/config/nvim/undo/%home%coast%.wezterm.lua b/config/nvim/undo/%home%coast%.wezterm.lua
index af66563d4cafca8328056d67427b57d868c85595..5d55e1b740c133d18c9871d1459d7d223a8b6e96 100644
GIT binary patch
delta 431
zcmewu{ii@XEHih0Xr4>{QwC<wN8zhC?VtD4=Y0RG>*miUX*3wWQD=CYV!J0~ugNiu
zj)~en^3n_t0HR@-A(Lxk919~*gn#2SPfbSg%?~sMm;}Xu0um6_U{ZYZLyiJQrj1dP
zFG$Hu&eF7-tf$B^c|VV~pg2%o5=o^5vPwps$pu_8lY2B};Oar9N+GG2L{e`#c>#}?
zAjmYBQ$Y%)pemxlc6ah62_owUsgMS%;Mf=o@yO&tA+gC_0@jS&lMSVX>$yQnfZ!|G
zLm-|in9sn#1f}_av<fH;fB;zx#7F2d0C9nU8A5?+eW)&EF_5%rWBdgm1u}T^7wx}{
E0L^Yr<^TWy

delta 99
zcmexU@G)9DEHih0Xr4>{QwHXM)h1%EeB>9gE#pgjp)~QCgoYq{$$g6pW;SQI@BLc+
qe4@6Gych!nfM^(I$mFVf!@>v@;oCUPQ<ITl^8-x*rp?u6j7$LCW*x2o

diff --git a/config/rofi/gruvbox.rasi b/config/rofi/gruvbox.rasi
index bf5f32d..07767bf 100644
--- a/config/rofi/gruvbox.rasi
+++ b/config/rofi/gruvbox.rasi
@@ -46,7 +46,7 @@
 }
 
 configuration {
-    font: "Fira Code Nerd Font 13";
+    font: "JetBrainsMono Nerd Font 13";
     show-icons: true;
 	terminal: "wezterm";
 }
diff --git a/config/waybar/config.jsonc b/config/waybar/config.jsonc
index 3f1a745..879321c 100644
--- a/config/waybar/config.jsonc
+++ b/config/waybar/config.jsonc
@@ -11,9 +11,9 @@
     ],
     "modules-right": [
 		"network",
-        "clock",
-//		"battery",
-        "pulseaudio"
+        "pulseaudio",
+        "clock"
+//		"battery"
     ],
     "pulseaudio": {
         "tooltip": false,
diff --git a/config/waybar/style.css b/config/waybar/style.css
index fb3b423..88cd730 100644
--- a/config/waybar/style.css
+++ b/config/waybar/style.css
@@ -17,7 +17,7 @@
 
 * {
     border: none;
-    font-family: "Fira Code Nerd Font";
+    font-family: "JetBrainsMono Nerd Font";
     font-size: 15px;
     min-height: 10px;
 }
@@ -64,8 +64,8 @@ window#waybar.empty #window {
 }
 
 #network { color: @text; }
-#pulseaudio { margin-right: 12px; color: @text; }
-#clock { color: @text; }
+#clock { margin-right: 12px; color: @text; }
+#pulseaudio { color: @text; }
 
 #workspaces {
     margin-left: 12px;
diff --git a/nixos/configuration/configuration.nix b/nixos/configuration/configuration.nix
index c79997b..a0a9a6a 100644
--- a/nixos/configuration/configuration.nix
+++ b/nixos/configuration/configuration.nix
@@ -81,7 +81,7 @@ in
       mkdir -p $out/bin
       ln -s ${pkgs.neovim}/bin/nvim $out/bin/vim
     '')
-    unstable.firefox
+	unstable.ungoogled-chromium
     unstable.git
     unstable.adwaita-icon-theme
     unstable.nil
@@ -90,7 +90,7 @@ in
     unstable.qbittorrent
     unstable.zathura
     unstable.rofi
-	unstable.wezterm
+	unstable.alacritty
   ];
 
   nixpkgs.config.allowUnfree = true;
@@ -117,6 +117,7 @@ in
     nerd-fonts._0xproto
     nerd-fonts.droid-sans-mono
     nerd-fonts.jetbrains-mono
+	nerd-fonts.fira-code
     vazir-fonts
   ];
 
diff --git a/nixos/flake.nix b/nixos/flake.nix
index 6483900..62cca20 100644
--- a/nixos/flake.nix
+++ b/nixos/flake.nix
@@ -43,6 +43,7 @@
                 ./home-configuration/configuration.nix
                 ./home-configuration/apps/sway.nix
                 ./home-configuration/apps/zsh.nix
+				./home-configuration/apps/alacritty.nix
               ];
             };
           };
diff --git a/nixos/home-configuration/apps/alacritty.nix b/nixos/home-configuration/apps/alacritty.nix
new file mode 100644
index 0000000..3971065
--- /dev/null
+++ b/nixos/home-configuration/apps/alacritty.nix
@@ -0,0 +1,26 @@
+{
+	pkgs,
+	config,
+	...
+}:
+{
+  programs.alacritty = {
+	  enable = true;
+	  settings = {
+		  window = {
+			  opacity = 0.9;
+			  padding = {
+				  x = 4;
+				  y = 4;
+			  };
+		  };
+		  font = {
+			  normal = {
+				  family = "JetBrainsMono Nerd Font";
+				  style = "Regular";
+			  };
+			  size = 16;
+		  };
+	  };
+  };
+}
diff --git a/nixos/home-configuration/apps/zsh.nix b/nixos/home-configuration/apps/zsh.nix
index 2ba4396..da7fd97 100644
--- a/nixos/home-configuration/apps/zsh.nix
+++ b/nixos/home-configuration/apps/zsh.nix
@@ -54,9 +54,6 @@
 	  bindkey -e
       PS1="[%n in %m %~] "
 	  eval "$(starship init zsh)"
-	  if command -v tmux &> /dev/null && [ -z "$TMUX" ]; then 
-		  tmux attach -t default || tmux new -s default 
-	  fi
     '';
   };
 }
diff --git a/nixos/home-configuration/configuration.nix b/nixos/home-configuration/configuration.nix
index 5078247..6255740 100644
--- a/nixos/home-configuration/configuration.nix
+++ b/nixos/home-configuration/configuration.nix
@@ -33,10 +33,14 @@ in {
       fastfetch
       dysk
       ncurses
-      ollama
       tree
+	  xfce.ristretto
       pyright
       stylua
+      typescript-language-server
+	  lua
+      vscode-langservers-extracted
+	  swaylock
 	  starship
 	  gopls
       lua-language-server
@@ -75,6 +79,10 @@ in {
       tauon
       gimp
       waybar
+	  glibc_multi
+	  man-pages
+	  man-pages-posix
+	  eww
     ];
   };
 
@@ -84,11 +92,4 @@ in {
     userName = "coast";
   };
 
-  programs.tmux = {
-	  enable = true;
-  };
-
-  programs.tmate = {
-	  enable = true;
-  };
 }