nix changes, switch to alacritty, add new niri keybind, etc...

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;
+$bg: #2a2a2a;
-$bg1: #282828;
+$bg1: #2a2a2a;
-$bg2: #32302f;
+$bg2: #2a2a2a;
 $fg: #ebdbb2;
 $fgdim: #bdae93;
 $accent: #d79921;

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; }

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";
 }

config/waybar/config.jsonc

@@ -11,9 +11,9 @@
     ],
     "modules-right": [
 		"network",
-        "clock",
+        "pulseaudio",
-//		"battery",
+        "clock"
-        "pulseaudio"
+//		"battery"
     ],
     "pulseaudio": {
         "tooltip": false,

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 { margin-right: 12px; color: @text; }
-#clock { color: @text; }
+#pulseaudio { color: @text; }
 
 #workspaces {
     margin-left: 12px;

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
   ];
 

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
               ];
             };
           };

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;
+		  };
+	  };
+  };
+}

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
     '';
   };
 }

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;
-  };
 }