From 507c8e906c7d202f3534163fc81f8b1a48dc1b85 Mon Sep 17 00:00:00 2001 From: Spangenberg Date: Sun, 22 Oct 2023 16:37:59 +0200 Subject: [PATCH] waybar themes removed --- waybar/launch.sh | 9 +-- waybar/themes/{ml4w => cantina}/config | 16 +---- waybar/themes/cantina/dark/config.sh | 2 + .../themes/{ml4w => cantina}/dark/style.css | 0 waybar/themes/cantina/light/config.sh | 2 + .../themes/{ml4w => cantina}/light/style.css | 0 waybar/themes/{ml4w => cantina}/style.css | 0 waybar/themes/ml4w-bottom/colored/config.sh | 2 - waybar/themes/ml4w-bottom/colored/style.css | 16 ----- waybar/themes/ml4w-bottom/config | 69 ------------------- waybar/themes/ml4w-bottom/dark/config.sh | 2 - waybar/themes/ml4w-bottom/dark/style.css | 16 ----- waybar/themes/ml4w-bottom/light/config.sh | 2 - waybar/themes/ml4w-bottom/light/style.css | 16 ----- waybar/themes/ml4w-bottom/mixed/config.sh | 2 - waybar/themes/ml4w-bottom/mixed/style.css | 16 ----- waybar/themes/ml4w/colored/config.sh | 2 - waybar/themes/ml4w/colored/style.css | 16 ----- waybar/themes/ml4w/dark/config.sh | 2 - waybar/themes/ml4w/light/config.sh | 2 - waybar/themes/ml4w/mixed/config.sh | 2 - waybar/themes/ml4w/mixed/style.css | 16 ----- 22 files changed, 9 insertions(+), 201 deletions(-) rename waybar/themes/{ml4w => cantina}/config (85%) create mode 100644 waybar/themes/cantina/dark/config.sh rename waybar/themes/{ml4w => cantina}/dark/style.css (100%) create mode 100644 waybar/themes/cantina/light/config.sh rename waybar/themes/{ml4w => cantina}/light/style.css (100%) rename waybar/themes/{ml4w => cantina}/style.css (100%) delete mode 100644 waybar/themes/ml4w-bottom/colored/config.sh delete mode 100644 waybar/themes/ml4w-bottom/colored/style.css delete mode 100644 waybar/themes/ml4w-bottom/config delete mode 100644 waybar/themes/ml4w-bottom/dark/config.sh delete mode 100644 waybar/themes/ml4w-bottom/dark/style.css delete mode 100644 waybar/themes/ml4w-bottom/light/config.sh delete mode 100644 waybar/themes/ml4w-bottom/light/style.css delete mode 100644 waybar/themes/ml4w-bottom/mixed/config.sh delete mode 100644 waybar/themes/ml4w-bottom/mixed/style.css delete mode 100644 waybar/themes/ml4w/colored/config.sh delete mode 100644 waybar/themes/ml4w/colored/style.css delete mode 100644 waybar/themes/ml4w/dark/config.sh delete mode 100644 waybar/themes/ml4w/light/config.sh delete mode 100644 waybar/themes/ml4w/mixed/config.sh delete mode 100644 waybar/themes/ml4w/mixed/style.css diff --git a/waybar/launch.sh b/waybar/launch.sh index 386bd6b..5efd875 100755 --- a/waybar/launch.sh +++ b/waybar/launch.sh @@ -21,10 +21,5 @@ if [ ! -f ~/dotfiles/waybar/themes${arrThemes[1]}/style.css ]; then themestyle="/ml4w;/ml4w/light" fi -# Loading the configuration and style file based on the username -if [[ $USER = "raabe" ]] -then - waybar -c ~/dotfiles/waybar/themes${arrThemes[0]}/myconfig -s ~/dotfiles/waybar/themes${arrThemes[1]}/style.css & -else - waybar -c ~/dotfiles/waybar/themes${arrThemes[0]}/config -s ~/dotfiles/waybar/themes${arrThemes[1]}/style.css & -fi +# Loading the configuration and style file based +waybar -c ~/dotfiles/waybar/themes${arrThemes[0]}/config -s ~/dotfiles/waybar/themes${arrThemes[1]}/style.css & diff --git a/waybar/themes/ml4w/config b/waybar/themes/cantina/config similarity index 85% rename from waybar/themes/ml4w/config rename to waybar/themes/cantina/config index e5785f2..d86c8d9 100644 --- a/waybar/themes/ml4w/config +++ b/waybar/themes/cantina/config @@ -1,18 +1,9 @@ { - // General Settings - - // Position TOP - "layer": "top", - "margin-top": 14, - "margin-bottom": 0, - - // Position BOTTOM - // "position": "bottom", - // "margin-top": 0, - // "margin-bottom": 14, - + // Position "layer": "top", "height": 16, + "margin-top": 14, + "margin-bottom": 0, "margin-left": 0, "margin-right": 0, "spacing": 0, @@ -54,7 +45,6 @@ "orientation": "horizontal", "modules": [ "custom/filemanager", - "custom/brave", ] }, diff --git a/waybar/themes/cantina/dark/config.sh b/waybar/themes/cantina/dark/config.sh new file mode 100644 index 0000000..cb74acf --- /dev/null +++ b/waybar/themes/cantina/dark/config.sh @@ -0,0 +1,2 @@ +#!/bin/bash +theme_name="CANTINA Dark" diff --git a/waybar/themes/ml4w/dark/style.css b/waybar/themes/cantina/dark/style.css similarity index 100% rename from waybar/themes/ml4w/dark/style.css rename to waybar/themes/cantina/dark/style.css diff --git a/waybar/themes/cantina/light/config.sh b/waybar/themes/cantina/light/config.sh new file mode 100644 index 0000000..44296ed --- /dev/null +++ b/waybar/themes/cantina/light/config.sh @@ -0,0 +1,2 @@ +#!/bin/bash +theme_name="CANTINA Light" diff --git a/waybar/themes/ml4w/light/style.css b/waybar/themes/cantina/light/style.css similarity index 100% rename from waybar/themes/ml4w/light/style.css rename to waybar/themes/cantina/light/style.css diff --git a/waybar/themes/ml4w/style.css b/waybar/themes/cantina/style.css similarity index 100% rename from waybar/themes/ml4w/style.css rename to waybar/themes/cantina/style.css diff --git a/waybar/themes/ml4w-bottom/colored/config.sh b/waybar/themes/ml4w-bottom/colored/config.sh deleted file mode 100644 index 0a31bac..0000000 --- a/waybar/themes/ml4w-bottom/colored/config.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -theme_name="ML4W Colored Bottom" \ No newline at end of file diff --git a/waybar/themes/ml4w-bottom/colored/style.css b/waybar/themes/ml4w-bottom/colored/style.css deleted file mode 100644 index 53bf65c..0000000 --- a/waybar/themes/ml4w-bottom/colored/style.css +++ /dev/null @@ -1,16 +0,0 @@ -/* ----------------------------------------------------- - * Import Pywal colors - * ----------------------------------------------------- */ -@import '../../../../../.cache/wal/colors-waybar.css'; - -@define-color backgroundlight @color5; -@define-color backgrounddark @color11; -@define-color workspacesbackground1 @color5; -@define-color workspacesbackground2 @color11; -@define-color bordercolor @color11; -@define-color textcolor1 #FFFFFF; -@define-color textcolor2 #FFFFFF; -@define-color textcolor3 #FFFFFF; -@define-color iconcolor #FFFFFF; - -@import '../../ml4w/style.css'; diff --git a/waybar/themes/ml4w-bottom/config b/waybar/themes/ml4w-bottom/config deleted file mode 100644 index 68eec87..0000000 --- a/waybar/themes/ml4w-bottom/config +++ /dev/null @@ -1,69 +0,0 @@ -{ - // General Settings - - // Position TOP - // "layer": "top", - // "margin-top": 14, - // "margin-bottom": 0, - - // Position BOTTOM - "position": "bottom", - "margin-top": 0, - "margin-bottom": 14, - - "layer": "top", - "height": 16, - "margin-left": 0, - "margin-right": 0, - "spacing": 0, - - // Load Modules - "include": ["~/dotfiles/waybar/modules.json"], - - // Modules Left - "modules-left": [ - "custom/appmenu", - "custom/wallpaper", - "custom/waybarthemes", - "wlr/taskbar", - "group/quicklinks", - "hyprland/window" - ], - - // Modules Center - "modules-center": [ - "hyprland/workspaces" - ], - - // Modules Right - "modules-right": [ - "custom/updates", - "pulseaudio", - "bluetooth", - "battery", - "group/hardware", - "custom/cliphist", - "network", - "custom/exit", - "clock" - ], - - // Group Quicklinks - "group/quicklinks": { - "orientation": "horizontal", - "modules": [ - "custom/filemanager", - "custom/brave", - ] - }, - - // Group Hardware - "group/hardware": { - "orientation": "horizontal", - "modules": [ - "disk", - "cpu", - "memory" - ] - } -} diff --git a/waybar/themes/ml4w-bottom/dark/config.sh b/waybar/themes/ml4w-bottom/dark/config.sh deleted file mode 100644 index a6fe8ff..0000000 --- a/waybar/themes/ml4w-bottom/dark/config.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -theme_name="ML4W Dark Bottom" \ No newline at end of file diff --git a/waybar/themes/ml4w-bottom/dark/style.css b/waybar/themes/ml4w-bottom/dark/style.css deleted file mode 100644 index 2179f76..0000000 --- a/waybar/themes/ml4w-bottom/dark/style.css +++ /dev/null @@ -1,16 +0,0 @@ -/* ----------------------------------------------------- - * Import Pywal colors - * ----------------------------------------------------- */ -@import '../../../../../.cache/wal/colors-waybar.css'; - -@define-color backgroundlight @color8; -@define-color backgrounddark #FFFFFF; -@define-color workspacesbackground1 @color8; -@define-color workspacesbackground2 #FFFFFF; -@define-color bordercolor @color8; -@define-color textcolor1 @color8; -@define-color textcolor2 #FFFFFF; -@define-color textcolor3 #FFFFFF; -@define-color iconcolor @color8; - -@import '../../ml4w/style.css'; diff --git a/waybar/themes/ml4w-bottom/light/config.sh b/waybar/themes/ml4w-bottom/light/config.sh deleted file mode 100644 index e016502..0000000 --- a/waybar/themes/ml4w-bottom/light/config.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -theme_name="ML4W Light Bottom" \ No newline at end of file diff --git a/waybar/themes/ml4w-bottom/light/style.css b/waybar/themes/ml4w-bottom/light/style.css deleted file mode 100644 index 833b8c4..0000000 --- a/waybar/themes/ml4w-bottom/light/style.css +++ /dev/null @@ -1,16 +0,0 @@ -/* ----------------------------------------------------- - * Import Pywal colors - * ----------------------------------------------------- */ -@import '../../../../../.cache/wal/colors-waybar.css'; - -@define-color backgroundlight #FFFFFF; -@define-color backgrounddark @color11; -@define-color workspacesbackground1 #FFFFFF; -@define-color workspacesbackground2 @color11; -@define-color bordercolor #FFFFFF; -@define-color textcolor1 #FFFFFF; -@define-color textcolor2 @color11; -@define-color textcolor3 #FFFFFF; -@define-color iconcolor #FFFFFF; - -@import '../../ml4w/style.css'; \ No newline at end of file diff --git a/waybar/themes/ml4w-bottom/mixed/config.sh b/waybar/themes/ml4w-bottom/mixed/config.sh deleted file mode 100644 index e5bc67e..0000000 --- a/waybar/themes/ml4w-bottom/mixed/config.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -theme_name="ML4W Mixed Bottom" \ No newline at end of file diff --git a/waybar/themes/ml4w-bottom/mixed/style.css b/waybar/themes/ml4w-bottom/mixed/style.css deleted file mode 100644 index f3ee832..0000000 --- a/waybar/themes/ml4w-bottom/mixed/style.css +++ /dev/null @@ -1,16 +0,0 @@ -/* ----------------------------------------------------- - * Import Pywal colors - * ----------------------------------------------------- */ -@import '../../../../../.cache/wal/colors-waybar.css'; - -@define-color backgroundlight @color8; -@define-color backgrounddark #FFFFFF; -@define-color workspacesbackground1 @color8; -@define-color workspacesbackground2 #FFFFFF; -@define-color bordercolor @color8; -@define-color textcolor1 @color8; -@define-color textcolor2 #FFFFFF; -@define-color textcolor3 #FFFFFF; -@define-color iconcolor #FFFFFF; - -@import '../../ml4w/style.css'; diff --git a/waybar/themes/ml4w/colored/config.sh b/waybar/themes/ml4w/colored/config.sh deleted file mode 100644 index 25dbee7..0000000 --- a/waybar/themes/ml4w/colored/config.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -theme_name="ML4W Colored" \ No newline at end of file diff --git a/waybar/themes/ml4w/colored/style.css b/waybar/themes/ml4w/colored/style.css deleted file mode 100644 index f9008da..0000000 --- a/waybar/themes/ml4w/colored/style.css +++ /dev/null @@ -1,16 +0,0 @@ -/* ----------------------------------------------------- - * Import Pywal colors - * ----------------------------------------------------- */ -@import '../../../../../.cache/wal/colors-waybar.css'; - -@define-color backgroundlight @color5; -@define-color backgrounddark @color11; -@define-color workspacesbackground1 @color5; -@define-color workspacesbackground2 @color11; -@define-color bordercolor @color11; -@define-color textcolor1 #FFFFFF; -@define-color textcolor2 #FFFFFF; -@define-color textcolor3 #FFFFFF; -@define-color iconcolor #FFFFFF; - -@import '../style.css'; diff --git a/waybar/themes/ml4w/dark/config.sh b/waybar/themes/ml4w/dark/config.sh deleted file mode 100644 index 6c2cf9f..0000000 --- a/waybar/themes/ml4w/dark/config.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -theme_name="ML4W Dark" \ No newline at end of file diff --git a/waybar/themes/ml4w/light/config.sh b/waybar/themes/ml4w/light/config.sh deleted file mode 100644 index 55e4ffd..0000000 --- a/waybar/themes/ml4w/light/config.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -theme_name="ML4W Light" diff --git a/waybar/themes/ml4w/mixed/config.sh b/waybar/themes/ml4w/mixed/config.sh deleted file mode 100644 index c00e231..0000000 --- a/waybar/themes/ml4w/mixed/config.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -theme_name="ML4W Mixed" \ No newline at end of file diff --git a/waybar/themes/ml4w/mixed/style.css b/waybar/themes/ml4w/mixed/style.css deleted file mode 100644 index 09032ae..0000000 --- a/waybar/themes/ml4w/mixed/style.css +++ /dev/null @@ -1,16 +0,0 @@ -/* ----------------------------------------------------- - * Import Pywal colors - * ----------------------------------------------------- */ -@import '../../../../../.cache/wal/colors-waybar.css'; - -@define-color backgroundlight @color8; -@define-color backgrounddark #FFFFFF; -@define-color workspacesbackground1 @color8; -@define-color workspacesbackground2 #FFFFFF; -@define-color bordercolor @color8; -@define-color textcolor1 @color8; -@define-color textcolor2 #FFFFFF; -@define-color textcolor3 #FFFFFF; -@define-color iconcolor #FFFFFF; - -@import '../style.css';