mirror of
https://github.com/nix-community/home-manager.git
synced 2024-12-14 11:57:55 +00:00
i3,sway: add bar color options for the focused output (#2135)
Both i3bar and swaybar can use different colors for the bar on the currently focused monitor output; add color options for this feature.
This commit is contained in:
Sergey Vlasov
GitHub
parent
49864a4370
commit
b42fce7aaa
18 changed files with 349 additions and 0 deletions
|
|
@ -102,6 +102,18 @@ rec {
|
|||
optionalString (colors.separator != null)
|
||||
"separator ${colors.separator}"
|
||||
}
|
||||
${
|
||||
optionalString (colors.focusedBackground != null)
|
||||
"focused_background ${colors.focusedBackground}"
|
||||
}
|
||||
${
|
||||
optionalString (colors.focusedStatusline != null)
|
||||
"focused_statusline ${colors.focusedStatusline}"
|
||||
}
|
||||
${
|
||||
optionalString (colors.focusedSeparator != null)
|
||||
"focused_separator ${colors.focusedSeparator}"
|
||||
}
|
||||
${
|
||||
optionalString (colors.focusedWorkspace != null)
|
||||
"focused_workspace ${barColorSetStr colors.focusedWorkspace}"
|
||||
|
|
|
|||
|
|
@ -190,6 +190,30 @@ let
|
|||
description = "Text color to be used for the separator.";
|
||||
};
|
||||
|
||||
focusedBackground = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
description =
|
||||
"Background color of the bar on the currently focused monitor output.";
|
||||
example = "#000000";
|
||||
};
|
||||
|
||||
focusedStatusline = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
description =
|
||||
"Text color to be used for the statusline on the currently focused monitor output.";
|
||||
example = "#ffffff";
|
||||
};
|
||||
|
||||
focusedSeparator = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
description =
|
||||
"Text color to be used for the separator on the currently focused monitor output.";
|
||||
example = "#666666";
|
||||
};
|
||||
|
||||
focusedWorkspace = mkNullableOption {
|
||||
type = barColorSetModule;
|
||||
default = {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{
|
||||
i3-bar-focused-colors = ./i3-bar-focused-colors.nix;
|
||||
i3-followmouse = ./i3-followmouse.nix;
|
||||
i3-fonts = ./i3-fonts.nix;
|
||||
i3-fonts-deprecated = ./i3-fonts-deprecated.nix;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,110 @@
|
|||
font pango:monospace 8.000000
|
||||
floating_modifier Mod1
|
||||
default_border normal 2
|
||||
default_floating_border normal 2
|
||||
hide_edge_borders none
|
||||
force_focus_wrapping no
|
||||
focus_follows_mouse yes
|
||||
focus_on_window_activation smart
|
||||
mouse_warping output
|
||||
workspace_layout default
|
||||
workspace_auto_back_and_forth no
|
||||
|
||||
client.focused #4c7899 #285577 #ffffff #2e9ef4 #285577
|
||||
client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a
|
||||
client.unfocused #333333 #222222 #888888 #292d2e #222222
|
||||
client.urgent #2f343a #900000 #ffffff #900000 #900000
|
||||
client.placeholder #000000 #0c0c0c #ffffff #000000 #0c0c0c
|
||||
client.background #ffffff
|
||||
|
||||
|
||||
bindsym Mod1+0 workspace number 10
|
||||
bindsym Mod1+1 workspace number 1
|
||||
bindsym Mod1+2 workspace number 2
|
||||
bindsym Mod1+3 workspace number 3
|
||||
bindsym Mod1+4 workspace number 4
|
||||
bindsym Mod1+5 workspace number 5
|
||||
bindsym Mod1+6 workspace number 6
|
||||
bindsym Mod1+7 workspace number 7
|
||||
bindsym Mod1+8 workspace number 8
|
||||
bindsym Mod1+9 workspace number 9
|
||||
bindsym Mod1+Down focus down
|
||||
bindsym Mod1+Left focus left
|
||||
bindsym Mod1+Return exec i3-sensible-terminal
|
||||
bindsym Mod1+Right focus right
|
||||
bindsym Mod1+Shift+0 move container to workspace number 10
|
||||
bindsym Mod1+Shift+1 move container to workspace number 1
|
||||
bindsym Mod1+Shift+2 move container to workspace number 2
|
||||
bindsym Mod1+Shift+3 move container to workspace number 3
|
||||
bindsym Mod1+Shift+4 move container to workspace number 4
|
||||
bindsym Mod1+Shift+5 move container to workspace number 5
|
||||
bindsym Mod1+Shift+6 move container to workspace number 6
|
||||
bindsym Mod1+Shift+7 move container to workspace number 7
|
||||
bindsym Mod1+Shift+8 move container to workspace number 8
|
||||
bindsym Mod1+Shift+9 move container to workspace number 9
|
||||
bindsym Mod1+Shift+Down move down
|
||||
bindsym Mod1+Shift+Left move left
|
||||
bindsym Mod1+Shift+Right move right
|
||||
bindsym Mod1+Shift+Up move up
|
||||
bindsym Mod1+Shift+c reload
|
||||
bindsym Mod1+Shift+e exec i3-nagbar -t warning -m 'Do you want to exit i3?' -b 'Yes' 'i3-msg exit'
|
||||
bindsym Mod1+Shift+minus move scratchpad
|
||||
bindsym Mod1+Shift+q kill
|
||||
bindsym Mod1+Shift+r restart
|
||||
bindsym Mod1+Shift+space floating toggle
|
||||
bindsym Mod1+Up focus up
|
||||
bindsym Mod1+a focus parent
|
||||
bindsym Mod1+d exec @dmenu@/bin/dmenu_run
|
||||
bindsym Mod1+e layout toggle split
|
||||
bindsym Mod1+f fullscreen toggle
|
||||
bindsym Mod1+h split h
|
||||
bindsym Mod1+minus scratchpad show
|
||||
bindsym Mod1+r mode resize
|
||||
bindsym Mod1+s layout stacking
|
||||
bindsym Mod1+space focus mode_toggle
|
||||
bindsym Mod1+v split v
|
||||
bindsym Mod1+w layout tabbed
|
||||
|
||||
mode "resize" {
|
||||
bindsym Down resize grow height 10 px or 10 ppt
|
||||
bindsym Escape mode default
|
||||
bindsym Left resize shrink width 10 px or 10 ppt
|
||||
bindsym Return mode default
|
||||
bindsym Right resize grow width 10 px or 10 ppt
|
||||
bindsym Up resize shrink height 10 px or 10 ppt
|
||||
}
|
||||
|
||||
|
||||
bar {
|
||||
|
||||
font pango:monospace 8.000000
|
||||
mode dock
|
||||
hidden_state hide
|
||||
position bottom
|
||||
status_command @i3status@/bin/i3status
|
||||
i3bar_command @i3@/bin/i3bar
|
||||
workspace_buttons yes
|
||||
strip_workspace_numbers no
|
||||
tray_output primary
|
||||
colors {
|
||||
background #000000
|
||||
statusline #ffffff
|
||||
separator #666666
|
||||
focused_background #ffffff
|
||||
focused_statusline #000000
|
||||
focused_separator #999999
|
||||
focused_workspace #4c7899 #285577 #ffffff
|
||||
active_workspace #333333 #5f676a #ffffff
|
||||
inactive_workspace #333333 #222222 #888888
|
||||
urgent_workspace #2f343a #900000 #ffffff
|
||||
binding_mode #2f343a #900000 #ffffff
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
{ config, lib, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
{
|
||||
config = {
|
||||
xsession.windowManager.i3 = {
|
||||
enable = true;
|
||||
|
||||
config.bars = [{
|
||||
colors.focusedBackground = "#ffffff";
|
||||
colors.focusedStatusline = "#000000";
|
||||
colors.focusedSeparator = "#999999";
|
||||
}];
|
||||
};
|
||||
|
||||
nixpkgs.overlays = [ (import ./i3-overlay.nix) ];
|
||||
|
||||
nmt.script = ''
|
||||
assertFileExists home-files/.config/i3/config
|
||||
assertFileContent home-files/.config/i3/config \
|
||||
${./i3-bar-focused-colors-expected.conf}
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
@ -90,6 +90,9 @@ bar {
|
|||
background #000000
|
||||
statusline #ffffff
|
||||
separator #666666
|
||||
|
||||
|
||||
|
||||
focused_workspace #4c7899 #285577 #ffffff
|
||||
active_workspace #333333 #5f676a #ffffff
|
||||
inactive_workspace #333333 #222222 #888888
|
||||
|
|
|
|||
|
|
@ -90,6 +90,9 @@ bar {
|
|||
background #000000
|
||||
statusline #ffffff
|
||||
separator #666666
|
||||
|
||||
|
||||
|
||||
focused_workspace #4c7899 #285577 #ffffff
|
||||
active_workspace #333333 #5f676a #ffffff
|
||||
inactive_workspace #333333 #222222 #888888
|
||||
|
|
|
|||
|
|
@ -91,6 +91,9 @@ bar {
|
|||
background #000000
|
||||
statusline #ffffff
|
||||
separator #666666
|
||||
|
||||
|
||||
|
||||
focused_workspace #4c7899 #285577 #ffffff
|
||||
active_workspace #333333 #5f676a #ffffff
|
||||
inactive_workspace #333333 #222222 #888888
|
||||
|
|
|
|||
|
|
@ -89,6 +89,9 @@ bar {
|
|||
background #000000
|
||||
statusline #ffffff
|
||||
separator #666666
|
||||
|
||||
|
||||
|
||||
focused_workspace #4c7899 #285577 #ffffff
|
||||
active_workspace #333333 #5f676a #ffffff
|
||||
inactive_workspace #333333 #222222 #888888
|
||||
|
|
|
|||
|
|
@ -90,6 +90,9 @@ bar {
|
|||
background #000000
|
||||
statusline #ffffff
|
||||
separator #666666
|
||||
|
||||
|
||||
|
||||
focused_workspace #4c7899 #285577 #ffffff
|
||||
active_workspace #333333 #5f676a #ffffff
|
||||
inactive_workspace #333333 #222222 #888888
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{
|
||||
sway-bar-focused-colors = ./sway-bar-focused-colors.nix;
|
||||
sway-default = ./sway-default.nix;
|
||||
sway-post-2003 = ./sway-post-2003.nix;
|
||||
sway-followmouse = ./sway-followmouse.nix;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,114 @@
|
|||
font pango:monospace 8.000000
|
||||
floating_modifier Mod1
|
||||
default_border pixel 2
|
||||
default_floating_border pixel 2
|
||||
hide_edge_borders none
|
||||
focus_wrapping no
|
||||
focus_follows_mouse yes
|
||||
focus_on_window_activation smart
|
||||
mouse_warping output
|
||||
workspace_layout default
|
||||
workspace_auto_back_and_forth no
|
||||
|
||||
client.focused #4c7899 #285577 #ffffff #2e9ef4 #285577
|
||||
client.focused_inactive #333333 #5f676a #ffffff #484e50 #5f676a
|
||||
client.unfocused #333333 #222222 #888888 #292d2e #222222
|
||||
client.urgent #2f343a #900000 #ffffff #900000 #900000
|
||||
client.placeholder #000000 #0c0c0c #ffffff #000000 #0c0c0c
|
||||
client.background #ffffff
|
||||
|
||||
|
||||
bindsym Mod1+1 workspace number 1
|
||||
bindsym Mod1+2 workspace number 2
|
||||
bindsym Mod1+3 workspace number 3
|
||||
bindsym Mod1+4 workspace number 4
|
||||
bindsym Mod1+5 workspace number 5
|
||||
bindsym Mod1+6 workspace number 6
|
||||
bindsym Mod1+7 workspace number 7
|
||||
bindsym Mod1+8 workspace number 8
|
||||
bindsym Mod1+9 workspace number 9
|
||||
bindsym Mod1+Down focus down
|
||||
bindsym Mod1+Left focus left
|
||||
bindsym Mod1+Return exec @rxvt-unicode-unwrapped@/bin/urxvt
|
||||
bindsym Mod1+Right focus right
|
||||
bindsym Mod1+Shift+1 move container to workspace number 1
|
||||
bindsym Mod1+Shift+2 move container to workspace number 2
|
||||
bindsym Mod1+Shift+3 move container to workspace number 3
|
||||
bindsym Mod1+Shift+4 move container to workspace number 4
|
||||
bindsym Mod1+Shift+5 move container to workspace number 5
|
||||
bindsym Mod1+Shift+6 move container to workspace number 6
|
||||
bindsym Mod1+Shift+7 move container to workspace number 7
|
||||
bindsym Mod1+Shift+8 move container to workspace number 8
|
||||
bindsym Mod1+Shift+9 move container to workspace number 9
|
||||
bindsym Mod1+Shift+Down move down
|
||||
bindsym Mod1+Shift+Left move left
|
||||
bindsym Mod1+Shift+Right move right
|
||||
bindsym Mod1+Shift+Up move up
|
||||
bindsym Mod1+Shift+c reload
|
||||
bindsym Mod1+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'
|
||||
bindsym Mod1+Shift+h move left
|
||||
bindsym Mod1+Shift+j move down
|
||||
bindsym Mod1+Shift+k move up
|
||||
bindsym Mod1+Shift+l move right
|
||||
bindsym Mod1+Shift+minus move scratchpad
|
||||
bindsym Mod1+Shift+q kill
|
||||
bindsym Mod1+Shift+space floating toggle
|
||||
bindsym Mod1+Up focus up
|
||||
bindsym Mod1+a focus parent
|
||||
bindsym Mod1+b splith
|
||||
bindsym Mod1+d exec @dmenu@/bin/dmenu_run
|
||||
bindsym Mod1+e layout toggle split
|
||||
bindsym Mod1+f fullscreen toggle
|
||||
bindsym Mod1+h focus left
|
||||
bindsym Mod1+j focus down
|
||||
bindsym Mod1+k focus up
|
||||
bindsym Mod1+l focus right
|
||||
bindsym Mod1+minus scratchpad show
|
||||
bindsym Mod1+r mode resize
|
||||
bindsym Mod1+s layout stacking
|
||||
bindsym Mod1+space focus mode_toggle
|
||||
bindsym Mod1+v splitv
|
||||
bindsym Mod1+w layout tabbed
|
||||
|
||||
mode "resize" {
|
||||
bindsym Down resize grow height 10 px
|
||||
bindsym Escape mode default
|
||||
bindsym Left resize shrink width 10 px
|
||||
bindsym Return mode default
|
||||
bindsym Right resize grow width 10 px
|
||||
bindsym Up resize shrink height 10 px
|
||||
bindsym h resize shrink width 10 px
|
||||
bindsym j resize grow height 10 px
|
||||
bindsym k resize shrink height 10 px
|
||||
bindsym l resize grow width 10 px
|
||||
}
|
||||
|
||||
bar {
|
||||
|
||||
font pango:monospace 8.000000
|
||||
mode dock
|
||||
hidden_state hide
|
||||
position bottom
|
||||
status_command @i3status@/bin/i3status
|
||||
swaybar_command @sway/bin/swaybar
|
||||
workspace_buttons yes
|
||||
strip_workspace_numbers no
|
||||
tray_output primary
|
||||
colors {
|
||||
background #000000
|
||||
statusline #ffffff
|
||||
separator #666666
|
||||
focused_background #ffffff
|
||||
focused_statusline #000000
|
||||
focused_separator #999999
|
||||
focused_workspace #4c7899 #285577 #ffffff
|
||||
active_workspace #333333 #5f676a #ffffff
|
||||
inactive_workspace #333333 #222222 #888888
|
||||
urgent_workspace #2f343a #900000 #ffffff
|
||||
binding_mode #2f343a #900000 #ffffff
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
exec "systemctl --user import-environment; systemctl --user start sway-session.target"
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
|
||||
dummy-package = pkgs.runCommandLocal "dummy-package" { } "mkdir $out";
|
||||
|
||||
in {
|
||||
config = {
|
||||
wayland.windowManager.sway = {
|
||||
enable = true;
|
||||
package = dummy-package // { outPath = "@sway"; };
|
||||
# overriding findutils causes issues
|
||||
config.menu = "${pkgs.dmenu}/bin/dmenu_run";
|
||||
|
||||
config.bars = [{
|
||||
colors.focusedBackground = "#ffffff";
|
||||
colors.focusedStatusline = "#000000";
|
||||
colors.focusedSeparator = "#999999";
|
||||
}];
|
||||
};
|
||||
|
||||
nixpkgs.overlays = [ (import ./sway-overlay.nix) ];
|
||||
|
||||
nmt.script = ''
|
||||
assertFileExists home-files/.config/sway/config
|
||||
assertFileContent home-files/.config/sway/config \
|
||||
${./sway-bar-focused-colors.conf}
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
@ -98,6 +98,9 @@ bar {
|
|||
background #000000
|
||||
statusline #ffffff
|
||||
separator #666666
|
||||
|
||||
|
||||
|
||||
focused_workspace #4c7899 #285577 #ffffff
|
||||
active_workspace #333333 #5f676a #ffffff
|
||||
inactive_workspace #333333 #222222 #888888
|
||||
|
|
|
|||
|
|
@ -110,6 +110,9 @@ bar {
|
|||
background #000000
|
||||
statusline #ffffff
|
||||
separator #666666
|
||||
|
||||
|
||||
|
||||
focused_workspace #4c7899 #285577 #ffffff
|
||||
active_workspace #333333 #5f676a #ffffff
|
||||
inactive_workspace #333333 #222222 #888888
|
||||
|
|
|
|||
|
|
@ -98,6 +98,9 @@ bar {
|
|||
background #000000
|
||||
statusline #ffffff
|
||||
separator #666666
|
||||
|
||||
|
||||
|
||||
focused_workspace #4c7899 #285577 #ffffff
|
||||
active_workspace #333333 #5f676a #ffffff
|
||||
inactive_workspace #333333 #222222 #888888
|
||||
|
|
|
|||
|
|
@ -97,6 +97,9 @@ bar {
|
|||
background #000000
|
||||
statusline #ffffff
|
||||
separator #666666
|
||||
|
||||
|
||||
|
||||
focused_workspace #4c7899 #285577 #ffffff
|
||||
active_workspace #333333 #5f676a #ffffff
|
||||
inactive_workspace #333333 #222222 #888888
|
||||
|
|
|
|||
|
|
@ -98,6 +98,9 @@ bar {
|
|||
background #000000
|
||||
statusline #ffffff
|
||||
separator #666666
|
||||
|
||||
|
||||
|
||||
focused_workspace #4c7899 #285577 #ffffff
|
||||
active_workspace #333333 #5f676a #ffffff
|
||||
inactive_workspace #333333 #222222 #888888
|
||||
|
|
|
|||
Loading…
Reference in a new issue