From 3b8a915fb1f955bca5458643f38bc2f0c6db8f95 Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Wed, 11 Feb 2026 12:57:15 -0500 Subject: [PATCH] fix scripts and tmux --- config/nvim/lazy-lock.json | 1 + config/nvim/lua/plugins/nvim.lua | 7 +++++++ config/tmux/themes/daylight.conf | 2 +- config/tmux/themes/midnight.conf | 2 +- home/modules/hyprland.nix | 4 ---- home/modules/theme.nix | 8 ++++++++ home/modules/ui.nix | 9 --------- scripts/theme | 14 +++++++++++++- 8 files changed, 31 insertions(+), 16 deletions(-) diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index 4c988e6..a6c3c8f 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -12,6 +12,7 @@ "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" }, "live-rename.nvim": { "branch": "main", "commit": "3a3cddf23b89a17992f9ca67afc5858077769462" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, + "midnight.nvim": { "branch": "main", "commit": "130a1899c2d5a0af431f3e41eeac429e90ea1d09" }, "mini.ai": { "branch": "main", "commit": "9eae720f2b20f6ad28cbfa0ddc524e10dc2c3201" }, "mini.bufremove": { "branch": "main", "commit": "10857aa39160c127694151828914df3131ba83b6" }, "mini.misc": { "branch": "main", "commit": "b647b64321c34d4868d158282bb89e49f0d6838b" }, diff --git a/config/nvim/lua/plugins/nvim.lua b/config/nvim/lua/plugins/nvim.lua index ac2492b..1fe0cf1 100644 --- a/config/nvim/lua/plugins/nvim.lua +++ b/config/nvim/lua/plugins/nvim.lua @@ -1,4 +1,11 @@ return { + { + 'barrettruth/midnight.nvim', + enabled = true, + config = function() + vim.cmd.colorscheme('midnight') + end, + }, { 'echasnovski/mini.pairs', config = true, diff --git a/config/tmux/themes/daylight.conf b/config/tmux/themes/daylight.conf index ed6e29c..dbdddf6 100644 --- a/config/tmux/themes/daylight.conf +++ b/config/tmux/themes/daylight.conf @@ -6,6 +6,6 @@ set -g window-status-bell-style fg='#c7254e',bg='#f5f5f5',bold set -g window-status-activity-style fg='#3b5bdb',bg='#f5f5f5',bold set -g pane-border-style fg='#e8e8e8' set -g pane-active-border-style fg='#1a1a1a' -set -g copy-mode-selection-style fg='#f5f5f5',bg='yellow' +set -g copy-mode-selection-style 'reverse' set -g copy-mode-current-match-style fg='#f5f5f5',bg='yellow' set -g copy-mode-match-style 'reverse' diff --git a/config/tmux/themes/midnight.conf b/config/tmux/themes/midnight.conf index 35efc83..8d4eac0 100644 --- a/config/tmux/themes/midnight.conf +++ b/config/tmux/themes/midnight.conf @@ -6,6 +6,6 @@ set -g window-status-bell-style fg='#ff6b6b',bg='#121212',bold set -g window-status-activity-style fg='#7aa2f7',bg='#121212',bold set -g pane-border-style fg='#3d3d3d' set -g pane-active-border-style fg='#e0e0e0' -set -g copy-mode-selection-style fg='#121212',bg='yellow' +set -g copy-mode-selection-style 'reverse' set -g copy-mode-current-match-style fg='#121212',bg='yellow' set -g copy-mode-match-style 'reverse' diff --git a/home/modules/hyprland.nix b/home/modules/hyprland.nix index 81ac91a..35a89aa 100644 --- a/home/modules/hyprland.nix +++ b/home/modules/hyprland.nix @@ -218,8 +218,4 @@ in xdg.configFile."hypr/themes/midnight.conf".text = mkHyprTheme config.palettes.midnight; xdg.configFile."hypr/themes/daylight.conf".text = mkHyprTheme config.palettes.daylight; - home.activation.linkHyprTheme = lib.hm.dag.entryAfter [ "writeBoundary" ] '' - target="${config.xdg.configHome}/hypr/themes/theme.conf" - $DRY_RUN_CMD ln -sf "${config.xdg.configHome}/hypr/themes/${config.theme}.conf" "$target" - ''; } diff --git a/home/modules/theme.nix b/home/modules/theme.nix index 0f63c88..c56f192 100644 --- a/home/modules/theme.nix +++ b/home/modules/theme.nix @@ -82,5 +82,13 @@ in echo " copy your fonts into ~/.config/nix/fonts/ and rebuild" fi ''; + + home.activation.linkTheme = lib.hm.dag.entryAfter [ "writeBoundary" ] '' + cfg="${config.xdg.configHome}" + theme="${config.theme}" + $DRY_RUN_CMD ln -sf "$cfg/hypr/themes/$theme.conf" "$cfg/hypr/themes/theme.conf" + $DRY_RUN_CMD ln -sf "$cfg/waybar/themes/$theme.css" "$cfg/waybar/themes/theme.css" + $DRY_RUN_CMD ln -sf "$cfg/rofi/themes/$theme.rasi" "$cfg/rofi/themes/theme.rasi" + ''; }; } diff --git a/home/modules/ui.nix b/home/modules/ui.nix index ce1ee73..81847fa 100644 --- a/home/modules/ui.nix +++ b/home/modules/ui.nix @@ -176,10 +176,6 @@ in xdg.configFile."rofi/themes/daylight.rasi".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.config/nix/config/rofi/themes/daylight.rasi"; - home.activation.linkRofiTheme = lib.hm.dag.entryAfter [ "writeBoundary" ] '' - target="${config.xdg.configHome}/rofi/themes/theme.rasi" - $DRY_RUN_CMD ln -sf "${config.xdg.configHome}/rofi/themes/${config.theme}.rasi" "$target" - ''; services.dunst = { enable = true; @@ -212,9 +208,4 @@ in xdg.configFile."waybar/themes/midnight.css".text = mkWaybarTheme config.palettes.midnight; xdg.configFile."waybar/themes/daylight.css".text = mkWaybarTheme config.palettes.daylight; - home.activation.linkWaybarTheme = lib.hm.dag.entryAfter [ "writeBoundary" ] '' - target="${config.xdg.configHome}/waybar/themes/theme.css" - $DRY_RUN_CMD ln -sf "${config.xdg.configHome}/waybar/themes/${config.theme}.css" "$target" - ''; - } diff --git a/scripts/theme b/scripts/theme index 0380da3..b11b0ce 100755 --- a/scripts/theme +++ b/scripts/theme @@ -73,11 +73,23 @@ Linux) ;; esac - waybar_themes="${XDG_CONFIG_HOME:-$HOME/.config}/waybar/themes" + cfg="${XDG_CONFIG_HOME:-$HOME/.config}" + + waybar_themes="$cfg/waybar/themes" [ -f "$waybar_themes/$theme.css" ] && { ln -sf "$waybar_themes/$theme.css" "$waybar_themes/theme.css" pkill -USR2 waybar } + + rofi_themes="$cfg/rofi/themes" + [ -f "$rofi_themes/$theme.rasi" ] && { + ln -sf "$rofi_themes/$theme.rasi" "$rofi_themes/theme.rasi" + } + + hypr_themes="$cfg/hypr/themes" + [ -f "$hypr_themes/$theme.conf" ] && { + ln -sf "$hypr_themes/$theme.conf" "$hypr_themes/theme.conf" + } fi ;; Darwin)