Merge pull request #6 from JaKooLit/dev-2

From Dev-2
2 years ago · 8b12e1e270
6 changed files with 517 additions and 536 deletions
--- a/config/waybar/config
+++ b/config/waybar/config
@ -1 +1 @@
-For symlinks later
+for symlink
--- a/config/waybar/configs/config-dual-TL
+++ b/config/waybar/configs/config-dual-TL
@ -4,6 +4,7 @@
 "include": "~/.config/waybar/modules",
 "layer": "top",
 //"mode": "dock",
+"width": 1200,
 "exclusive": true,
 "passthrough": false,
 "position": "top",
@ -15,21 +16,23 @@
 "margin-right": 8,
    
 "modules-left": [
-    "custom/menu",
-    "cpu", 
    "temperature",
+    "cpu", 
    "memory",
    "disk",
    ],
    
 "modules-center": [
-    "hyprland/window", 
-    "custom/weather",
-]   , 
+    //"hyprland/window",
+    "custom/lock",
+    "custom/menu",
+    "idle_inhibitor",
+	],
    
 "modules-right": [
-    "network",
-    "bluetooth",
+    //"network",
+    //"bluetooth",
+	"custom/weather",
    "battery", 
    "backlight",
    "pulseaudio",
@ -44,6 +47,7 @@
 "include": "~/.config/waybar/modules",
 "layer": "top",
 "position": "left",
+"height": 650,
 "margin-top": 8,
 "margin-bottom": 8,
 "margin-left": 8,
@ -54,18 +58,16 @@
 //"gtk-layer-shell": true,
   
 "modules-left": [
-    "idle_inhibitor",     
+	"hyprland/workspaces#2",     
    ],
    
 "modules-center": [
-    "hyprland/workspaces#2",
+    "clock#vertical",
    ],
    
 "modules-right": [
    "tray",
-    "clock#vertical",
    "custom/light_dark",
-    "custom/lock",
    ],
    
 }]
--- a/config/waybar/configs/config-dual-TR
+++ b/config/waybar/configs/config-dual-TR
@ -1,35 +1,38 @@
-// ### TOP and RIGHT PANEL ## //
+// ### TOP and LEFT PANEL ## //

 [{
 "include": "~/.config/waybar/modules",
 "layer": "top",
 //"mode": "dock",
+"width": 1200,
 "exclusive": true,
 "passthrough": false,
 "position": "top",
 "spacing": 3,
 "fixed-center": true,
 "ipc": true,
-"padding": 2,
 "margin-top": 6,
 "margin-left": 8,
 "margin-right": 8,
    
 "modules-left": [
-	"cpu", 
    "temperature",
+    "cpu", 
    "memory",
+    "disk",
    ],
    
 "modules-center": [
-	"hyprland/window", 
-	"custom/weather",
+    //"hyprland/window",
+    "custom/lock",
+    "custom/menu",
+    "idle_inhibitor",
 	],
    
 "modules-right": [
-	"network",
-	"bluetooth",
-	//"cava", 
+    //"network",
+    //"bluetooth",
+	"custom/weather",
    "battery", 
    "backlight",
    "pulseaudio",
@ -44,29 +47,27 @@
 "include": "~/.config/waybar/modules",
 "layer": "top",
 "position": "right",
+"height": 650,
 "margin-top": 8,
 "margin-bottom": 8,
-"margin-left": 1,
-"margin-right": 8,
+"margin-left": 8,
+"margin-right": 3,
 "spacing": 3,
 "fixed-center": true,
 "ipc": true,
-"gtk-layer-shell": true,
+//"gtk-layer-shell": true,
   
 "modules-left": [
-	"custom/menu",
-	"custom/light_dark",
+	"hyprland/workspaces#2",     
    ],
    
 "modules-center": [
-	"hyprland/workspaces#2",
+    "clock#vertical",
    ],
    
 "modules-right": [
-	"idle_inhibitor",
-	"custom/lock",
    "tray",
-	"clock#vertical",
+    "custom/light_dark",
    ],
    
 }]
--- a/config/waybar/modules
+++ b/config/waybar/modules
@ -1,5 +1,5 @@
 {
-  "backlight": {
+"backlight": {
  "interval": 2,
  "align": 0,
  "rotate": 0,
@ -16,9 +16,9 @@
  "on-scroll-up": "~/.config/hypr/scripts/Brightness.sh --inc",
  "on-scroll-down": "~/.config/hypr/scripts/Brightness.sh --dec",
  "smooth-scrolling-threshold": 1,
-  },
+},
    
-  "battery": {
+"battery": {
  "interval": 60,
  "align": 0,
  "rotate": 0,
@ -42,9 +42,9 @@
  "tooltip-format": "{timeTo} {power}w",
  "on-click-middle": "~/.config/hypr/scripts/ChangeBlur.sh",
  "on-click-right": "$HOME/.config/hypr/scripts/WofiPower.sh",
-  },
+},
    
-  "bluetooth": {
+"bluetooth": {
  "format": "",
  "format-disabled": "", // an empty format will hide the module
  "format-connected": " {num_connections}",
@ -52,9 +52,9 @@
  "tooltip-format-connected": "{device_enumerate}",
  "tooltip-format-enumerate-connected": " {device_alias} 󰂄{device_battery_percentage}%",
   "tooltip": true
-  },
+},

-  "cava": {
+"cava": {
  //"cava_config": "$XDG_CONFIG_HOME/cava/cava.conf",
  "framerate": 30,
  "autosens": 1,
@ -75,9 +75,9 @@
  "actions": {
      "on-click-right": "mode"
             }
-  },
+},
 
-  "clock": {
+"clock": {
 	"interval": 1,
  //"format": " {:%I:%M %p}",
  "format": " {:%H:%M:%S}",
@ -103,18 +103,18 @@
    "on-click-backward": "tz_down",
    "on-scroll-up": "shift_up",
    "on-scroll-down": "shift_down"
-  },
+},
 
-  "cpu": {
+"cpu": {
  "format": "{usage}% 󰍛",  
  "interval": 1,
  "format-alt-click": "click",
  "format-alt": "{icon0}{icon1}{icon2}{icon3} {usage:>2}% 󰍛",
  "format-icons": ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"],
  "on-click-right": "gnome-system-monitor",
-  },
+},
  
-  "disk": {
+"disk": {
  "interval": 30,
  //"format": "󰋊",
  "path": "/",
@ -122,28 +122,28 @@
  "format": "{percentage_used}% 󰋊",
  //"tooltip": true,
  "tooltip-format": "{used} used out of {total} on {path} ({percentage_used}%)",
-  },
+},
  
-  "hyprland/language": {
+"hyprland/language": {
  "format": "Lang: {}",
  "format-en": "US",
  "format-tr": "Korea",
  "keyboard-name": "at-translated-set-2-keyboard",
  "on-click": "hyprctl switchxkblayout $SET_KB next"
-  },
+},
  
-  "hyprland/submap": {
+"hyprland/submap": {
  "format": "<span style=\"italic\">  {}</span>", // Icon: expand-arrows-alt
  "tooltip": false,
-  },
+},
  
-  "hyprland/window": {
+"hyprland/window": {
  "format": "{}",
  "max-length": 360,
  "separate-outputs": true,
-  },
+},
   
-  "hyprland/workspaces": {
+"hyprland/workspaces": {
  "format": "{name}",
  //"format": " {name}:{icon} ",
  //"format": " {icon} ",
@ -167,9 +167,9 @@
  },
  "on-scroll-up": "hyprctl dispatch workspace e+1",
  "on-scroll-down": "hyprctl dispatch workspace e-1",
-  },
+},

-  "hyprland/workspaces#2": {
+"hyprland/workspaces#2": {
    "format": "{icon}",
    "on-click": "activate",
 	"on-scroll-up": "hyprctl dispatch workspace e+1",
@ -180,17 +180,17 @@
  },
    "active-only": false,
    "all-outputs": true   
-  },
+},

-  "idle_inhibitor": {
+"idle_inhibitor": {
  "format": "{icon}",
  "format-icons": {
    "activated": " ",
    "deactivated": " ",
                  }
-  },
+},
  
-  "keyboard-state": {
+"keyboard-state": {
  //"numlock": true,
  "capslock": true,
  "format": {
@ -201,9 +201,9 @@
    "locked": "",
    "unlocked": ""
    }
-  },
+},
  
-  "memory": {
+"memory": {
  "interval": 10,
  "format": "{used:0.1f}G 󰾆",
  "format-alt": "{percentage}% 󰾆",
@ -211,9 +211,9 @@
  "tooltip": true,
  "tooltip-format": "{used:0.1f}GB/{total:0.1f}G",
  "on-click-right": "foot --title btop sh -c 'btop'"
-  },
+},
    
-  "network": {
+"network": {
  "format": "{ifname}",
  "format-wifi": "{icon}",
  "format-ethernet": "󰌘",
@ -225,9 +225,9 @@
  "tooltip-format-disconnected": "󰌙 Disconnected",
  "max-length": 50,
  "format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"]
-  },
+},
    
-  "pulseaudio": {
+"pulseaudio": {
  "format": "{icon}",
  "format-bluetooth": "{icon}  {volume} %",
  "format-muted": "󰖁",
@ -247,9 +247,9 @@
  "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc",
  "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec",
  "smooth-scrolling-threshold": 1,
-  },
+},
    
-  "pulseaudio#microphone": {
+"pulseaudio#microphone": {
  "format": "{format_source}",
  "format-source": " {volume}%",
  "format-source-muted": "",
@ -258,26 +258,26 @@
  "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --mic-inc",
  "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --mic-dec",
  "scroll-step": 5,
-  },
+},
  
-  "temperature": {
+"temperature": {
  "interval": 10,
  "tooltip": false,
-    "hwmon-path": "/sys/class/hwmon/hwmon1/temp1_input",
-    //"thermal-zone": 1,
+  //"hwmon-path": "/sys/class/hwmon/hwmon1/temp1_input",
+  "thermal-zone": 0,
  "critical-threshold": 82,
  "format-critical": "{temperatureC}°C {icon}",
  "format": "{temperatureC}°C {icon}",
  "format-icons": [""],
  "on-click-right": "foot --title nvtop sh -c 'nvtop'"
-  },
+},
    
-  "tray": {
+"tray": {
  "icon-size": 17,
  "spacing": 8,
-  },
+},
    
-  "wireplumber": {
+"wireplumber": {
  "format": "{icon} {volume} %",
  "format-muted": " Mute",
  "on-click": "~/.config/hypr/scripts/Volume.sh --toggle",
@ -285,9 +285,9 @@
  "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc",
  "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec",
  "format-icons": ["", "", "󰕾", ""], 
-  },
+},
    
-  "wlr/taskbar": {
+"wlr/taskbar": {
  "format": "{icon} {name} ",
  "icon-size": 16,
  "all-outputs": false,
@ -297,44 +297,44 @@
  "ignore-list": [
        "wofi"  
                 ]
-  },
+},
    
-  "custom/cycle_wall":{
+"custom/cycle_wall":{
  "format":" ",
  "on-click": "~/.config/hypr/scripts/WallpaperSelect.sh",
  "on-click-right": "~/.config/hypr/scripts/Wallpaper.sh swww",
  "on-click-middle": "~/.config/hypr/scripts/WaybarStyles.sh",
  "tooltip": true,
  "tooltip-format": "Change wallpaper or style"
-  },
+},
    
-  "custom/keybindings": {
+"custom/keybindings": {
  "format":"",
  "tooltip": false,
  "on-click": "~/.config/hypr/scripts/Help.sh",
-  },
+},
  
-  "custom/light_dark": {
+"custom/light_dark": {
  "format": "",
  "on-click": "~/.config/hypr/scripts/DarkLight.sh",
  "tooltip": false,
-  },
+},
    
-  "custom/lock": {
+"custom/lock": {
  "format": "",
  "on-click": "~/.config/hypr/scripts/LockScreen.sh",
  "tooltip": false,
-  },
+},
  
-  "custom/menu": {
+"custom/menu": {
  "format": "",
  "tooltip": false,
  "on-click": "$HOME/.config/hypr/scripts/Wofi.sh",
  "on-click-right": "$HOME/.config/hypr/scripts/ChangeLayoutMenu.sh",
  "on-click-middle": "~/.config/hypr/scripts/Wallpaper.sh swaybg",
-  },
+},

-  "custom/playerctl": {
+"custom/playerctl": {
  "format": "<span>{}</span>",
  "return-type": "json",
  "max-length": 35,
@ -342,26 +342,26 @@
  "on-click-middle": "playerctl play-pause",
  "on-click": "playerctl previous",
  "on-click-right": "playerctl next"
-  },
+},
    
-  "custom/power": {
+"custom/power": {
  "format": "⏻ ",
  "tooltip": false,
  //"on-click": "sh -c '(sleep 0.5s; wlogout --protocol layer-shell)' & disown",
  "on-click": "$HOME/.config/hypr/scripts/WofiPower.sh",
  "on-click-right": "~/.config/hypr/scripts/ChangeBlur.sh",
-  },
+},
  
-  "custom/updater":{
+"custom/updater":{
  "format": " {}",
  "exec": "checkupdates | wc -l",
  "exec-if": "[[ $(checkupdates | wc -l) ]]",
  "interval": 15,
  "on-click": "foot -T update paru -Syu || yay -Syu && notify-send 'The system has been updated'",
  "on-click-right": "~/.config/hypr/scripts/WallpaperSwitch.sh",
-  },
+},
  
