refactor(tazjin/dotfiles): move waybar configuration into Nix

Change-Id: Ia031fd755ecf451b0ef1f9e63f3aec8b56fe2d57
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12448
Reviewed-by: tazjin <tazjin@tvl.su>
Autosubmit: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
This commit is contained in:
Vincent Ambo 2024-09-07 14:39:40 +03:00 committed by clbot
parent 863146295b
commit 7903d26054
7 changed files with 82 additions and 33 deletions

View file

@ -0,0 +1 @@
Stuff below here is managed manually, without readTree.

View file

@ -1,5 +1,8 @@
_: {
args: {
dunstrc = ./dunstrc;
niri = ./niri.config.kdl;
waybar = ./waybar;
waybar = {
config = import ./waybar/config.nix args;
style = ./waybar/style.css;
};
}

View file

@ -38,7 +38,6 @@ layout {
spawn-at-startup "xwayland-satellite"
spawn-at-startup "xrandr --output eDP-1 --primary"
spawn-at-startup "wpaperd" "-d"
spawn-at-startup "waybar"
spawn-at-startup "systemctl --user start xss-lock"
environment {

View file

@ -1,29 +0,0 @@
// TODO: idle-inhibitor? image (tux?)?
{
"layer": "top",
"position": "bottom",
"modules-right": ["pulseaudio", "backlight", "battery", "tray", "clock"],
"pulseaudio": {
"on-click": "pavucontrol",
// Font "Awesome" speaker icons can't be made to render, I don't care why, emoji time.
"format": "{volume}% 🎧",
"format-muted": "{volume}% "
},
"battery": {
"format": "{capacity}% {icon}",
"format-icons": ["", "", "", "", ""]
},
"backlight": {
"format": "{percent}% {icon}",
"format-icons": [""],
"on-scroll-up": "light -A 1",
"on-scroll-down": "light -U 1"
},
"clock": {
"format-alt": "{:%a, %d. %b %H:%M}"
},
"tray": {
"icon-size": 20,
"spacing": 10
}
}

View file

@ -0,0 +1,51 @@
{ depot, pkgs, ... }:
let
launcher = "${pkgs.xfce4-appfinder}/bin/xfce4-appfinder --disable-server";
in
{
mainBar = {
layer = "top";
position = "bottom";
modules-left = [ "image#start" "custom/start" ];
"image#start" = {
path = "${depot.third_party.chicago95}/share/icons/Chicago95/panel/24/start-here.png";
size = 24;
on-click = "xfce4-appfinder --disable-server";
};
"custom/start" = {
format = " Start";
on-click = "xfce4-appfinder --disable-server";
};
modules-right = [ "pulseaudio" "backlight" "battery" "tray" "clock" ];
pulseaudio = {
on-click = "pavucontrol";
# Font "Awesome" speaker icons can't be made to render, I don't care why, emoji time.
format = "{volume}% 🎧";
format-muted = "{volume}% ";
};
battery = {
format = "{capacity}% {icon}";
format-icons = [ "" "" "" "" "" ];
};
backlight = {
format = "{percent}% {icon}";
format-icons = [ "" ];
on-scroll-up = "light -A 1";
on-scroll-down = "light -U 1";
};
clock.format-alt = "{:%a, %d. %b %H:%M}";
tray = {
icon-size = 20;
spacing = 10;
};
};
}

View file

@ -77,8 +77,23 @@ button:hover {
margin: 0 4px;
}
#custom-start {
padding-bottom: 1px;
margin-right: 1px;
}
/* pop out left "modules" (start button) */
.modules-left {
margin: 3px;
border-right: 1px solid gray;
border-bottom: 1px solid gray;
border-left: 1px solid white;
border-top: 1px solid white;
font-weight: bold;
}
/* indent right modules like in the original */
.modules-right, .modules-left {
.modules-right {
margin: 3px;
border-top: 1px solid gray;
border-left: 1px solid gray;

View file

@ -74,6 +74,15 @@ in
};
};
programs.waybar = {
enable = true;
settings = depot.users.tazjin.dotfiles.waybar.config;
style = depot.users.tazjin.dotfiles.waybar.style;
systemd.enable = true;
};
systemd.user.services.waybar.Unit.After = lib.mkForce [ "niri.service" ];
services.swayidle = let cmd = "${pkgs.swaylock}/bin/swaylock -fFkl -c 008080"; in {
enable = true;
events = [