From b40e86300c2a8a567bc4a9d2b756d29c229f4940 Mon Sep 17 00:00:00 2001
From: Sam Rolfe <samuelrolfe@gmail.com>
Date: Mon, 9 Feb 2026 22:12:20 +1100
Subject: [PATCH] Fix zsh (OMZ+carapace), GTK dark mode, waybar styling

---
 home/sam/config/niri/config.kdl             |  3 +--
 home/sam/config/waybar/config.jsonc         |  1 +
 home/sam/config/waybar/style.css            | 12 +++++++++++-
 home/sam/config/zsh/local.zsh               |  4 ++--
 home/sam/home.nix                           | 12 +++++++++++-
 hosts/sam-4screen-desktop/configuration.nix |  6 +++++-
 6 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/home/sam/config/niri/config.kdl b/home/sam/config/niri/config.kdl
index f477ca1..efbc25c 100644
--- a/home/sam/config/niri/config.kdl
+++ b/home/sam/config/niri/config.kdl
@@ -251,8 +251,7 @@ layout {
 // See the binds section below for more spawn examples.
 
 // This line starts waybar, a commonly used bar for Wayland compositors.
-
-spawn-at-startup "waybar"
+spawn-at-startup "/run/current-system/sw/bin/waybar"
 spawn-at-startup "kitty"
 // To run a shell command (with variables, pipes, etc.), use spawn-sh-at-startup:
 // spawn-sh-at-startup "qs -c ~/source/qs/MyAwesomeShell"
diff --git a/home/sam/config/waybar/config.jsonc b/home/sam/config/waybar/config.jsonc
index bb75be2..fe9c4d1 100644
--- a/home/sam/config/waybar/config.jsonc
+++ b/home/sam/config/waybar/config.jsonc
@@ -1,6 +1,7 @@
 {
   "layer": "top",
   "position": "top",
+  "height": 30,
   "modules-left": ["niri/workspaces"],
   "modules-center": ["clock"],
   "modules-right": ["pulseaudio", "network", "tray"]
diff --git a/home/sam/config/waybar/style.css b/home/sam/config/waybar/style.css
index d9474c2..b891746 100644
--- a/home/sam/config/waybar/style.css
+++ b/home/sam/config/waybar/style.css
@@ -1 +1,11 @@
-* { font-family: sans-serif; font-size: 12px; }
+* { font-size: 14px; }
+
+window#waybar {
+  background: @theme_bg_color;
+  color: @theme_fg_color;
+}
+
+#workspaces button.focused {
+  background: @theme_selected_bg_color;
+  color: @theme_selected_fg_color;
+}
diff --git a/home/sam/config/zsh/local.zsh b/home/sam/config/zsh/local.zsh
index 5fe867f..76d7c86 100644
--- a/home/sam/config/zsh/local.zsh
+++ b/home/sam/config/zsh/local.zsh
@@ -37,7 +37,7 @@ export PATH="$HOME/.local/bin:$HOME/.fzf/bin:$PATH"
 
 # === Source Oh My Zsh ===
 # This line loads the Oh My Zsh framework. All customisations must come after this.
-source $ZSH/oh-my-zsh.sh
+#source $ZSH/oh-my-zsh.sh
 
 
 # === Custom Tool Configuration ===
@@ -69,7 +69,7 @@ bindkey '^[[B' atuin-down-search # Down arrow
 
 # 6. Carapace (Completion Engine)
 # This will now work because the PATH is set correctly above.
-source <(carapace-bin _carapace zsh)
+#source <(carapace-bin _carapace zsh)
 
 
 # === Load Powerlevel10k Theme ===
diff --git a/home/sam/home.nix b/home/sam/home.nix
index 67651bd..588a486 100644
--- a/home/sam/home.nix
+++ b/home/sam/home.nix
@@ -26,6 +26,12 @@ home.stateVersion = "25.11";
 
   programs.home-manager.enable = true;
 
+
+dconf.settings."org/gnome/desktop/interface" = {
+  color-scheme = "prefer-dark";
+};
+
+
   # ---
   # Shell (zsh + oh-my-zsh + powerlevel10k)
   # ---
@@ -53,6 +59,10 @@ home.stateVersion = "25.11";
       if [ -f "$HOME/.config/zsh/local.zsh" ]; then
     source "$HOME/.config/zsh/local.zsh"
   fi
+      # carapace completions
+    if command -v carapace >/dev/null 2>&1; then
+      eval "$(carapace _carapace zsh)"
+    fi
     '';
   };
 
@@ -89,7 +99,7 @@ home.stateVersion = "25.11";
   # Packages (NOW list + a few safe essentials)
   # ---
   home.packages = with pkgs; [
-
+    carapace
   aider-chat
 opencode
 goose-cli
diff --git a/hosts/sam-4screen-desktop/configuration.nix b/hosts/sam-4screen-desktop/configuration.nix
index 9639f4f..25cdff7 100644
--- a/hosts/sam-4screen-desktop/configuration.nix
+++ b/hosts/sam-4screen-desktop/configuration.nix
@@ -17,6 +17,8 @@
     ./hardware-configuration.nix
   ];
 
+home-manager.backupFileExtension = "hm-bak";
+
   # ---
   # Nix (enable flakes on the installed system)
   # ---
@@ -230,12 +232,14 @@ PermitRootLogin = "no";
     enable = true;
     extraPortals = [
       pkgs.xdg-desktop-portal-gtk
-      pkgs.xdg-desktop-portal-gnome
+      pkgs.xdg-desktop-portal-wlr
     ];
   };
 
   # Minimal system packages needed for the session and core usability
   environment.systemPackages = with pkgs; [
+  spotify
+  vlc
   telegram-desktop
 flameshot
     waybar