From abdd48518bcc25cb988364fde3fa2d0fe1b4bef1 Mon Sep 17 00:00:00 2001 From: installer Date: Tue, 11 Feb 2025 11:41:34 +0900 Subject: updated waybar naming schemes on defaults. Seeing Chris Titus video thinks that it is the latest default. From now on, the latest Waybar default will be default and the old defaults will be renamed accordingly. V5, v6 etc etc --- config/waybar/configs/[BOT] Default | 121 +++++++++----------- config/waybar/configs/[BOT] Default Laptop | 126 +++++++++------------ config/waybar/configs/[TOP] Default | 49 +++----- config/waybar/configs/[TOP] Default (old v1) | 71 ++++++++++++ config/waybar/configs/[TOP] Default (old v2) | 57 ++++++++++ config/waybar/configs/[TOP] Default (old v3) | 60 ++++++++++ config/waybar/configs/[TOP] Default (old v4) | 53 +++++++++ config/waybar/configs/[TOP] Default Laptop | 55 ++++----- .../waybar/configs/[TOP] Default Laptop (old v1) | 75 ++++++++++++ .../waybar/configs/[TOP] Default Laptop (old v2) | 60 ++++++++++ .../waybar/configs/[TOP] Default Laptop (old v3) | 60 ++++++++++ .../waybar/configs/[TOP] Default Laptop (old v4) | 55 +++++++++ config/waybar/configs/[TOP] Default Laptop_v2 | 60 ---------- config/waybar/configs/[TOP] Default Laptop_v3 | 60 ---------- config/waybar/configs/[TOP] Default Laptop_v4 | 55 --------- config/waybar/configs/[TOP] Default Laptop_v5 | 58 ---------- config/waybar/configs/[TOP] Default_v2 | 57 ---------- config/waybar/configs/[TOP] Default_v3 | 60 ---------- config/waybar/configs/[TOP] Default_v4 | 53 --------- config/waybar/configs/[TOP] Default_v5 | 56 --------- copy.sh | 38 +++---- 21 files changed, 652 insertions(+), 687 deletions(-) create mode 100644 config/waybar/configs/[TOP] Default (old v1) create mode 100644 config/waybar/configs/[TOP] Default (old v2) create mode 100644 config/waybar/configs/[TOP] Default (old v3) create mode 100644 config/waybar/configs/[TOP] Default (old v4) create mode 100644 config/waybar/configs/[TOP] Default Laptop (old v1) create mode 100644 config/waybar/configs/[TOP] Default Laptop (old v2) create mode 100644 config/waybar/configs/[TOP] Default Laptop (old v3) create mode 100644 config/waybar/configs/[TOP] Default Laptop (old v4) delete mode 100644 config/waybar/configs/[TOP] Default Laptop_v2 delete mode 100644 config/waybar/configs/[TOP] Default Laptop_v3 delete mode 100644 config/waybar/configs/[TOP] Default Laptop_v4 delete mode 100644 config/waybar/configs/[TOP] Default Laptop_v5 delete mode 100644 config/waybar/configs/[TOP] Default_v2 delete mode 100644 config/waybar/configs/[TOP] Default_v3 delete mode 100644 config/waybar/configs/[TOP] Default_v4 delete mode 100644 config/waybar/configs/[TOP] Default_v5 diff --git a/config/waybar/configs/[BOT] Default b/config/waybar/configs/[BOT] Default index fc87a9e4..39490f85 100644 --- a/config/waybar/configs/[BOT] Default +++ b/config/waybar/configs/[BOT] Default @@ -1,71 +1,56 @@ /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ -// ### DEFAULT Bottom ### // +// ### DEFAULT - Bottom ### // { -"include": [ - "$HOME/.config/waybar/Modules", - "$HOME/.config/waybar/ModulesWorkspaces", - "$HOME/.config/waybar/ModulesCustom", - "$HOME/.config/waybar/ModulesGroups", - ], -"layer": "top", -//"mode": "dock", -"exclusive": true, -"passthrough": false, -"position": "bottom", -"spacing": 3, -"fixed-center": true, -"ipc": true, -//"margin-top": 6, -"margin-left": 8, -"margin-right": 8, - -"modules-left": [ - "hyprland/workspaces#pacman", - "custom/separator#dot-line", - "cpu", - "custom/separator#dot-line", - "temperature", - "custom/separator#dot-line", - "memory", - "custom/separator#dot-line", - "custom/weather", - "custom/separator#blank_3", - "custom/cava_mviz", - ], - -"modules-center": [ - "custom/menu", - "custom/separator#dot-line", - "idle_inhibitor", - "custom/separator#dot-line", - "clock", - "custom/separator#dot-line", - "custom/light_dark", - "custom/separator#dot-line", - "custom/lock", - //], - "custom/separator#dot-line", - "custom/hint", - ], - -"modules-right": [ - "network#speed", - "custom/separator#dot-line", - "custom/swaync", - "tray", - "mpris", - "custom/separator#dot-line", - "bluetooth", - "custom/separator#dot-line", - "pulseaudio", - "custom/separator#dot-line", - "pulseaudio#microphone", - "custom/separator#dot-line", - "keyboard-state", - "custom/separator#dot-line", - "custom/keyboard", - "custom/separator#dot-line", - "custom/power", - ], -} + "include": [ + "$HOME/.config/waybar/Modules", + "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", + ], + "layer": "top", + //"mode": "dock", + "exclusive": true, + "passthrough": false, + "position": "bottom", + "spacing": 3, + "fixed-center": true, + "ipc": true, + "margin-top": 3, + "margin-left": 8, + "margin-right": 8, + + "modules-left": [ + "custom/separator#blank", + "custom/cava_mviz", + "custom/separator#blank", + "custom/playerctl", + "custom/separator#blank_2", + "hyprland/window", + ], + + "modules-center": [ + "group/app_drawer", + "custom/separator#blank", + "custom/swaync", + "custom/separator#dot-line", + "hyprland/workspaces#rw", + "clock", + "custom/separator#dot-line", + "custom/weather", + "custom/separator#dot-line", + "idle_inhibitor", + "custom/hint", + ], + + "modules-right": [ + "tray", + "network#speed", + "custom/separator#dot-line", + "group/mobo_drawer", + "custom/separator#line", + "group/audio", + "custom/separator#dot-line", + "group/status", + ], + } \ No newline at end of file diff --git a/config/waybar/configs/[BOT] Default Laptop b/config/waybar/configs/[BOT] Default Laptop index 067dfbc4..ea95e6c6 100644 --- a/config/waybar/configs/[BOT] Default Laptop +++ b/config/waybar/configs/[BOT] Default Laptop @@ -1,74 +1,58 @@ /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ -// ### DEFAULT Bottom - Laptop### // +// ### DEFAULT Laptop - Bottom ### // { -"include": [ - "$HOME/.config/waybar/Modules", - "$HOME/.config/waybar/ModulesWorkspaces", - "$HOME/.config/waybar/ModulesCustom", - "$HOME/.config/waybar/ModulesGroups", - ], -"layer": "top", -//"mode": "dock", -"exclusive": true, -"passthrough": false, -"position": "bottom", -"spacing": 3, -"fixed-center": true, -"ipc": true, -//"margin-top": 6, -"margin-left": 8, -"margin-right": 8, - -"modules-left": [ - "hyprland/workspaces#pacman", - "custom/separator#dot-line", - "cpu", - "custom/separator#dot-line", - "temperature", - "custom/separator#dot-line", - "memory", - "custom/separator#dot-line", - "custom/weather", - "custom/separator#blank_3", - "custom/cava_mviz", - ], - -"modules-center": [ - "custom/menu", - "custom/separator#dot-line", - "idle_inhibitor", - "custom/separator#dot-line", - "clock", - "custom/separator#dot-line", - "custom/light_dark", - "custom/separator#dot-line", - "custom/lock", - //], - "custom/separator#dot-line", - "custom/keybinds", - ], - -"modules-right": [ - "network#speed", - "custom/separator#dot-line", - "tray", - "mpris", - "custom/separator#dot-line", - "bluetooth", - "custom/separator#dot-line", - "battery", - "custom/separator#dot-line", - "backlight", - "custom/separator#dot-line", - "pulseaudio", - "custom/separator#dot-line", - "pulseaudio#microphone", - "custom/separator#dot-line", - "keyboard-state", - "custom/separator#dot-line", - "custom/keyboard", - "custom/separator#dot-line", - "custom/power", - ], -} + "include": [ + "$HOME/.config/waybar/Modules", + "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", + ], + "layer": "top", + //"mode": "dock", + "exclusive": true, + "passthrough": false, + "position": "bottom", + "spacing": 3, + "fixed-center": true, + "ipc": true, + "margin-top": 3, + "margin-left": 8, + "margin-right": 8, + + "modules-left": [ + "custom/separator#blank", + "custom/cava_mviz", + "custom/separator#blank", + "custom/playerctl", + "custom/separator#blank_2", + "hyprland/window", + ], + + "modules-center": [ + "group/app_drawer", + "custom/separator#blank", + "custom/swaync", + "custom/separator#dot-line", + "hyprland/workspaces#rw", + "clock", + "custom/separator#dot-line", + "custom/weather", + "custom/separator#dot-line", + "idle_inhibitor", + "custom/hint", + ], + + "modules-right": [ + "tray", + "network#speed", + "custom/separator#dot-line", + "group/laptop", + "custom/separator#dot-line", + "group/mobo_drawer", + "custom/separator#line", + "group/audio", + "custom/separator#dot-line", + "group/status", + ], + } \ No newline at end of file diff --git a/config/waybar/configs/[TOP] Default b/config/waybar/configs/[TOP] Default index 3a95929b..9d7c68a8 100644 --- a/config/waybar/configs/[TOP] Default +++ b/config/waybar/configs/[TOP] Default @@ -21,51 +21,36 @@ "margin-right": 8, "modules-left": [ - "hyprland/workspaces#pacman", - "custom/separator#dot-line", - "cpu", - "custom/separator#dot-line", - "temperature", - "custom/separator#dot-line", - "memory", - "custom/separator#dot-line", - "custom/weather", - "custom/separator#blank_3", + "custom/separator#blank", "custom/cava_mviz", + "custom/separator#blank", + "custom/playerctl", + "custom/separator#blank_2", + "hyprland/window", ], "modules-center": [ - "custom/menu", - "custom/separator#dot-line", - "idle_inhibitor", + "group/app_drawer", + "custom/separator#blank", + "custom/swaync", "custom/separator#dot-line", + "hyprland/workspaces#rw", "clock", "custom/separator#dot-line", - "custom/light_dark", - "custom/separator#dot-line", - "custom/lock", - //], + "custom/weather", "custom/separator#dot-line", + "idle_inhibitor", "custom/hint", - ], + ], "modules-right": [ - "network#speed", - "custom/separator#dot-line", - "custom/swaync", "tray", - "mpris", + "network#speed", "custom/separator#dot-line", - "bluetooth", + "group/mobo_drawer", + "custom/separator#line", + "group/audio", "custom/separator#dot-line", - "pulseaudio", - "custom/separator#dot-line", - "pulseaudio#microphone", - "custom/separator#dot-line", - "keyboard-state", - "custom/separator#dot-line", - "custom/keyboard", - "custom/separator#dot-line", - "custom/power", + "group/status", ], } \ No newline at end of file diff --git a/config/waybar/configs/[TOP] Default (old v1) b/config/waybar/configs/[TOP] Default (old v1) new file mode 100644 index 00000000..96396a88 --- /dev/null +++ b/config/waybar/configs/[TOP] Default (old v1) @@ -0,0 +1,71 @@ +/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ + +// ### DEFAULT - Top (old v1) ### // +{ +"include": [ + "$HOME/.config/waybar/Modules", + "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", + ], +"layer": "top", +//"mode": "dock", +"exclusive": true, +"passthrough": false, +"position": "top", +"spacing": 3, +"fixed-center": true, +"ipc": true, +"margin-top": 3, +"margin-left": 8, +"margin-right": 8, + +"modules-left": [ + "hyprland/workspaces#pacman", + "custom/separator#dot-line", + "cpu", + "custom/separator#dot-line", + "temperature", + "custom/separator#dot-line", + "memory", + "custom/separator#dot-line", + "custom/weather", + "custom/separator#blank_3", + "custom/cava_mviz", + ], + +"modules-center": [ + "custom/menu", + "custom/separator#dot-line", + "idle_inhibitor", + "custom/separator#dot-line", + "clock", + "custom/separator#dot-line", + "custom/light_dark", + "custom/separator#dot-line", + "custom/lock", + //], + "custom/separator#dot-line", + "custom/hint", + ], + +"modules-right": [ + "network#speed", + "custom/separator#dot-line", + "custom/swaync", + "tray", + "mpris", + "custom/separator#dot-line", + "bluetooth", + "custom/separator#dot-line", + "pulseaudio", + "custom/separator#dot-line", + "pulseaudio#microphone", + "custom/separator#dot-line", + "keyboard-state", + "custom/separator#dot-line", + "custom/keyboard", + "custom/separator#dot-line", + "custom/power", + ], +} \ No newline at end of file diff --git a/config/waybar/configs/[TOP] Default (old v2) b/config/waybar/configs/[TOP] Default (old v2) new file mode 100644 index 00000000..4b5e8941 --- /dev/null +++ b/config/waybar/configs/[TOP] Default (old v2) @@ -0,0 +1,57 @@ +/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ + +// ### DEFAULT - Top (old v2) ### // +{ +"include": [ + "$HOME/.config/waybar/Modules", + "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", + ], +"layer": "top", +//"mode": "dock", +"exclusive": true, +"passthrough": false, +"position": "top", +"spacing": 3, +"fixed-center": true, +"ipc": true, +"margin-top": 3, +"margin-left": 8, +"margin-right": 8, + +"modules-left": [ + "custom/menu", + "custom/light_dark", + "custom/separator#dot-line", + "group/motherboard", + "custom/separator#line", + "custom/weather", + ], + +"modules-center": [ + "custom/swaync", + "custom/cava_mviz", + "custom/separator#dot-line", + "clock", + "custom/separator#line", + "hyprland/workspaces#roman", + "custom/separator#dot-line", + "idle_inhibitor", + "custom/hint", + ], + +"modules-right": [ + "network#speed", + "custom/separator#line", + "tray", + "mpris", + "bluetooth", + "group/audio", + "keyboard-state", + "custom/keyboard", + "custom/lock", + "custom/separator#dot-line", + "custom/power", + ], +} \ No newline at end of file diff --git a/config/waybar/configs/[TOP] Default (old v3) b/config/waybar/configs/[TOP] Default (old v3) new file mode 100644 index 00000000..70da4482 --- /dev/null +++ b/config/waybar/configs/[TOP] Default (old v3) @@ -0,0 +1,60 @@ +/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ + +// ### DEFAULT - Top (old v3) ### // +{ +"include": [ + "$HOME/.config/waybar/Modules", + "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", + ], +"layer": "top", +//"mode": "dock", +"exclusive": true, +"passthrough": false, +"position": "top", +"spacing": 3, +"fixed-center": true, +"ipc": true, +"margin-top": 3, +"margin-left": 8, +"margin-right": 8, + +"modules-left": [ + "custom/menu", + "custom/light_dark", + "custom/separator#dot-line", + "power-profiles-daemon", + "group/mobo_drawer", + "custom/separator#blank", + "custom/separator#line", + "custom/weather", + ], + +"modules-center": [ + "custom/swaync", + "custom/cava_mviz", + "custom/separator#dot-line", + "clock", + "custom/separator#line", + "hyprland/workspaces#kanji", + "custom/separator#dot-line", + "idle_inhibitor", + //"idle_inhibitor", + "custom/hint", + ], + +"modules-right": [ + "network#speed", + "group/connections", + "custom/separator#line", + "tray", + "mpris", + "group/audio", + "custom/separator#line", + "keyboard-state", + "custom/keyboard", + "custom/lock", + "custom/power", + ], +} \ No newline at end of file diff --git a/config/waybar/configs/[TOP] Default (old v4) b/config/waybar/configs/[TOP] Default (old v4) new file mode 100644 index 00000000..0b6010aa --- /dev/null +++ b/config/waybar/configs/[TOP] Default (old v4) @@ -0,0 +1,53 @@ +/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ + +// ### DEFAULT - Top (old v4) ### // +{ +"include": [ + "$HOME/.config/waybar/Modules", + "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", + ], +"layer": "top", +//"mode": "dock", +"exclusive": true, +"passthrough": false, +"position": "top", +"spacing": 3, +"fixed-center": true, +"ipc": true, +"margin-top": 3, +"margin-left": 8, +"margin-right": 8, + +"modules-left": [ + "group/app_drawer", + "custom/separator#dot-line", + "group/mobo_drawer", + "custom/separator#line", + "custom/weather", + ], + +"modules-center": [ + "custom/swaync", + "custom/cava_mviz", + "custom/separator#dot-line", + "clock", + "custom/separator#line", + "hyprland/workspaces#kanji", + "custom/separator#dot-line", + "idle_inhibitor", + "custom/hint", + ], + +"modules-right": [ + "network#speed", + "group/connections", + "custom/separator#line", + "tray", + "mpris", + "group/audio", + "custom/separator#dot-line", + "group/status", + ], +} \ No newline at end of file diff --git a/config/waybar/configs/[TOP] Default Laptop b/config/waybar/configs/[TOP] Default Laptop index 47f13956..7fe3f413 100644 --- a/config/waybar/configs/[TOP] Default Laptop +++ b/config/waybar/configs/[TOP] Default Laptop @@ -1,6 +1,6 @@ /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ -// ### DEFAULT Top -Laptop ### // +// ### DEFAULT Laptop - Top ### // { "include": [ "$HOME/.config/waybar/Modules", @@ -21,55 +21,38 @@ "margin-right": 8, "modules-left": [ - "hyprland/workspaces#pacman", - "custom/separator#dot-line", - "cpu", - "custom/separator#dot-line", - "temperature", - "custom/separator#dot-line", - "memory", - "custom/separator#dot-line", - "custom/weather", - "custom/separator#blank_3", + "custom/separator#blank", "custom/cava_mviz", + "custom/separator#blank", + "custom/playerctl", + "custom/separator#blank_2", + "hyprland/window", ], "modules-center": [ - "custom/menu", - "custom/separator#dot-line", - "idle_inhibitor", + "group/app_drawer", + "custom/separator#blank", + "custom/swaync", "custom/separator#dot-line", + "hyprland/workspaces#rw", "clock", "custom/separator#dot-line", - "custom/light_dark", - "custom/separator#dot-line", - "custom/lock", - //], + "custom/weather", "custom/separator#dot-line", + "idle_inhibitor", "custom/hint", - ], + ], "modules-right": [ + "tray", "network#speed", "custom/separator#dot-line", - "custom/swaync", - "tray", - "mpris", + "group/laptop", "custom/separator#dot-line", - "bluetooth", + "group/mobo_drawer", + "custom/separator#line", + "group/audio", "custom/separator#dot-line", - "battery", - "custom/separator#dot-line", - "backlight", - "custom/separator#dot-line", - "pulseaudio", - "custom/separator#dot-line", - "pulseaudio#microphone", - "custom/separator#dot-line", - "keyboard-state", - "custom/separator#dot-line", - "custom/keyboard", - "custom/separator#dot-line", - "custom/power", + "group/status", ], } \ No newline at end of file diff --git a/config/waybar/configs/[TOP] Default Laptop (old v1) b/config/waybar/configs/[TOP] Default Laptop (old v1) new file mode 100644 index 00000000..91139573 --- /dev/null +++ b/config/waybar/configs/[TOP] Default Laptop (old v1) @@ -0,0 +1,75 @@ +/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ + +// ### DEFAULT Top -Laptop (old v1) ### // +{ +"include": [ + "$HOME/.config/waybar/Modules", + "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", + ], +"layer": "top", +//"mode": "dock", +"exclusive": true, +"passthrough": false, +"position": "top", +"spacing": 3, +"fixed-center": true, +"ipc": true, +"margin-top": 3, +"margin-left": 8, +"margin-right": 8, + +"modules-left": [ + "hyprland/workspaces#pacman", + "custom/separator#dot-line", + "cpu", + "custom/separator#dot-line", + "temperature", + "custom/separator#dot-line", + "memory", + "custom/separator#dot-line", + "custom/weather", + "custom/separator#blank_3", + "custom/cava_mviz", + ], + +"modules-center": [ + "custom/menu", + "custom/separator#dot-line", + "idle_inhibitor", + "custom/separator#dot-line", + "clock", + "custom/separator#dot-line", + "custom/light_dark", + "custom/separator#dot-line", + "custom/lock", + //], + "custom/separator#dot-line", + "custom/hint", + ], + +"modules-right": [ + "network#speed", + "custom/separator#dot-line", + "custom/swaync", + "tray", + "mpris", + "custom/separator#dot-line", + "bluetooth", + "custom/separator#dot-line", + "battery", + "custom/separator#dot-line", + "backlight", + "custom/separator#dot-line", + "pulseaudio", + "custom/separator#dot-line", + "pulseaudio#microphone", + "custom/separator#dot-line", + "keyboard-state", + "custom/separator#dot-line", + "custom/keyboard", + "custom/separator#dot-line", + "custom/power", + ], +} \ No newline at end of file diff --git a/config/waybar/configs/[TOP] Default Laptop (old v2) b/config/waybar/configs/[TOP] Default Laptop (old v2) new file mode 100644 index 00000000..c7056247 --- /dev/null +++ b/config/waybar/configs/[TOP] Default Laptop (old v2) @@ -0,0 +1,60 @@ +/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ + +// ### DEFAULT (Laptop) - Top (old v2) ### // +{ +"include": [ + "$HOME/.config/waybar/Modules", + "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", + ], +"layer": "top", +//"mode": "dock", +"exclusive": true, +"passthrough": false, +"position": "top", +"spacing": 3, +"fixed-center": true, +"ipc": true, +"margin-top": 3, +"margin-left": 8, +"margin-right": 8, + +"modules-left": [ + "custom/menu", + "custom/light_dark", + "custom/separator#dot-line", + "power-profiles-daemon", + "group/mobo_drawer", + "custom/separator#blank", + "group/laptop", + "custom/separator#line", + "custom/weather", + ], + +"modules-center": [ + "custom/swaync", + "custom/cava_mviz", + "custom/separator#dot-line", + "clock", + "custom/separator#line", + "hyprland/workspaces#roman", + "custom/separator#dot-line", + "idle_inhibitor", + "custom/hint", + ], + +"modules-right": [ + "network#speed", + "group/connections", + "custom/separator#line", + "tray", + "mpris", + "group/audio", + "custom/separator#line", + "keyboard-state", + "custom/keyboard", + "custom/lock", + "custom/power", + ], +} \ No newline at end of file diff --git a/config/waybar/configs/[TOP] Default Laptop (old v3) b/config/waybar/configs/[TOP] Default Laptop (old v3) new file mode 100644 index 00000000..541b9493 --- /dev/null +++ b/config/waybar/configs/[TOP] Default Laptop (old v3) @@ -0,0 +1,60 @@ +/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ + +// ### DEFAULT (Laptop) - Top (old v3) ### // +{ +"include": [ + "$HOME/.config/waybar/Modules", + "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", + ], +"layer": "top", +//"mode": "dock", +"exclusive": true, +"passthrough": false, +"position": "top", +"spacing": 3, +"fixed-center": true, +"ipc": true, +"margin-top": 3, +"margin-left": 8, +"margin-right": 8, + +"modules-left": [ + "custom/menu", + "custom/light_dark", + "custom/separator#dot-line", + "power-profiles-daemon", + "group/mobo_drawer", + "custom/separator#blank", + "group/laptop", + "custom/separator#line", + "custom/weather", + ], + +"modules-center": [ + "custom/swaync", + "custom/cava_mviz", + "custom/separator#dot-line", + "clock", + "custom/separator#line", + "hyprland/workspaces#kanji", + "custom/separator#dot-line", + "idle_inhibitor", + "custom/hint", + ], + +"modules-right": [ + "network#speed", + "group/connections", + "custom/separator#line", + "tray", + "mpris", + "group/audio", + "custom/separator#line", + "keyboard-state", + "custom/keyboard", + "custom/lock", + "custom/power", + ], +} \ No newline at end of file diff --git a/config/waybar/configs/[TOP] Default Laptop (old v4) b/config/waybar/configs/[TOP] Default Laptop (old v4) new file mode 100644 index 00000000..be97970c --- /dev/null +++ b/config/waybar/configs/[TOP] Default Laptop (old v4) @@ -0,0 +1,55 @@ +/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ + +// ### DEFAULT (Laptop) - Top (old v4) ### // +{ +"include": [ + "$HOME/.config/waybar/Modules", + "$HOME/.config/waybar/ModulesWorkspaces", + "$HOME/.config/waybar/ModulesCustom", + "$HOME/.config/waybar/ModulesGroups", + ], +"layer": "top", +//"mode": "dock", +"exclusive": true, +"passthrough": false, +"position": "top", +"spacing": 3, +"fixed-center": true, +"ipc": true, +"margin-top": 3, +"margin-left": 8, +"margin-right": 8, + +"modules-left": [ + "group/app_drawer", + "custom/separator#dot-line", + "group/mobo_drawer", + "custom/separator#blank", + "group/laptop", + "custom/separator#line", + "custom/weather", + ], + +"modules-center": [ + "custom/swaync", + "custom/cava_mviz", + "custom/separator#dot-line", + "clock", + "custom/separator#line", + "hyprland/workspaces#kanji", + "custom/separator#dot-line", + "idle_inhibitor", + "custom/hint", + ], + +"modules-right": [ + "network#speed", + "group/connections", + "custom/separator#line", + "tray", + "mpris", + "group/audio", + "custom/separator#dot-line", + "group/status", + ], +} \ No newline at end of file diff --git a/config/waybar/configs/[TOP] Default Laptop_v2 b/config/waybar/configs/[TOP] Default Laptop_v2 deleted file mode 100644 index adc49a4d..00000000 --- a/config/waybar/configs/[TOP] Default Laptop_v2 +++ /dev/null @@ -1,60 +0,0 @@ -/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ - -// ### DEFAULT v2 (Laptop) - Top ### // -{ -"include": [ - "$HOME/.config/waybar/Modules", - "$HOME/.config/waybar/ModulesWorkspaces", - "$HOME/.config/waybar/ModulesCustom", - "$HOME/.config/waybar/ModulesGroups", - ], -"layer": "top", -//"mode": "dock", -"exclusive": true, -"passthrough": false, -"position": "top", -"spacing": 3, -"fixed-center": true, -"ipc": true, -"margin-top": 3, -"margin-left": 8, -"margin-right": 8, - -"modules-left": [ - "custom/menu", - "custom/light_dark", - "custom/separator#dot-line", - "power-profiles-daemon", - "group/mobo_drawer", - "custom/separator#blank", - "group/laptop", - "custom/separator#line", - "custom/weather", - ], - -"modules-center": [ - "custom/swaync", - "custom/cava_mviz", - "custom/separator#dot-line", - "clock", - "custom/separator#line", - "hyprland/workspaces#roman", - "custom/separator#dot-line", - "idle_inhibitor", - "custom/hint", - ], - -"modules-right": [ - "network#speed", - "group/connections", - "custom/separator#line", - "tray", - "mpris", - "group/audio", - "custom/separator#line", - "keyboard-state", - "custom/keyboard", - "custom/lock", - "custom/power", - ], -} \ No newline at end of file diff --git a/config/waybar/configs/[TOP] Default Laptop_v3 b/config/waybar/configs/[TOP] Default Laptop_v3 deleted file mode 100644 index 04f037fa..00000000 --- a/config/waybar/configs/[TOP] Default Laptop_v3 +++ /dev/null @@ -1,60 +0,0 @@ -/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ - -// ### DEFAULT v2 (Laptop) - Top ### // -{ -"include": [ - "$HOME/.config/waybar/Modules", - "$HOME/.config/waybar/ModulesWorkspaces", - "$HOME/.config/waybar/ModulesCustom", - "$HOME/.config/waybar/ModulesGroups", - ], -"layer": "top", -//"mode": "dock", -"exclusive": true, -"passthrough": false, -"position": "top", -"spacing": 3, -"fixed-center": true, -"ipc": true, -"margin-top": 3, -"margin-left": 8, -"margin-right": 8, - -"modules-left": [ - "custom/menu", - "custom/light_dark", - "custom/separator#dot-line", - "power-profiles-daemon", - "group/mobo_drawer", - "custom/separator#blank", - "group/laptop", - "custom/separator#line", - "custom/weather", - ], - -"modules-center": [ - "custom/swaync", - "custom/cava_mviz", - "custom/separator#dot-line", - "clock", - "custom/separator#line", - "hyprland/workspaces#kanji", - "custom/separator#dot-line", - "idle_inhibitor", - "custom/hint", - ], - -"modules-right": [ - "network#speed", - "group/connections", - "custom/separator#line", - "tray", - "mpris", - "group/audio", - "custom/separator#line", - "keyboard-state", - "custom/keyboard", - "custom/lock", - "custom/power", - ], -} \ No newline at end of file diff --git a/config/waybar/configs/[TOP] Default Laptop_v4 b/config/waybar/configs/[TOP] Default Laptop_v4 deleted file mode 100644 index 86e5a5fe..00000000 --- a/config/waybar/configs/[TOP] Default Laptop_v4 +++ /dev/null @@ -1,55 +0,0 @@ -/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ - -// ### DEFAULT v4 (Laptop) - Top ### // -{ -"include": [ - "$HOME/.config/waybar/Modules", - "$HOME/.config/waybar/ModulesWorkspaces", - "$HOME/.config/waybar/ModulesCustom", - "$HOME/.config/waybar/ModulesGroups", - ], -"layer": "top", -//"mode": "dock", -"exclusive": true, -"passthrough": false, -"position": "top", -"spacing": 3, -"fixed-center": true, -"ipc": true, -"margin-top": 3, -"margin-left": 8, -"margin-right": 8, - -"modules-left": [ - "group/app_drawer", - "custom/separator#dot-line", - "group/mobo_drawer", - "custom/separator#blank", - "group/laptop", - "custom/separator#line", - "custom/weather", - ], - -"modules-center": [ - "custom/swaync", - "custom/cava_mviz", - "custom/separator#dot-line", - "clock", - "custom/separator#line", - "hyprland/workspaces#kanji", - "custom/separator#dot-line", - "idle_inhibitor", - "custom/hint", - ], - -"modules-right": [ - "network#speed", - "group/connections", - "custom/separator#line", - "tray", - "mpris", - "group/audio", - "custom/separator#dot-line", - "group/status", - ], -} \ No newline at end of file diff --git a/config/waybar/configs/[TOP] Default Laptop_v5 b/config/waybar/configs/[TOP] Default Laptop_v5 deleted file mode 100644 index 2ef7b933..00000000 --- a/config/waybar/configs/[TOP] Default Laptop_v5 +++ /dev/null @@ -1,58 +0,0 @@ -/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ - -// ### DEFAULT v5 (Laptop) - Top ### // -{ -"include": [ - "$HOME/.config/waybar/Modules", - "$HOME/.config/waybar/ModulesWorkspaces", - "$HOME/.config/waybar/ModulesCustom", - "$HOME/.config/waybar/ModulesGroups", - ], -"layer": "top", -//"mode": "dock", -"exclusive": true, -"passthrough": false, -"position": "top", -"spacing": 3, -"fixed-center": true, -"ipc": true, -"margin-top": 3, -"margin-left": 8, -"margin-right": 8, - -"modules-left": [ - "custom/separator#blank", - "custom/cava_mviz", - "custom/separator#blank", - "custom/playerctl", - "custom/separator#blank_2", - "hyprland/window", - ], - -"modules-center": [ - "group/app_drawer", - "custom/separator#blank", - "custom/swaync", - "custom/separator#dot-line", - "hyprland/workspaces#rw", - "clock", - "custom/separator#dot-line", - "custom/weather", - "custom/separator#dot-line", - "idle_inhibitor", - "custom/hint", - ], - -"modules-right": [ - "tray", - "network#speed", - "custom/separator#dot-line", - "group/laptop", - "custom/separator#dot-line", - "group/mobo_drawer", - "custom/separator#line", - "group/audio", - "custom/separator#dot-line", - "group/status", - ], -} \ No newline at end of file diff --git a/config/waybar/configs/[TOP] Default_v2 b/config/waybar/configs/[TOP] Default_v2 deleted file mode 100644 index c4e4f59c..00000000 --- a/config/waybar/configs/[TOP] Default_v2 +++ /dev/null @@ -1,57 +0,0 @@ -/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ - -// ### DEFAULT v2 - Top ### // -{ -"include": [ - "$HOME/.config/waybar/Modules", - "$HOME/.config/waybar/ModulesWorkspaces", - "$HOME/.config/waybar/ModulesCustom", - "$HOME/.config/waybar/ModulesGroups", - ], -"layer": "top", -//"mode": "dock", -"exclusive": true, -"passthrough": false, -"position": "top", -"spacing": 3, -"fixed-center": true, -"ipc": true, -"margin-top": 3, -"margin-left": 8, -"margin-right": 8, - -"modules-left": [ - "custom/menu", - "custom/light_dark", - "custom/separator#dot-line", - "group/motherboard", - "custom/separator#line", - "custom/weather", - ], - -"modules-center": [ - "custom/swaync", - "custom/cava_mviz", - "custom/separator#dot-line", - "clock", - "custom/separator#line", - "hyprland/workspaces#roman", - "custom/separator#dot-line", - "idle_inhibitor", - "custom/hint", - ], - -"modules-right": [ - "network#speed", - "custom/separator#line", - "tray", - "mpris", - "bluetooth", - "group/audio", - "keyboard-state", - "custom/keyboard", - "custom/lock", - "custom/separator#dot-line", - "custom/power", - ], -} \ No newline at end of file diff --git a/config/waybar/configs/[TOP] Default_v3 b/config/waybar/configs/[TOP] Default_v3 deleted file mode 100644 index 826b7724..00000000 --- a/config/waybar/configs/[TOP] Default_v3 +++ /dev/null @@ -1,60 +0,0 @@ -/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ - -// ### DEFAULT v3 - Top ### // -{ -"include": [ - "$HOME/.config/waybar/Modules", - "$HOME/.config/waybar/ModulesWorkspaces", - "$HOME/.config/waybar/ModulesCustom", - "$HOME/.config/waybar/ModulesGroups", - ], -"layer": "top", -//"mode": "dock", -"exclusive": true, -"passthrough": false, -"position": "top", -"spacing": 3, -"fixed-center": true, -"ipc": true, -"margin-top": 3, -"margin-left": 8, -"margin-right": 8, - -"modules-left": [ - "custom/menu", - "custom/light_dark", - "custom/separator#dot-line", - "power-profiles-daemon", - "group/mobo_drawer", - "custom/separator#blank", - "custom/separator#line", - "custom/weather", - ], - -"modules-center": [ - "custom/swaync", - "custom/cava_mviz", - "custom/separator#dot-line", - "clock", - "custom/separator#line", - "hyprland/workspaces#kanji", - "custom/separator#dot-line", - "idle_inhibitor", - //"idle_inhibitor", - "custom/hint", - ], - -"modules-right": [ - "network#speed", - "group/connections", - "custom/separator#line", - "tray", - "mpris", - "group/audio", - "custom/separator#line", - "keyboard-state", - "custom/keyboard", - "custom/lock", - "custom/power", - ], -} \ No newline at end of file diff --git a/config/waybar/configs/[TOP] Default_v4 b/config/waybar/configs/[TOP] Default_v4 deleted file mode 100644 index 678c2085..00000000 --- a/config/waybar/configs/[TOP] Default_v4 +++ /dev/null @@ -1,53 +0,0 @@ -/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ - -// ### DEFAULT v4 - Top ### // -{ -"include": [ - "$HOME/.config/waybar/Modules", - "$HOME/.config/waybar/ModulesWorkspaces", - "$HOME/.config/waybar/ModulesCustom", - "$HOME/.config/waybar/ModulesGroups", - ], -"layer": "top", -//"mode": "dock", -"exclusive": true, -"passthrough": false, -"position": "top", -"spacing": 3, -"fixed-center": true, -"ipc": true, -"margin-top": 3, -"margin-left": 8, -"margin-right": 8, - -"modules-left": [ - "group/app_drawer", - "custom/separator#dot-line", - "group/mobo_drawer", - "custom/separator#line", - "custom/weather", - ], - -"modules-center": [ - "custom/swaync", - "custom/cava_mviz", - "custom/separator#dot-line", - "clock", - "custom/separator#line", - "hyprland/workspaces#kanji", - "custom/separator#dot-line", - "idle_inhibitor", - "custom/hint", - ], - -"modules-right": [ - "network#speed", - "group/connections", - "custom/separator#line", - "tray", - "mpris", - "group/audio", - "custom/separator#dot-line", - "group/status", - ], -} \ No newline at end of file diff --git a/config/waybar/configs/[TOP] Default_v5 b/config/waybar/configs/[TOP] Default_v5 deleted file mode 100644 index a8a9601a..00000000 --- a/config/waybar/configs/[TOP] Default_v5 +++ /dev/null @@ -1,56 +0,0 @@ -/* ---- 💫 https://github.com/JaKooLit 💫 ---- */ - -// ### DEFAULT v5 - Top ### // -{ -"include": [ - "$HOME/.config/waybar/Modules", - "$HOME/.config/waybar/ModulesWorkspaces", - "$HOME/.config/waybar/ModulesCustom", - "$HOME/.config/waybar/ModulesGroups", - ], -"layer": "top", -//"mode": "dock", -"exclusive": true, -"passthrough": false, -"position": "top", -"spacing": 3, -"fixed-center": true, -"ipc": true, -"margin-top": 3, -"margin-left": 8, -"margin-right": 8, - -"modules-left": [ - "custom/separator#blank", - "custom/cava_mviz", - "custom/separator#blank", - "custom/playerctl", - "custom/separator#blank_2", - "hyprland/window", - ], - -"modules-center": [ - "group/app_drawer", - "custom/separator#blank", - "custom/swaync", - "custom/separator#dot-line", - "hyprland/workspaces#rw", - "clock", - "custom/separator#dot-line", - "custom/weather", - "custom/separator#dot-line", - "idle_inhibitor", - "custom/hint", - ], - -"modules-right": [ - "tray", - "network#speed", - "custom/separator#dot-line", - "group/mobo_drawer", - "custom/separator#line", - "group/audio", - "custom/separator#dot-line", - "group/status", - ], -} \ No newline at end of file diff --git a/copy.sh b/copy.sh index 4b6a3cde..43093d8e 100755 --- a/copy.sh +++ b/copy.sh @@ -4,8 +4,8 @@ clear wallpaper=$HOME/.config/hypr/wallpaper_effects/.wallpaper_current waybar_style="$HOME/.config/waybar/style/[Extra] Modern-Combined - Transparent.css" -waybar_config="$HOME/.config/waybar/configs/[TOP] Default_v5" -waybar_config_laptop="$HOME/.config/waybar/configs/[TOP] Default Laptop_v5" +waybar_config="$HOME/.config/waybar/configs/[TOP] Default" +waybar_config_laptop="$HOME/.config/waybar/configs/[TOP] Default Laptop" # Set some colors for output messages OK="$(tput setaf 2)[OK]$(tput sgr0)" @@ -631,29 +631,25 @@ chmod +x ~/.config/hypr/UserScripts/* 2>&1 | tee -a "$LOG" # Set executable for initial-boot.sh chmod +x ~/.config/hypr/initial-boot.sh 2>&1 | tee -a "$LOG" -# Detect machine type and set waybar configurations accordingly +# Waybar config to symlink & retain based on machine type if hostnamectl | grep -q 'Chassis: desktop'; then - # Configurations for a desktop - ln -sf "$waybar_config" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG" - # Remove waybar configs for laptop - rm -rf "$HOME/.config/waybar/configs/[TOP] Default Laptop" \ - "$HOME/.config/waybar/configs/[BOT] Default Laptop" \ - "$HOME/.config/waybar/configs/[TOP] Default Laptop_v2" \ - "$HOME/.config/waybar/configs/[TOP] Default Laptop_v3" \ - "$HOME/.config/waybar/configs/[TOP] Default Laptop_v4" \ - "$HOME/.config/waybar/configs/[TOP] Default Laptop_v5" 2>&1 | tee -a "$LOG" || true + config_file="$waybar_config" + config_remove=" Laptop" else - # Configurations for a laptop or any system other than desktop - ln -sf "$waybar_config_laptop" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG" - # Remove waybar configs for desktop - rm -rf "$HOME/.config/waybar/configs/[TOP] Default" \ - "$HOME/.config/waybar/configs/[BOT] Default" \ - "$HOME/.config/waybar/configs/[TOP] Default_v2" \ - "$HOME/.config/waybar/configs/[TOP] Default_v3" \ - "$HOME/.config/waybar/configs/[TOP] Default_v4" \ - "$HOME/.config/waybar/configs/[TOP] Default_v5" 2>&1 | tee -a "$LOG" || true + config_file="$waybar_config_laptop" + config_remove="" fi +ln -sf "$config_file" "$HOME/.config/waybar/config" 2>&1 | tee -a "$LOG" || true + +# Remove inappropriate waybar configs +rm -rf "$HOME/.config/waybar/configs/[TOP] Default$config_remove" \ + "$HOME/.config/waybar/configs/[BOT] Default$config_remove" \ + "$HOME/.config/waybar/configs/[TOP] Default$config_remove (old v1)" \ + "$HOME/.config/waybar/configs/[TOP] Default$config_remove (old v2)" \ + "$HOME/.config/waybar/configs/[TOP] Default$config_remove (old v3)" \ + "$HOME/.config/waybar/configs/[TOP] Default$config_remove (old v4)" 2>&1 | tee -a "$LOG" || true + printf "\n%.0s" {1..2} # for SDDM (sequoia_2) -- cgit v1.2.3