diff --git a/configs/niri-config.kdl b/configs/niri-config.kdl
index 55348fb..b067ded 100644
--- a/configs/niri-config.kdl
+++ b/configs/niri-config.kdl
@@ -86,6 +86,7 @@ window-rule {
match app-id="Rofi"
match app-id="nm-connection-editor"
match app-id=".blueman-manager-wrapped"
+ match app-id=r#"^org.gnome.Calendar$"#
open-floating true
default-floating-position x=0 y=25 relative-to="top"
default-window-height { proportion 0.5; }
@@ -174,11 +175,9 @@ workspace "chat" {
}
spawn-at-startup "slack"
spawn-at-startup "signal-desktop"
-spawn-at-startup "gnome-calendar"
window-rule {
match app-id=r#"^Slack$"#
match app-id=r#"^signal$"#
- match app-id=r#"^org.gnome.Calendar$"#
open-on-workspace "chat"
open-fullscreen true
}
diff --git a/configs/niri/nwg-bar/bar.json b/configs/niri/nwg-bar/bar.json
new file mode 100644
index 0000000..7cae46e
--- /dev/null
+++ b/configs/niri/nwg-bar/bar.json
@@ -0,0 +1,27 @@
+[
+ {
+ "label": "Sleep",
+ "exec": "systemctl suspend",
+ "icon": "/home/ari/.config/nwg-bar/images/system-suspend.svg"
+ },
+ {
+ "label": "Hibernate",
+ "exec": "systemctl hibernate",
+ "icon": "/home/ari/.config/nwg-bar/images/system-hibernate.svg"
+ },
+ {
+ "label": "Logout",
+ "exec": "niri msg action quit",
+ "icon": "/home/ari/.config/nwg-bar/images/system-log-out.svg"
+ },
+ {
+ "label": "Reboot",
+ "exec": "systemctl reboot",
+ "icon": "/home/ari/.config/nwg-bar/images/system-reboot.svg"
+ },
+ {
+ "label": "Shutdown",
+ "exec": "systemctl -i poweroff",
+ "icon": "/home/ari/.config/nwg-bar/images/system-shutdown.svg"
+ }
+]
\ No newline at end of file
diff --git a/configs/niri/nwg-bar/images/system-hibernate.svg b/configs/niri/nwg-bar/images/system-hibernate.svg
new file mode 100644
index 0000000..a91552c
--- /dev/null
+++ b/configs/niri/nwg-bar/images/system-hibernate.svg
@@ -0,0 +1,87 @@
+
+
diff --git a/configs/niri/nwg-bar/images/system-lock-screen.svg b/configs/niri/nwg-bar/images/system-lock-screen.svg
new file mode 100644
index 0000000..7609141
--- /dev/null
+++ b/configs/niri/nwg-bar/images/system-lock-screen.svg
@@ -0,0 +1,60 @@
+
+
diff --git a/configs/niri/nwg-bar/images/system-log-out.svg b/configs/niri/nwg-bar/images/system-log-out.svg
new file mode 100644
index 0000000..e02d8ab
--- /dev/null
+++ b/configs/niri/nwg-bar/images/system-log-out.svg
@@ -0,0 +1,61 @@
+
+
diff --git a/configs/niri/nwg-bar/images/system-reboot.svg b/configs/niri/nwg-bar/images/system-reboot.svg
new file mode 100644
index 0000000..6701e8b
--- /dev/null
+++ b/configs/niri/nwg-bar/images/system-reboot.svg
@@ -0,0 +1,65 @@
+
+
diff --git a/configs/niri/nwg-bar/images/system-shutdown.svg b/configs/niri/nwg-bar/images/system-shutdown.svg
new file mode 100644
index 0000000..990d741
--- /dev/null
+++ b/configs/niri/nwg-bar/images/system-shutdown.svg
@@ -0,0 +1,64 @@
+
+
diff --git a/configs/niri/nwg-bar/images/system-suspend.svg b/configs/niri/nwg-bar/images/system-suspend.svg
new file mode 100644
index 0000000..8f33ce4
--- /dev/null
+++ b/configs/niri/nwg-bar/images/system-suspend.svg
@@ -0,0 +1,69 @@
+
+
diff --git a/configs/niri/nwg-bar/style.css b/configs/niri/nwg-bar/style.css
new file mode 100644
index 0000000..13a9800
--- /dev/null
+++ b/configs/niri/nwg-bar/style.css
@@ -0,0 +1,38 @@
+* {
+ color: white
+}
+
+window {
+ background-color: rgba (0, 0, 0, 1.0);
+}
+
+#outer-box {
+ margin: 0px
+}
+
+#inner-box {
+ background-color: rgba (0, 0, 0, 0.85);
+ border-radius: 10px;
+ border-style: none;
+ border-width: 1px;
+ border-color: rgba (156, 142, 122, 0.7);
+ padding: 5px;
+ margin: 5px
+}
+
+button,
+image {
+ background: none;
+ border: none;
+ box-shadow: none
+}
+
+button {
+ padding-left: 10px;
+ padding-right: 10px;
+ margin: 5px
+}
+
+button:hover {
+ background-color: rgba (255, 255, 255, 0.1)
+}
\ No newline at end of file
diff --git a/configs/waybar/config.jsonc b/configs/waybar/config.jsonc
index 5735946..edff217 100644
--- a/configs/waybar/config.jsonc
+++ b/configs/waybar/config.jsonc
@@ -12,11 +12,7 @@
"clock"
],
"modules-right": [
- "cpu",
- "memory",
- "temperature",
- "network",
- "keyboard-state",
+ "group/controls",
"battery",
"group/sound",
"group/backlight",
@@ -56,15 +52,18 @@
"custom/logout": {
"format": "â»",
"tooltip": true,
- "on-click": "niri msg action quit"
+ "on-click": "nwg-bar"
},
"keyboard-state": {
"numlock": true,
"capslock": true,
- "format": "{name} {icon}",
"format-icons": {
"locked": "ïŁ",
"unlocked": "ï"
+ },
+ "format": {
+ "numlock": "N {icon}",
+ "capslock": "C {icon}"
}
},
"niri/window": {
@@ -79,12 +78,33 @@
}
},
"tray": {
- // "icon-size": 21,
"spacing": 10
},
+ "custom/controls": {
+ "format": "đïž",
+ "tooltip": true
+ },
+ "group/controls": {
+ "click-to-reveal": true,
+ "orientation": "horizontal",
+ "drawer": {
+ "transition-duration": 500,
+ "transition-left-to-right": false
+ },
+ "modules": [
+ "custom/controls",
+ "network",
+ "cpu",
+ "memory",
+ "temperature",
+ "idle_inhibitor",
+ "keyboard-state"
+ ]
+ },
"clock": {
"tooltip-format": "{:%Y %B}\n{calendar}",
- "format": "{:%e %B %H:%M}"
+ "format": "{:%e %B %H:%M}",
+ "on-click": "gnome-calendar"
},
"cpu": {
"format": "{usage}% ï",
@@ -94,10 +114,7 @@
"format": "{}% ï"
},
"temperature": {
- // "thermal-zone": 2,
- // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
"critical-threshold": 80,
- // "format-critical": "{temperatureC}°C {icon}",
"format": "{temperatureC}°C {icon}",
"format-icons": [
"ï«",
@@ -106,8 +123,7 @@
]
},
"backlight": {
- // "device": "acpi_video1",
- "format": "{percent}% {icon}",
+ "format": "{icon}",
"format-icons": [
"î",
"î",
@@ -138,22 +154,13 @@
"ï"
]
},
- "battery#bat2": {
- "bat": "BAT2"
- },
"network": {
"format": "{ifname} {essid}",
"tooltip-format": "{ifname} {ipaddr}/{cidr} {essid} {icon} {frequency} {signaldBm}",
- // "format-wifi": "ï«",
- // "format-ethernet": "ïż",
- // "tooltip-format": "{ifname} via {gwaddr} ï",
- // "format-linked": "ï",
- // "format-disconnected": "â ",
- // "format-alt": "{ifname}: {ipaddr}/{cidr}",
"on-click": "nmcli device wifi rescan && ghostty -e nmtui"
},
"pulseaudio": {
- "format": "{volume}% {icon}",
+ "format": "{icon}",
"format-bluetooth": "{volume}% {icon}ï",
"format-bluetooth-muted": "ï© {icon}ï",
"format-muted": "ï©",
@@ -173,17 +180,5 @@
]
},
"on-click": "pavucontrol"
- },
- "custom/media": {
- "format": "{icon} {}",
- "return-type": "json",
- "max-length": 40,
- "format-icons": {
- "spotify": "ïŒ",
- "default": "đ"
- },
- "escape": true,
- "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
- // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name
}
}
\ No newline at end of file
diff --git a/configs/waybar/style.css b/configs/waybar/style.css
index d4b5c2c..ea5065d 100644
--- a/configs/waybar/style.css
+++ b/configs/waybar/style.css
@@ -1,32 +1,17 @@
* {
font-family: "Fira Code";
font-size: 14px;
- /* font-feature-settings: "tnum";*/
}
window#waybar {
- /*background: transparent;*/
background-color: rgba(30, 30, 46, 0.5);
- /* border-bottom: 2px solid rgba(147, 153, 178, 0.5); */
- /* border: 1px solid rgba(166, 173, 200, 1.0); */
color: #ffffff;
- /* transition-property: background-color; */
- /* transition-duration: .5s; */
}
window#waybar.hidden {
opacity: 0.2;
}
-/*
-window#waybar.empty {
- background-color: transparent;
-}
-window#waybar.solo {
- background-color: #FFFFFF;
-}
-*/
-
window#waybar.termite {
background-color: #3F3F3F;
}
@@ -37,9 +22,7 @@ window#waybar.chromium {
}
button {
- /* Use box-shadow instead of border so the text isn't offset */
box-shadow: none;
- /* Avoid rounded borders under each button name */
border: none;
border-radius: 0;
transition-property: none;
@@ -99,7 +82,6 @@ button:hover {
padding: 0px 10px;
margin-right: 1px;
color: #f0f0ff;
- background-color: rgba(30, 30, 46, 0.6);
border-radius: 5px;
}
@@ -108,45 +90,38 @@ button:hover {
margin: 0 4px;
}
-/* If workspaces is the leftmost module, omit left margin */
.modules-left>widget:first-child>#workspaces {
margin-left: 0;
}
-/* If workspaces is the rightmost module, omit right margin */
.modules-right>widget:last-child>#workspaces {
margin-right: 0;
}
#clock {
- /* background-color: #64727D; */
font-weight: bold;
- /* background-color: rgba(0, 0, 0, 0.3); */
- /* border-radius: 99px; */
}
#battery {
- /* background-color: #f9e2af; */
- /* color: #000000; */
margin-left: 4px;
}
#battery.charging,
#battery.plugged {
color: #ffffff;
- background-color: #26A65B;
+ background-color: rgba(38, 166, 91, 0.9);
}
@keyframes blink {
to {
- background-color: #ffffff;
+ background-color: rgba(255, 255, 255, 0.9);
color: #000000;
}
}
#battery.critical:not(.charging) {
- background-color: #f53c3c;
- color: #ffffff;
+ background-color: rgba(245, 60, 60, 0.9);
+ color: #fff;
animation-name: blink;
animation-duration: 0.5s;
animation-timing-function: linear;
@@ -155,15 +130,11 @@ button:hover {
}
label:focus {
- background-color: #000000;
-}
-
-#backlight {
- background-color: #90b1b1;
+ background-color: rgba(0, 0, 0, 0.9);
}
#network.disconnected {
- background-color: #f53c3c;
+ background-color: rgba(245, 60, 60, 0.9);
}
@@ -200,14 +171,9 @@ label:focus {
background-color: rgba(108, 112, 134, 0.6);
}
-#pulseaudio {
- background-color: #f1c40f;
- color: #000000;
-}
#pulseaudio.muted {
- background-color: #90b1b1;
- color: #2a5c45;
+ background-color: rgba(46, 32, 30, 0.9);
}
slider {
@@ -233,38 +199,21 @@ highlight {
}
#wireplumber {
- background-color: #fff0f5;
+ background-color: rgba(255, 240, 245, 0.8);
color: #000000;
}
#wireplumber.muted {
- background-color: #f53c3c;
+ background-color: rgba(245, 60, 60, 0.9);
}
-#custom-media {
- background-color: #66cc99;
- color: #2a5c45;
- min-width: 100px;
-}
-
-#custom-media.custom-spotify {
- background-color: #66cc99;
-}
-
-#custom-media.custom-vlc {
- background-color: #ffa000;
-}
-
-#temperature {
- background-color: #f0932b;
-}
#temperature.critical {
- background-color: #eb4d4b;
+ background-color: rgba(235, 77, 75, 0.8);
}
#tray {
- background-color: #2980b9;
+ background-color: rgba(41, 128, 185, 0.8);
}
#tray>.passive {
@@ -293,7 +242,7 @@ highlight {
}
#keyboard-state {
- background: #97e1ad;
+ background: rgba(151, 225, 173, 0.8);
color: #000000;
}
diff --git a/modules/nixos/desktop/tiler.nix b/modules/nixos/desktop/tiler.nix
index 98ed351..cd9f06b 100644
--- a/modules/nixos/desktop/tiler.nix
+++ b/modules/nixos/desktop/tiler.nix
@@ -30,6 +30,7 @@ in
rofi-wayland
networkmanagerapplet
blueman
+ nwg-bar
];
};
}