diff options
| -rw-r--r-- | config/waybar/config | 13 | ||||
| -rw-r--r-- | config/waybar/style.css | 40 | ||||
| -rwxr-xr-x | dist/bar.sh | 10 | ||||
| -rw-r--r-- | modules/login.nix | 3 | ||||
| -rw-r--r-- | packages/dwl.nix | 2 |
5 files changed, 49 insertions, 19 deletions
diff --git a/config/waybar/config b/config/waybar/config index 06ac5da..b9461e5 100644 --- a/config/waybar/config +++ b/config/waybar/config @@ -6,7 +6,7 @@ "margin-right": 0, "margin-bottom": 0, "margin-left": 0, - "modules-left": ["wlr/taskbar"], + "modules-left": ["dwl/tags", "dwl/window"], "modules-center": [], "modules-right": ["network", "backlight", "pulseaudio", "battery", "clock"], @@ -14,6 +14,17 @@ "format": " {:%a, %b %d %Y | %I:%M %p}" }, + "dwl/tags": { + "num-tags": 9, + "disable-click": true + }, + + "dwl/window": { + "format": "|> {title}", + "max-length": 50, + "swap-icon-label": false + }, + "wlr/taskbar": { "format": "{title:.24}", "tooltip-format": "{title}", diff --git a/config/waybar/style.css b/config/waybar/style.css index ba5c6d8..12e99c4 100644 --- a/config/waybar/style.css +++ b/config/waybar/style.css @@ -1,10 +1,4 @@ -/* ----------------------------------------------------------------------------- - * Styles - * -------------------------------------------------------------------------- */ - /* COLORS */ - -/* Nord */ @define-color bg #191919; @define-color light #212121; @@ -26,6 +20,30 @@ window#waybar { border: 2px solid #191919; } +#window { + margin: 6px 6px 6px 0px; + padding: 2px 8px; + color: #9b9b9b +} + +#tags { + margin: 6px; + background: #212121; + color: #9b9b9b +} + +#tags button, #tags button:hover { + padding: 2px 12px; + background: #212121; + color: #9b9b9b +} + +#tags button.focused { + padding: 2px 12px; + background: #9b9b9b; + color: #212121; +} + /* Each module */ #clock, #taskbar button, @@ -45,8 +63,8 @@ window#waybar { padding: 0 6px; } -#window { - margin-right: 40px; - margin-left: 40px; - font-weight: normal; -} +/* #window { */ +/* margin-right: 40px; */ +/* margin-left: 40px; */ +/* font-weight: normal; */ +/* } */ diff --git a/dist/bar.sh b/dist/bar.sh index 156fe44..d1cd835 100755 --- a/dist/bar.sh +++ b/dist/bar.sh @@ -33,9 +33,9 @@ volume() { pamixer --get-volume } -# while [[ true ]]; do -# dwlb -status all "| ^lm(alacritty -e nmtui-connect) $(wifi)^lm() | $(volume)% | $(battery)%$(charging) | $(calendar) | λ |" -# sleep 1 -# done +while [[ true ]]; do + dwlb -status all "| ^lm(alacritty -e nmtui-connect) $(wifi)^lm() | $(volume)% | $(battery)%$(charging) | $(calendar) | λ |" + sleep 1 +done -echo "| $(wifi) | $(volume)% | $(battery)%$(charging) | $(calendar) | λ |" +# echo "| $(wifi) | $(volume)% | $(battery)%$(charging) | $(calendar) | λ |" diff --git a/modules/login.nix b/modules/login.nix index 1751f2a..e6ae50b 100644 --- a/modules/login.nix +++ b/modules/login.nix @@ -12,7 +12,8 @@ default_session = { # command = "tuigreet --time --remember --cmd sway"; # command = "tuigreet --time --remember --cmd labwc"; - command = "tuigreet --time --remember --cmd \"dwl -s dwlb\""; + # command = "tuigreet --time --remember --cmd \"dwl -s dwlb\""; + command = "tuigreet --time --remember --cmd dwl"; user = "greeter"; }; }; diff --git a/packages/dwl.nix b/packages/dwl.nix index f41bce8..c297de1 100644 --- a/packages/dwl.nix +++ b/packages/dwl.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "compromyse"; repo = "dwl"; rev = "compromyse"; - hash = "sha256-+/8C4vj3TKVQN4IpG1kqONwte41p57oYWrwAlqgiUWM="; + hash = "sha256-AC9Na/NayE7Aaqe594JEWKdjIk4shvbmiClKVUwGJ6s="; }; nativeBuildInputs = [ |