-  "custom/weather": {
+"custom/weather": {
  "format": "{}",
  "format-alt": "{alt}: {}",
  "format-alt-click": "click",
@ -371,31 +371,31 @@
  //"exec": "~/.config/hypr/scripts/Weather.py",
  "exec-if": "ping wttr.in -c1",
  "tooltip" : true,
-  },
+},


-  // Separators
-  "custom/separator#dot": {
+// Separators
+"custom/separator#dot": {
  "format": "",
  "interval": "once",
  "tooltip": false
-  },
+},

-  "custom/separator#dot-line": {
+"custom/separator#dot-line": {
  "format": "",
  "interval": "once",
  "tooltip": false
-  },
+},

-  "custom/separator#line": {
+"custom/separator#line": {
  "format": "|",
  "interval": "once",
  "tooltip": false
-  },
+},

-  // Modules below are for vertical layout
+// Modules below are for vertical layout

-  "backlight#vertical": {
+"backlight#vertical": {
  "interval": 2,
  "align": 0,
  "rotate": 0,
@ -412,9 +412,9 @@
  "on-scroll-up": "~/.config/hypr/scripts/Brightness.sh --inc",
  "on-scroll-down": "~/.config/hypr/scripts/Brightness.sh --dec",
  "smooth-scrolling-threshold": 1,
-  },
+},

-  "clock#vertical": {
+"clock#vertical": {
   "format": "{:\n%H\n%M\n%S\n\n \n%d\n%m\n%y}",
   "interval": 1,
   //"format": "{:\n%I\n%M\n%p\n\n \n%d\n%m\n%y}",
@ -427,14 +427,14 @@
     "today": "<span color='#0dbc79'>{}</span>",
     }
   }
-  },
-  "cpu#vertical": {
+},
+"cpu#vertical": {
  "format": "󰍛\n{usage}%",  
  "interval": 1,
  "on-click-right": "gnome-system-monitor",
-  },
+},

-  "memory#vertical": {
+"memory#vertical": {
  "interval": 10,
  "format": "󰾆\n{percentage}%",
  "format-alt": "󰾆\n{used:0.1f}G",
@ -442,31 +442,9 @@
  "tooltip": true,
  "tooltip-format": "{used:0.1f}GB/{total:0.1f}G",
  "on-click-right": "foot --title btop sh -c 'btop'",
-  },
-  
-  "pulseaudio#vertical": {
-    "format": "{icon}",
-    "format-bluetooth": "{icon} ",
-    "format-muted": "󰖁",
-    "format-icons": {
-        "headphone": "",
-        "hands-free": "",
-        "headset": "",
-        "phone": "",
-        "portable": "",
-        "car": "",
-    "default": ["", "", "󰕾", ""], 
-    "ignored-sinks": ["Easy Effects Sink"],
-    },
-    "scroll-step": 5.0,
-    "on-click": "~/.config/hypr/scripts/Volume.sh --toggle",
-    "on-click-right": "pavucontrol -t 3",
-    "on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc",
-    "on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec",
-    "smooth-scrolling-threshold": 1,
-  },
+},

-  "pulseaudio#microphone_vertical": {
+"pulseaudio#microphone_vertical": {
  "format": "{format_source}",
  "format-source": "󰍬",
  "format-source-muted": "󰍭",
@ -477,26 +455,25 @@
  "max-volume": 100,
  "tooltip": true,
  "tooltip-format": "{icon} {desc} {volume}%",
-  },
+},

-  "temperature#vertical": {
+"temperature#vertical": {
  "interval": 10,
  "tooltip": true,
-    //"hwmon-path": "/sys/class/hwmon/hwmon1/temp1_input",
-    "thermal-zone": 0,
+  "hwmon-path": "/sys/class/hwmon/hwmon1/temp1_input",
+  //"thermal-zone": 0,
  "critical-threshold": 80,
  "format-critical": "{icon}\n{temperatureC}°C",
  "format": " {icon}",
  "format-icons": [""],
  "on-click-right": "foot --title nvtop sh -c 'nvtop'"
-  },
+},

-  "custom/power_vertical": {
+"custom/power_vertical": {
  "format": "⏻",
  "tooltip": false,
  "on-click": "$HOME/.config/hypr/scripts/WofiPower.sh",
  "on-click-right": "~/.config/hypr/scripts/ChangeBlur.sh",
-  },
-  }
-  
+},
+}

--- a/config/waybar/style.css
+++ b/config/waybar/style.css
@ -1 +1 @@
-For symlinks later
+for symlink
--- a/config/waybar/style/style-default_alter.css
+++ b/config/waybar/style/style-default_alter.css
@ -295,6 +295,7 @@ label:focus {
 }

 #idle_inhibitor {
+	color: #f9e2af;
    /*background-color: #2d3436;*/
 }