diff --git a/niri/.config/niri/config.kdl b/niri/.config/niri/config.kdl index 2199bd6..ce08fb1 100644 --- a/niri/.config/niri/config.kdl +++ b/niri/.config/niri/config.kdl @@ -40,7 +40,6 @@ environment { // GDK_BACKEND "x11" } -// output "Philips Consumer Electronics Company PHL 345B1C 0x00008E7C" { mode "3440x1440@60" scale 1 @@ -48,12 +47,12 @@ output "Philips Consumer Electronics Company PHL 345B1C 0x00008E7C" { position x=0 y=0 } -output "DP-4" { - mode "2560x1440" - scale 1 - position x=0 y=0 - off -} +//output "DP-4" { + //mode "2560x1440" + //scale 1 + //position x=0 y=0 + //off +//} output "eDP-1" { mode "1920x1080@60" @@ -61,7 +60,7 @@ output "eDP-1" { transform "normal" position x=0 y=1440 } -// + layout { gaps 16 diff --git a/waybar/.config/waybar/config.jsonc b/waybar/.config/waybar/config.jsonc index 8303691..2adb30f 100644 --- a/waybar/.config/waybar/config.jsonc +++ b/waybar/.config/waybar/config.jsonc @@ -7,6 +7,7 @@ "spacing": 4, // Gaps between modules (4px) // Choose the order of the modules "modules-left": [ + "niri/workspaces", "sway/workspaces", "sway/mode", "sway/scratchpad", @@ -20,6 +21,7 @@ "modules-right": [ "mpd", "idle_inhibitor", + "privacy", "pulseaudio", "network", "power-profiles-daemon", @@ -34,6 +36,41 @@ "tray", "custom/power" ], + "niri/workspaces": { + "format": "{icon}", + "format-icons": { + // Named workspaces + // (you need to configure them in niri) + "browser": "", + "discord": "", + "chat": "", + // Icons by state + "active": "", + "default": "" + } + }, + "privacy": { + "icon-spacing": 4, + "icon-size": 18, + "transition-duration": 250, + "modules": [ + { + "type": "screenshare", + "tooltip": true, + "tooltip-icon-size": 24 + }, + { + "type": "audio-out", + "tooltip": true, + "tooltip-icon-size": 24 + }, + { + "type": "audio-in", + "tooltip": true, + "tooltip-icon-size": 24 + } + ] + }, // Modules configuration // "sway/workspaces": { // "disable-scroll": true, @@ -66,7 +103,10 @@ "sway/scratchpad": { "format": "{icon} {count}", "show-empty": false, - "format-icons": ["", ""], + "format-icons": [ + "", + "" + ], "tooltip": true, "tooltip-format": "{app}: {title}" }, @@ -130,12 +170,30 @@ "critical-threshold": 80, // "format-critical": "{temperatureC}°C {icon}", "format": "{temperatureC}°C {icon}", - "format-icons": ["", "", ""] + "format-icons": [ + "", + "", + "" + ] }, "backlight": { - // "device": "acpi_video1", + "device": "intel_backlight", "format": "{percent}% {icon}", - "format-icons": ["", "", "", "", "", "", "", "", ""] + "format-icons": [ + "", + "", + "", + "", + "", + "", + "", + "", + "" + ], + "on-scroll-up": "brightnessctl s 5%+", + "on-scroll-down": "brightnessctl s 1%-", + "on-click-right": "brightnessctl s 1%", + "on-click": "brightnessctl s 50%" }, "battery": { "states": { @@ -150,21 +208,27 @@ "format-alt": "{time} {icon}", // "format-good": "", // An empty format will hide the module // "format-full": "", - "format-icons": ["", "", "", "", ""] + "format-icons": [ + "", + "", + "", + "", + "" + ] }, "battery#bat2": { "bat": "BAT2" }, "power-profiles-daemon": { - "format": "{icon}", - "tooltip-format": "Power profile: {profile}\nDriver: {driver}", - "tooltip": true, - "format-icons": { - "default": "", - "performance": "", - "balanced": "", - "power-saver": "" - } + "format": "{icon}", + "tooltip-format": "Power profile: {profile}\nDriver: {driver}", + "tooltip": true, + "format-icons": { + "default": "", + "performance": "", + "balanced": "", + "power-saver": "" + } }, "network": { // "interface": "wlp2*", // (Optional) To force the use of this interface @@ -190,7 +254,11 @@ "phone": "", "portable": "", "car": "", - "default": ["", "", ""] + "default": [ + "", + "", + "" + ] }, "on-click": "pavucontrol" }, @@ -207,15 +275,15 @@ // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name }, "custom/power": { - "format" : "⏻ ", - "tooltip": false, - "menu": "on-click", - "menu-file": "$HOME/.config/waybar/power_menu.xml", // Menu file in resources folder - "menu-actions": { - "shutdown": "shutdown", - "reboot": "reboot", - "suspend": "systemctl suspend", - "hibernate": "systemctl hibernate" - } + "format": "⏻ ", + "tooltip": false, + "menu": "on-click", + "menu-file": "$HOME/.config/waybar/power_menu.xml", // Menu file in resources folder + "menu-actions": { + "shutdown": "shutdown", + "reboot": "reboot", + "suspend": "systemctl suspend", + "hibernate": "systemctl hibernate" + } } }