diff --git a/configs/niri/ironbar/config.toml b/configs/niri/ironbar/config.toml
new file mode 100644
index 0000000..5396340
--- /dev/null
+++ b/configs/niri/ironbar/config.toml
@@ -0,0 +1,78 @@
+anchor_to_edges = true
+position = "top"
+icon_theme = "Paper"
+
+
+[[end]]
+type = "volume"
+format = "{icon} {percentage}%"
+max_volume = 100
+
+[end.icons]
+volume_high = ""
+volume_medium = ""
+volume_low = ""
+muted = ""
+
+[[end]]
+type = "clipboard"
+max_items = 3
+
+[end.truncate]
+mode = "end"
+length = 50
+
+[[end]]
+type = "custom"
+class = "power-menu"
+tooltip = "Up: {{30000:uptime -p | cut -d ' ' -f2-}}"
+
+[[end.bar]]
+type = "button"
+name = "power-btn"
+label = ""
+on_click = "popup:toggle"
+
+[[end.popup]]
+type = "box"
+orientation = "vertical"
+
+[[end.popup.widgets]]
+type = "label"
+name = "header"
+label = "Power menu"
+
+[[end.popup.widgets]]
+type = "box"
+
+[[end.popup.widgets.widgets]]
+type = "button"
+class = "power-btn"
+label = ""
+on_click = "!shutdown now"
+
+[[end.popup.widgets.widgets]]
+type = "button"
+class = "power-btn"
+label = ""
+on_click = "!reboot"
+
+[[end.popup.widgets]]
+type = "label"
+name = "uptime"
+label = "Uptime: {{30000:uptime -p | cut -d ' ' -f2-}}"
+
+[[end]]
+type = "clock"
+
+[[end]]
+type = "notifications"
+show_count = true
+
+[end.icons]
+closed_none = ""
+closed_some = ""
+closed_dnd = ""
+open_none = ""
+open_some = ""
+open_dnd = ""
diff --git a/configs/niri/ironbar/style.css b/configs/niri/ironbar/style.css
new file mode 100644
index 0000000..8ed5bdb
--- /dev/null
+++ b/configs/niri/ironbar/style.css
@@ -0,0 +1,275 @@
+@define-color color_bg #2d2d2d;
+@define-color color_bg_dark #1c1c1c;
+@define-color color_border #424242;
+@define-color color_border_active #6699cc;
+@define-color color_text #ffffff;
+@define-color color_urgent #8f0a0a;
+
+/* -- base styles -- */
+
+* {
+ font-family: Noto Sans Nerd Font, sans-serif;
+ font-size: 16px;
+ border: none;
+ border-radius: 0;
+}
+
+box,
+menubar,
+button {
+ background-color: @color_bg;
+ background-image: none;
+ box-shadow: none;
+}
+
+button,
+label {
+ color: @color_text;
+}
+
+button:hover {
+ background-color: @color_bg_dark;
+}
+
+scale trough {
+ min-width: 1px;
+ min-height: 2px;
+}
+
+#bar {
+ border-top: 1px solid @color_border;
+}
+
+.popup {
+ border: 1px solid @color_border;
+ padding: 1em;
+}
+
+/* -- bluetooth -- */
+.popup-bluetooth {
+ min-height: 14em;
+ min-width: 24em;
+}
+
+.popup-bluetooth .header {
+ padding-bottom: 1.0em;
+ margin-bottom: 0.6em;
+ border-bottom: 1px solid @color_border;
+}
+
+.popup-bluetooth .header .label {
+ margin-left: 0.5em;
+}
+
+.popup-bluetooth .disabled .spinner {
+ min-width: 2.0em;
+ min-height: 2.0em;
+ padding: 0.4em;
+}
+
+.popup-bluetooth .devices .box .device {
+ margin-bottom: 0.4em;
+}
+
+.popup-bluetooth .devices .icon {
+ min-width: 2.5em;
+ min-height: 2.5em;
+ margin-right: 0.8em;
+}
+
+.popup-bluetooth .devices .box .device .status .footer-label {
+ font-size: 0.8em;
+}
+
+.popup-bluetooth .devices .box .device .spinner {
+ min-width: 1.5em;
+ min-height: 1.5em;
+ margin: 0.5em;
+}
+
+
+/* -- clipboard -- */
+
+.clipboard {
+ margin-left: 5px;
+ font-size: 1.1em;
+}
+
+.popup-clipboard .item {
+ padding-bottom: 0.3em;
+ border-bottom: 1px solid @color_border;
+}
+
+
+/* -- clock -- */
+
+.clock {
+ font-weight: bold;
+ margin-left: 5px;
+}
+
+.popup-clock .calendar-clock {
+ color: @color_text;
+ font-size: 2.5em;
+ padding-bottom: 0.1em;
+}
+
+.popup-clock .calendar {
+ background-color: @color_bg;
+ color: @color_text;
+}
+
+.popup-clock .calendar .header {
+ padding-top: 1em;
+ border-top: 1px solid @color_border;
+ font-size: 1.5em;
+}
+
+.popup-clock .calendar:selected {
+ background-color: @color_border_active;
+}
+
+
+/* -- launcher -- */
+
+.launcher .item {
+ margin-right: 4px;
+}
+
+.launcher .ifix examtem:not(.focused):hover {
+ background-color: @color_bg_dark;
+}
+
+.launcher .open {
+ border-bottom: 1px solid @color_text;
+}
+
+.launcher .focused {
+ border-bottom: 1px solid @color_border_active;
+}
+
+.launcher .urgent {
+ border-bottom-color: @color_urgent;
+}
+
+.popup-launcher {
+ padding: 0;
+}
+
+.popup-launcher .popup-item:not(:first-child) {
+ border-top: 1px solid @color_border;
+}
+
+
+/* -- music -- */
+
+.music:hover * {
+ background-color: @color_bg_dark;
+}
+
+.popup-music .album-art {
+ margin-right: 1em;
+}
+
+.popup-music .icon-box {
+ margin-right: 0.4em;
+}
+
+.popup-music .title .icon,
+.popup-music .title .label {
+ font-size: 1.7em;
+}
+
+.popup-music .controls *:disabled {
+ color: @color_border;
+}
+
+.popup-music .volume .slider slider {
+ border-radius: 100%;
+}
+
+.popup-music .volume .icon {
+ margin-left: 4px;
+}
+
+.popup-music .progress .slider slider {
+ border-radius: 100%;
+}
+
+/* notifications */
+
+.notifications .count {
+ font-size: 0.6rem;
+ background-color: @color_text;
+ color: @color_bg;
+ border-radius: 100%;
+ margin-right: 3px;
+ margin-top: 3px;
+ padding-left: 4px;
+ padding-right: 4px;
+ opacity: 0.7;
+}
+
+/* -- script -- */
+
+.script {
+ padding-left: 10px;
+}
+
+
+/* -- sys_info -- */
+
+.sysinfo {
+ margin-left: 10px;
+}
+
+.sysinfo .item {
+ margin-left: 5px;
+}
+
+
+/* -- tray -- */
+
+.tray {
+ margin-left: 10px;
+}
+
+/* -- volume -- */
+
+.popup-volume .device-box {
+ border-right: 1px solid @color_border;
+}
+
+/* -- workspaces -- */
+
+.workspaces .item.focused {
+ box-shadow: inset 0 -3px;
+ background-color: @color_bg_dark;
+}
+
+.workspaces .item.urgent {
+ background-color: @color_urgent;
+}
+
+.workspaces .item:hover {
+ box-shadow: inset 0 -3px;
+}
+
+
+/* -- custom: power menu -- */
+
+.popup-power-menu #header {
+ font-size: 1.4em;
+ padding-bottom: 0.4em;
+ margin-bottom: 0.6em;
+ border-bottom: 1px solid @color_border;
+}
+
+.popup-power-menu .power-btn {
+ border: 1px solid @color_border;
+ padding: 0.6em 1em;
+}
+
+.popup-power-menu #buttons>*:nth-child(1) .power-btn {
+ margin-right: 1em;
+}
\ No newline at end of file
diff --git a/configs/niri/waybar/start-up-script.sh b/configs/niri/waybar/start-up-script.sh
index 1c377b7..6213b72 100755
--- a/configs/niri/waybar/start-up-script.sh
+++ b/configs/niri/waybar/start-up-script.sh
@@ -1,7 +1,16 @@
#!/bin/sh
killall -q waybar
+sleep 1
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
+waypaper --restore
+
+killall -q hypridle
+hypridle &
+
+killall -q swayosd-server
+swayosd-server
+
+notify-send "Niri Startup Script" "Completed 🎉"
diff --git a/modules/nixos/desktop/tiler/niri.nix b/modules/nixos/desktop/tiler/niri.nix
index 2a870a9..b602ec0 100644
--- a/modules/nixos/desktop/tiler/niri.nix
+++ b/modules/nixos/desktop/tiler/niri.nix
@@ -1,31 +1,6 @@
{ config, lib, pkgs, skygUtils, ... }:
let
cfg = config.skyg.nixos.desktop.tiler.niri;
- makeNiriSystemdService = { description, script, path ? [ ] }: {
- 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";
- Restart = "on-failure";
- ExecReload = "${pkgs.coreutils}/bin/kill -SIGUSR2 $MAINPID";
- KillMode = "mixed";
- ConditionEnvironment = "WAYLAND_DISPLAY";
- };
- };
in
{
options = {
@@ -50,36 +25,6 @@ in
filePath = "niri";
configSource = "/home/${config.skyg.user.name}/nixos-setup/configs";
};
- # 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
- '';
- };
- systemd.user.services.niri-hypridle = makeNiriSystemdService {
- description = "Niri's hypridle";
- script = ''
- ${pkgs.hypridle}/bin/hypridle
- '';
- };
- systemd.user.services.niri-swayosd = makeNiriSystemdService {
- description = "Niri's swayosd";
- script = ''
- ${pkgs.swayosd}/bin/swayosd-server
- '';
- };
};
}