waybar
This commit is contained in:
parent
fa648a5dbf
commit
69b707bb3f
|
|
@ -91,6 +91,17 @@
|
|||
credential.helper = "${pkgs.gitAndTools.gitFull}/bin/git-credential-libsecret";
|
||||
};
|
||||
};
|
||||
bat = {
|
||||
enable = true;
|
||||
};
|
||||
lsd = {
|
||||
enable = true;
|
||||
settings = {
|
||||
date = "+%Y-%m-%d %H:%M:%S";
|
||||
permission = "octal";
|
||||
size = "short";
|
||||
};
|
||||
};
|
||||
ssh = {
|
||||
enable = true;
|
||||
compression = true;
|
||||
|
|
|
|||
|
|
@ -1,15 +1,12 @@
|
|||
{ options, config, pkgs, lib, ... }:
|
||||
let
|
||||
modifier = "Mod4";
|
||||
commonConfig = {
|
||||
modifier = modifier;
|
||||
bars = [{
|
||||
barConfig = {
|
||||
mode = "dock";
|
||||
hiddenState = "hide";
|
||||
position = "bottom";
|
||||
workspaceButtons = true;
|
||||
workspaceNumbers = true;
|
||||
statusCommand = "${pkgs.i3status}/bin/i3status";
|
||||
fonts = {
|
||||
names = [ "Noto Sans Mono" "Symbols Nerd Font Mono" ];
|
||||
size = 16.0;
|
||||
|
|
@ -45,50 +42,59 @@ commonConfig = {
|
|||
text = "#ebdadd";
|
||||
};
|
||||
};
|
||||
}];
|
||||
};
|
||||
commonConfig = {
|
||||
modifier = modifier;
|
||||
startup = [
|
||||
{ command = "~/scripts/initwm.sh"; }
|
||||
];
|
||||
colors = {
|
||||
focused = {
|
||||
background = "#913131";
|
||||
border = "#913131";
|
||||
childBorder = "#b35656";
|
||||
# background = "#913131";
|
||||
#background = "#5e4651c9";
|
||||
#border = "#5e4651c9";
|
||||
childBorder = "#b0a3a5c0";
|
||||
background = "#24101ac0";
|
||||
border = "#24101ac0";
|
||||
# childBorder = "#5e4651c9";
|
||||
indicator = "#b35656";
|
||||
text = "#ebdadd";
|
||||
};
|
||||
focusedInactive = {
|
||||
background = "#782a2a";
|
||||
border = "#782a2a";
|
||||
childBorder = "#b32d2d";
|
||||
# background = "#782a2a";
|
||||
# border = "#782a2a";
|
||||
#background = "#5e4651c9";
|
||||
#border = "#5e4651c9";
|
||||
#childBorder = "#5e4651c9";
|
||||
background = "#24101ac0";
|
||||
border = "#24101ac0";
|
||||
childBorder = "#24101ac0";
|
||||
# childBorder = "#b32d2d";
|
||||
indicator = "#b32d2d";
|
||||
text = "#ebdadd";
|
||||
};
|
||||
placeholder = {
|
||||
background = "#24101a";
|
||||
border = "#24101a";
|
||||
childBorder = "#24101a";
|
||||
indicator = "#000000";
|
||||
text = "#ebdadd";
|
||||
};
|
||||
unfocused = {
|
||||
background = "#4d2525";
|
||||
border = "#472222";
|
||||
childBorder = "#4d2525";
|
||||
# background = "#4d2525";
|
||||
# border = "#472222";
|
||||
background = "#24101ac0";
|
||||
border = "#24101ac0";
|
||||
childBorder = "#24101ac0";
|
||||
# childBorder = "#4d2525";
|
||||
indicator = "#661a1a";
|
||||
text = "#8c8284";
|
||||
};
|
||||
urgent = {
|
||||
background = "#993d3d";
|
||||
border = "#734545";
|
||||
childBorder = "#993d3d";
|
||||
childBorder = "#734545";
|
||||
# childBorder = "#993d3d";
|
||||
indicator = "#993d3d";
|
||||
text = "#ebdadd";
|
||||
};
|
||||
};
|
||||
floating.titlebar = true;
|
||||
fonts = {
|
||||
names = [ "Noto Sans" "Noto Emoji" "Symbols Nerd Font Mono" ];
|
||||
names = [ "Noto Sans Mono" "Symbols Nerd Font Mono" ];
|
||||
size = 16.0;
|
||||
};
|
||||
gaps = {
|
||||
|
|
@ -157,6 +163,11 @@ in
|
|||
};
|
||||
xsession.windowManager.i3 = {
|
||||
config = let i3Config = {
|
||||
bars = [
|
||||
(barConfig // {
|
||||
statusCommand = "${pkgs.i3status}/bin/i3status";
|
||||
})
|
||||
];
|
||||
keybindings = genKeybindings options.xsession.windowManager.i3 {
|
||||
XF86AudioRaiseVolume = "exec ${pkgs.pamixer}/bin/pamixer --increase 5";
|
||||
XF86AudioLowerVolume = "exec ${pkgs.pamixer}/bin/pamixer --decrease 5";
|
||||
|
|
@ -187,9 +198,92 @@ in
|
|||
xdg-desktop-portal-wlr
|
||||
xdg-desktop-portal-gtk
|
||||
] else [];
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
settings = [{
|
||||
layer = "bottom";
|
||||
# position = "bottom";
|
||||
ipc = true;
|
||||
height = 40;
|
||||
modules-left = [ "cpu" "sway/workspaces" "sway/mode" ];
|
||||
"sway/workspaces" = {
|
||||
disable-scroll = true;
|
||||
format = "{value}{icon}";
|
||||
format-icons = {
|
||||
default = "";
|
||||
focused = "";
|
||||
urgent = " ";
|
||||
"2" = " ";
|
||||
"3" = " ";
|
||||
"4" = " ";
|
||||
"5" = " ";
|
||||
};
|
||||
persistent-workspaces = {
|
||||
"1" = []; "2" = []; "3" = []; "4" = []; "5" = [];
|
||||
};
|
||||
};
|
||||
"sway/mode" = {
|
||||
tooltip = false;
|
||||
};
|
||||
modules-center = [ "sway/window" ];
|
||||
#fixed-center = false;
|
||||
"sway/window" = {
|
||||
format = "{title}";
|
||||
max-length = 50;
|
||||
tooltip = false;
|
||||
icon = true;
|
||||
rewrite = {
|
||||
kitty = "";
|
||||
zsh = "";
|
||||
nheko = "";
|
||||
Nextcloud = "";
|
||||
"(.*) — LibreWolf" = "$1";
|
||||
"(.*) - KeePassXC" = "$1";
|
||||
};
|
||||
};
|
||||
modules-right = [ "memory" "tray" "wireplumber" "clock" "sway/language" ];
|
||||
cpu = {
|
||||
# format = "{usage}% ";
|
||||
format = " {icon0}{icon1}{icon2}{icon3}{icon4}{icon5}{icon6}{icon7}{icon8}{icon9}{icon10}{icon11}{icon12}{icon13}{icon14}{icon15}";
|
||||
format-icons = ["▁" "▂" "▃" "▄" "▅" "▆" "▇" "█"];
|
||||
tooltip = false;
|
||||
};
|
||||
memory = {
|
||||
format = " {used}G";
|
||||
tooltip = false;
|
||||
};
|
||||
tray = {
|
||||
icon-size = 26;
|
||||
spacing = 5;
|
||||
};
|
||||
wireplumber = {
|
||||
format = "{icon} {volume}%";
|
||||
format-muted = "ﱝ";
|
||||
format-icons = ["奄" "奔" "墳"];
|
||||
tooltip = false;
|
||||
};
|
||||
clock = {
|
||||
interval = 5;
|
||||
format = "{:%Y-%m-%d %H:%M:%S}";
|
||||
tooltip = false;
|
||||
};
|
||||
"sway/language" = {
|
||||
tooltip = false;
|
||||
};
|
||||
}];
|
||||
style = ./waybar.css;
|
||||
};
|
||||
wayland.windowManager.sway = {
|
||||
wrapperFeatures.gtk = true;
|
||||
config = let swayConfig = {
|
||||
bars = [
|
||||
{
|
||||
command = "${config.programs.waybar.package}/bin/waybar";
|
||||
mode = "dock";
|
||||
position = "bottom";
|
||||
hiddenState = "hide";
|
||||
}
|
||||
];
|
||||
terminal = config.terminalBin;
|
||||
window.commands = [
|
||||
{ command = "floating enable; move workspace current";
|
||||
|
|
@ -248,9 +342,9 @@ in
|
|||
"--locked XF86AudioRaiseVolume" = "exec ${pkgs.pamixer}/bin/pamixer --increase 5";
|
||||
"--locked XF86AudioLowerVolume" = "exec ${pkgs.pamixer}/bin/pamixer --decrease 5";
|
||||
"--locked XF86AudioMute" = "exec ${pkgs.pamixer}/bin/pamixer --toggle-mute";
|
||||
"--locked XF86AudioPlay" = "exec ${pkgs.playerctl}/bin/playerctl play-pause";
|
||||
"--locked XF86AudioNext" = "exec ${pkgs.playerctl}/bin/playerctl next";
|
||||
"--locked XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous";
|
||||
"--locked --inhibited XF86AudioPlay" = "exec ${pkgs.playerctl}/bin/playerctl play-pause";
|
||||
"--locked --inhibited XF86AudioNext" = "exec ${pkgs.playerctl}/bin/playerctl next";
|
||||
"--locked --inhibited XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous";
|
||||
});
|
||||
startup = [
|
||||
{
|
||||
|
|
|
|||
|
|
@ -132,7 +132,7 @@ in {
|
|||
font.size = 16;
|
||||
settings = {
|
||||
inherit shell;
|
||||
symbol_map = "U+23FB-U+23FE,U+2665,U+26A1,U+2B58,U+E000-U+F8FF,U+F0000-U+FFFFF Symbols Nerd Font Mono";
|
||||
symbol_map = "U+23FB-U+23FE,U+2665,U+26A1,U+2B58,U+E000-U+FD46,U+F0000-U+FFFFF Symbols Nerd Font Mono";
|
||||
cursor = "none";
|
||||
open_url_with = "${pkgs.xdg-utils}/bin/xdg-open";
|
||||
focus_follows_mouse = true;
|
||||
|
|
|
|||
107
home/common/waybar.css
Normal file
107
home/common/waybar.css
Normal file
|
|
@ -0,0 +1,107 @@
|
|||
@define-color bg rgba(36, 16, 26, .75); /*#24101ac0;*/
|
||||
@define-color blue #87e5cf;
|
||||
@define-color green #8cbf73;
|
||||
@define-color yellow #ebbe5f;
|
||||
@define-color red #e64040;
|
||||
@define-color pink #ffa8a8;
|
||||
@define-color fg #ebdadd;
|
||||
@define-color dimmed rgba(235, 218, 221, .15);
|
||||
|
||||
* {
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
font-family: Noto Sans Mono, "Symbols Nerd Font Mono", monospace;
|
||||
font-size: 19;
|
||||
min-height: 0;
|
||||
}
|
||||
|
||||
window#waybar {
|
||||
background-color: @bg;
|
||||
transition-property: background-color;
|
||||
transition-duration: .5s;
|
||||
}
|
||||
|
||||
window#waybar.hidden {
|
||||
opacity: .2;
|
||||
}
|
||||
|
||||
#workspaces button {
|
||||
padding: 0 11px;
|
||||
background: transparent;
|
||||
border-bottom: 3px solid transparent;
|
||||
}
|
||||
|
||||
#workspaces button.hover {
|
||||
background-color: @background;
|
||||
box-shadow: inherit;
|
||||
border-bottom: 3px solid @dimmed;
|
||||
}
|
||||
|
||||
#workspaces button.focused {
|
||||
background-color: @dimmed;
|
||||
border-bottom: 3px solid @fg;
|
||||
}
|
||||
|
||||
#workspaces button.urgent {
|
||||
background-color: @background;
|
||||
border-bottom: 3px solid @red;
|
||||
}
|
||||
|
||||
#mode {
|
||||
background-color: transparent;
|
||||
border: 2px solid @fg;
|
||||
border-radius: 2px;
|
||||
padding: 0 5px;
|
||||
}
|
||||
|
||||
#clock,
|
||||
#cpu,
|
||||
#memory,
|
||||
#wireplumber,
|
||||
#battery,
|
||||
#language,
|
||||
#tray {
|
||||
padding: 0 8px;
|
||||
}
|
||||
|
||||
#mode,
|
||||
#workspaces,
|
||||
#workspaces button
|
||||
{
|
||||
color: @fg;
|
||||
}
|
||||
#cpu {
|
||||
color: @fg;
|
||||
}
|
||||
|
||||
#window {
|
||||
padding: 0 3px;
|
||||
margin: 3px 2px;
|
||||
background-color: transparent;
|
||||
color: @fg;
|
||||
}
|
||||
|
||||
|
||||
.charging,
|
||||
#clock,
|
||||
#language,
|
||||
#wireplumber,
|
||||
#memory
|
||||
{
|
||||
color: @fg;
|
||||
}
|
||||
|
||||
#battery.full {
|
||||
color: @green;
|
||||
}
|
||||
|
||||
.discharging,
|
||||
.warning {
|
||||
color: @yellow;
|
||||
}
|
||||
|
||||
.critical {
|
||||
color: #ffffff;
|
||||
background: @red;
|
||||
}
|
||||
|
||||
|
|
@ -12,6 +12,7 @@
|
|||
history.path = "${config.xdg.dataHome}/zsh/zsh_history";
|
||||
shellAliases.s = "sudo -A";
|
||||
shellAliases.se = "sudo -AE";
|
||||
shellAliases.l = "lsd";
|
||||
# I dont want to remap the up key, so only map this, setting ATUIN_NOBIND to true
|
||||
initExtra = ''
|
||||
up-line-or-local-history() {
|
||||
|
|
|
|||
|
|
@ -151,6 +151,8 @@ in {
|
|||
|
||||
### RANDOM PATCHES ###
|
||||
|
||||
programs.fuse.userAllowOther = true;
|
||||
|
||||
# zsh
|
||||
environment.pathsToLink = [ "/share/zsh" ];
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue