Merge branch 'master' into cas

2 files changed, 15 insertions, 163 deletions

diff --git a/waybar/config b/waybar/config
index a97ad9a..6d3b107 100644
--- a/waybar/config
+++ b/waybar/config
@@ -15,6 +15,11 @@
 
     // Modules configuration
 
+    "niri/workspaces": {
+      "format": "{value}",
+      "all-outputs": false,
+      "on-click": "activate"
+    },
     "hyprland/workspaces": {
       "format": "{icon}",
       "active-only": false,
@@ -46,9 +51,17 @@
       "on-scroll-down": "hyprctl dispatch split-workspace e-1",
       "on-click": "activate"
     },
+    "niri/window": {
+      "separate-outputs": true,
+      "icon": true,
+      "format": "{title}",
+      "expand": true
+    },
     "hyprland/window": {
       "separate-outputs": true,
-      "format": "{}"
+      "icon": true,
+      "format": "{title}",
+      "espand": true,
     },
     "keyboard-state": {
         "numlock": true,
@@ -145,7 +158,7 @@
         "scroll-step": 0.1
     },
     "custom/launcher":{
-        "format": ">",
+        "format": ">_",
         "on-click": "rofi -show drun",
         //"on-click-right": "killall rofi"
     },
diff --git a/waybar/config-niri b/waybar/config-niri
deleted file mode 100644
index 9b36e8e..0000000
--- a/waybar/config-niri
+++ /dev/null
@@ -1,161 +0,0 @@
-{
-    "layer": "bottom",
-    "position": "top",
-    "height": 36,
-    //"output": "%%DISPLAY%%",
-    "spacing": 4,
-    //"margin-top": 5,
-    //"margin-bottom":5,
-
-    // Choose the order of the modules
-
-    "modules-left":[ "niri/workspaces", "custom/launcher", "niri/window"],
-    "modules-center":[],
-    "modules-right":[ "tray", "mpd", "idle_inhibitor", "wireplumber", "cpu", "memory", "battery", "temperature#cpu", "temperature#gpu", "backlight",  "network", "clock", "custom/power"],
-
-    // Modules configuration
-
-    "hyprland/workspaces": {
-      "format": "{icon}",
-      "active-only": false,
-      "all-outputs": false,
-      "format-icons": {
-        "1": "1",
-        "2": "2",
-        "3": "3",
-        "4": "4",
-        "5": "5",
-        "6": "6",
-        "7": "7",
-        "8": "8",
-        "9": "9",
-        "10": "1",
-        "11": "2",
-        "12": "3",
-        "13": "4",
-        "14": "5",
-        "15": "6",
-        "16": "7",
-        "17": "8",
-        "18": "9",
-      },
-      "persistent-workspaces": {
-        "eDP-1": [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ],
-      },
-      "on-scroll-up": "hyprctl dispatch split-workspace e+1",
-      "on-scroll-down": "hyprctl dispatch split-workspace e-1",
-      "on-click": "activate"
-    },
-    "hyprland/window": {
-      "separate-outputs": true,
-      "format": "{}"
-    },
-    "keyboard-state": {
-        "numlock": true,
-        "capslock": true,
-        "format": " {name} {icon}",
-        "format-icons": {
-            "locked": "",
-            "unlocked": ""
-        }
-    },
-    "mpd": {
-      "format": "{title}",
-      "format-stopped": "",
-      "format-paused": "{title}",
-      "format-disconnected": "",
-      "artist-len": 15,
-      "title-len": 15,
-      //"album-len": 15,
-      //"max-length": 200,
-      "on-click": "mpc toggle"
-    },
-    "idle_inhibitor": {
-        "format": "{icon}",
-        "format-icons": {
-            "activated": "",
-            "deactivated": ""
-        }
-    },
-    "tray": {
-        "icon-size": 20,
-        "spacing": 10
-    },
-    "clock": {
-        // "timezone": "America/New_York",
-        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
-        "format-alt": "{:%Y-%m-%d}"
-    },
-    "cpu": {
-        "format": "{usage}% ",
-        "tooltip": false
-    },
-    "memory": {
-        "format": "{}% "
-    },
-    "battery": {
-        //"bat": "BAT0",
-        "weighted-average": "true",
-        "interval": 60,
-        "state": {
-            "warning": 30,
-            "critical": 15
-        },
-        "format": "{capacity}%",
-        "max-length": 25
-    },
-    "temperature#cpu": {
-        "thermal-zone": 0,
-        // "hwmon-path": "cat /sys/class/hwmon/hwmon5/temp1_input",
-        "critical-threshold": 110,
-        "format-critical": "{temperatureC}°C",
-        "format": "",
-        "format-icons": ["", "", ""]
-    },
-    "temperature#gpu": {
-        "thermal-zone": 1,
-        // "hwmon-path": "/sys/class/hwmon/hwmon4/temp1_input",
-        "critical-threshold": 126,
-        "format-critical": "{temperatureC}°C",
-        "format": "",
-        "format-icons": ["", "", ""]
-    },
-    "backlight": {
-        // "device": "acpi_video1",
-        "format": "{percent}%"
-        //"format-icons": ["", ""]
-    },
-    "network": {
-        // "interface": "wlp2*", // (Optional) To force the use of this interface
-        "format-wifi": "{essid} ",
-        "format-ethernet": "Connected  ",
-        "tooltip-format": "{ifname} via {gwaddr} ",
-        "format-linked": "{ifname} (No IP) ",
-        "format-disconnected": "Disconnected ⚠",
-        "format-alt": "{ifname}: {ipaddr}/{cidr}",
-        "max-length": 22,
-        "on-click-right": "bash ~/.config/rofi/wifi_menu/rofi_wifi_menu"
-    },
-    "wireplumber": {
-        // "scroll-step": 1, // %, can be a float
-        "format": "{volume}% {icon}",
-        "format-muted": "{volume}% ",
-        "format-icons": ["", "", ""],
-        "on-click": "volsv -t",
-        "scroll-step": 0.1
-    },
-    "custom/launcher":{
-        "format": ">",
-        "on-click": "rofi -show drun",
-        //"on-click-right": "killall rofi"
-    },
-    "custom/power":{
-        "format": "",
-        "on-click": "rofi -show p -modi p:rofi-power-menu",
-        //"on-click-right": "killall rofi"
-    },
-    "custom/snip":{
-        "format": " ",
-        "on-click": "grimshot --notify save area $HOME/Pictures/$(zenity --entry --text 'Set filename:' --entry-text '.png')"
-    }
-}