From 2ab5b391404165f68700661fe352cb8f99440cd5 Mon Sep 17 00:00:00 2001 From: foglar Date: Mon, 30 Dec 2024 09:08:38 +0100 Subject: [PATCH] Waybar tmux fix, readme video --- README.md | 2 ++ nixos/home/desktop/hyprland/waybar.nix | 22 +++++++++++++++------- nixos/home/packages/tools/tmux.nix | 2 -- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 8ff31b2..63988ac 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,8 @@ ## Showcase +[![Watch the video](https://github.com/foglar/nix-config/raw/refs/heads/master/docs/demo.mp4) +
diff --git a/nixos/home/desktop/hyprland/waybar.nix b/nixos/home/desktop/hyprland/waybar.nix index 1da12b9..544aede 100644 --- a/nixos/home/desktop/hyprland/waybar.nix +++ b/nixos/home/desktop/hyprland/waybar.nix @@ -2,6 +2,7 @@ lib, config, pkgs, + userSettings, ... }: { options = { @@ -287,13 +288,20 @@ }; style = '' - @define-color bar-bg rgba(0, 0, 0, 0); - @define-color main-bg #11111b; - @define-color main-fg #cdd6f4; - @define-color wb-act-bg #a6adc8; - @define-color wb-act-fg #313244; - @define-color wb-hvr-bg #f5c2e7; - @define-color wb-hvr-fg #313; + ${ + if + ( + userSettings.theme == "catppuccin-mocha" || userSettings.theme == "tokyo-night-dark" + ) + then "@define-color bar-bg rgba(0, 0, 0, 0); + @define-color main-bg #11111b; + @define-color main-fg #cdd6f4; + @define-color wb-act-bg #a6adc8; + @define-color wb-act-fg #313244; + @define-color wb-hvr-bg #f5c2e7; + @define-color wb-hvr-fg #313;" + else "" + } * { border: none; border-radius: 0px; diff --git a/nixos/home/packages/tools/tmux.nix b/nixos/home/packages/tools/tmux.nix index b8daddd..a26276b 100644 --- a/nixos/home/packages/tools/tmux.nix +++ b/nixos/home/packages/tools/tmux.nix @@ -9,7 +9,6 @@ }; config = lib.mkIf config.program.tmux.enable { - stylix.targets.tmux.enable = true; programs.tmux = { @@ -53,7 +52,6 @@ set -g base-index 1 set -g pane-base-index 1 set-window-option -g pane-base-index 1 - set-option -g renumber-windows only bind -n M-H previous-window bind -n M-L next-window