From 9f6ffaab98efb1bd9dbd1087e719aa18f94db42a Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Thu, 18 Sep 2025 12:46:12 -0400 Subject: [PATCH] clean up --- configs/niri/config.kdl | 5 +++ configs/niri/waybar/bottom-bar.css | 18 ++++---- configs/niri/waybar/bottom-bar.jsonc | 4 +- configs/niri/waybar/start-up-script.sh | 7 +++ modules/nixos/desktop/tiler/niri.nix | 62 ++++++++++++++------------ 5 files changed, 55 insertions(+), 41 deletions(-) create mode 100755 configs/niri/waybar/start-up-script.sh diff --git a/configs/niri/config.kdl b/configs/niri/config.kdl index 20de69d..e6f250a 100644 --- a/configs/niri/config.kdl +++ b/configs/niri/config.kdl @@ -246,5 +246,10 @@ binds { Mod+Q { close-window; } Mod+Ctrl+P { spawn "waypaper" "--restore"; } + + Mod+Ctrl+W { + spawn "sh" "-c" "/home/ari/.config/niri/waybar/start-up-script.sh"; + } } +spawn-at-startup "/home/ari/.config/niri/waybar/start-up-script.sh" \ No newline at end of file diff --git a/configs/niri/waybar/bottom-bar.css b/configs/niri/waybar/bottom-bar.css index 5a1622e..ea867ca 100644 --- a/configs/niri/waybar/bottom-bar.css +++ b/configs/niri/waybar/bottom-bar.css @@ -1,6 +1,6 @@ * { font-family: "Fira Code", "SF Pro Display", sans-serif; - font-size: 14px; + font-size: 10px; } window#waybar { @@ -13,7 +13,8 @@ window#waybar.hidden { } /* === Reset button styles === */ -button { + +/* button { box-shadow: none; border: none; border-radius: 0; @@ -27,15 +28,14 @@ button:hover { border: none; -gtk-icon-effect: none; -gtk-icon-shadow: none; -} +} */ /* === Workspaces as a tray === */ -#workspaces { +/* #workspaces { margin: 0 10px; padding: 0 4px; background: transparent; border-bottom: 2px solid rgba(255, 255, 255, 0.15); - /* tray shelf line */ } #workspaces button { @@ -57,16 +57,14 @@ button:hover { #workspaces button.urgent { border-bottom: 2px solid #eb4d4b; - /* urgent = red underline */ -} +} */ /* === Taskbar as a tray === */ -#taskbar { +/* #taskbar { background: transparent; margin: 0 10px; padding: 0 4px; border-bottom: 2px solid rgba(255, 255, 255, 0.15); - /* tray shelf line */ } #taskbar button { @@ -87,4 +85,4 @@ button:hover { #taskbar button.active:hover { border-bottom: 2px solid rgba(255, 255, 255, 1.0); -} \ No newline at end of file +} */ \ No newline at end of file diff --git a/configs/niri/waybar/bottom-bar.jsonc b/configs/niri/waybar/bottom-bar.jsonc index e60971c..0502194 100644 --- a/configs/niri/waybar/bottom-bar.jsonc +++ b/configs/niri/waybar/bottom-bar.jsonc @@ -2,8 +2,8 @@ "reload_style_on_change": true, "layer": "top", "position": "bottom", // Waybar at bottom layer - "height": 42, - "margin-top": 4, + "height": 10, + "margin-top": 0, "margin-bottom": 4, "margin-left": 4, "margin-right": 4, diff --git a/configs/niri/waybar/start-up-script.sh b/configs/niri/waybar/start-up-script.sh new file mode 100755 index 0000000..1c377b7 --- /dev/null +++ b/configs/niri/waybar/start-up-script.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +killall -q waybar + +waybar --config /home/ari/nixos-setup/configs/niri/waybar/bottom-bar.jsonc --style /home/ari/nixos-setup/configs/niri/waybar/bottom-bar.css & +waybar --config /home/ari/nixos-setup/configs/niri/waybar/top-bar.jsonc --style /home/ari/nixos-setup/configs/niri/waybar/top-bar.css & +waypaper --restore \ No newline at end of file diff --git a/modules/nixos/desktop/tiler/niri.nix b/modules/nixos/desktop/tiler/niri.nix index 1af0807..2a870a9 100644 --- a/modules/nixos/desktop/tiler/niri.nix +++ b/modules/nixos/desktop/tiler/niri.nix @@ -2,23 +2,27 @@ let cfg = config.skyg.nixos.desktop.tiler.niri; makeNiriSystemdService = { description, script, path ? [ ] }: { - Unit = { - Description = description; - After = [ "niri.service" "xdg-desktop-portal.service" ]; - PartOf = [ "niri.service" "tray.target" ]; - BindsTo = [ "niri.service" ]; - Wants = [ "niri.service" "xdg-desktop-portal.service" ]; - WantedBy = [ - "graphical-session.target" - # "tray.target" - ]; - Requires = [ "niri.service" ]; - }; - Service = { + inherit description script path; + enable = true; + requires = [ "niri.service" ]; + restartTriggers = [ + script + path + ]; + reloadTriggers = [ + script + path + ]; + after = [ "niri.service" "xdg-desktop-portal.service" ]; + partOf = [ "niri.service" "tray.target" ]; + bindsTo = [ "niri.service" ]; + wants = [ "niri.service" "xdg-desktop-portal.service" ]; + wantedBy = [ "graphical-session.target" "tray.target" ]; + serviceConfig = { Type = "simple"; - KillMode = "mixed"; Restart = "on-failure"; ExecReload = "${pkgs.coreutils}/bin/kill -SIGUSR2 $MAINPID"; + KillMode = "mixed"; ConditionEnvironment = "WAYLAND_DISPLAY"; }; }; @@ -46,31 +50,31 @@ in filePath = "niri"; configSource = "/home/${config.skyg.user.name}/nixos-setup/configs"; }; - users.users.${config.skyg.user.name}.systemd.user.services.niri-waybar = makeNiriSystemdService { - description = "Niri's Top Waybar"; - path = [ pkgs.nwg-bar pkgs.niri ]; - script = '' - ${pkgs.waybar}/bin/waybar \ - --config /home/${config.skyg.user.name}/nixos-setup/configs/niri/waybar/top-bar.jsonc \ - --style /home/${config.skyg.user.name}/nixos-setup/configs/niri/waybar/top-bar.css & - ${pkgs.waybar}/bin/waybar \ - --config /home/${config.skyg.user.name}/nixos-setup/configs/niri/waybar/bottom-bar.jsonc \ - --style /home/${config.skyg.user.name}/nixos-setup/configs/niri/waybar/bottom-bar.css - ''; - }; - users.users.${config.skyg.user.name}.systemd.user.services.niri-xwayland = makeNiriSystemdService { + # systemd.user.services.niri-waybar = makeNiriSystemdService { + # description = "Niri's Top Waybar"; + # path = [ pkgs.nwg-bar pkgs.niri ]; + # script = '' + # ${pkgs.waybar}/bin/waybar \ + # --config /home/${config.skyg.user.name}/nixos-setup/configs/niri/waybar/top-bar.jsonc \ + # --style /home/${config.skyg.user.name}/nixos-setup/configs/niri/waybar/top-bar.css & + # ${pkgs.waybar}/bin/waybar \ + # --config /home/${config.skyg.user.name}/nixos-setup/configs/niri/waybar/bottom-bar.jsonc \ + # --style /home/${config.skyg.user.name}/nixos-setup/configs/niri/waybar/bottom-bar.css + # ''; + # }; + systemd.user.services.niri-xwayland = makeNiriSystemdService { description = "Niri's xwayland-satellite"; script = '' ${pkgs.xwayland-satellite}/bin/xwayland-satellite ''; }; - users.users.${config.skyg.user.name}.systemd.user.services.niri-hypridle = makeNiriSystemdService { + systemd.user.services.niri-hypridle = makeNiriSystemdService { description = "Niri's hypridle"; script = '' ${pkgs.hypridle}/bin/hypridle ''; }; - users.users.${config.skyg.user.name}.systemd.user.services.niri-swayosd = makeNiriSystemdService { + systemd.user.services.niri-swayosd = makeNiriSystemdService { description = "Niri's swayosd"; script = '' ${pkgs.swayosd}/bin/swayosd-server