adi1090x · Jacoby6000 · Jul 16, 2024 · Jul 17, 2024 · Jul 17, 2024 · Jul 17, 2024
diff --git a/files/applets/bin/appasroot.sh b/files/applets/bin/appasroot.sh
@@ -6,8 +6,10 @@
 ## Applets : Run Applications as Root
 
 # Import Current Theme
-source "$HOME"/.config/rofi/applets/shared/theme.bash
-theme="$type/$style"
+SCRIPT_INVOCATION="$0"
+INPUT_THEME="$1"
+SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
+source "$SCRIPT_DIR/../shared/theme.bash"
 
 # Theme Elements
 prompt='Applications'

diff --git a/files/applets/bin/apps.sh b/files/applets/bin/apps.sh
@@ -6,8 +6,11 @@
 ## Applets : Favorite Applications
 
 # Import Current Theme
-source "$HOME"/.config/rofi/applets/shared/theme.bash
-theme="$type/$style"
+SCRIPT_INVOCATION="$0"
+INPUT_THEME="$1"
+SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
+source "$SCRIPT_DIR/../shared/theme.bash"
+
 
 # Theme Elements
 prompt='Applications'
@@ -22,12 +25,12 @@ elif [[ ( "$theme" == *'type-2'* ) || ( "$theme" == *'type-4'* ) ]]; then
 fi
 
 # CMDs (add your apps here)
-term_cmd='alacritty'
-file_cmd='thunar'
-text_cmd='geany'
-web_cmd='firefox'
-music_cmd='alacritty -e ncmpcpp'
-setting_cmd='xfce4-settings-manager'
+term_cmd="${TERMINAL_CMD:-alacritty}"
+file_cmd="${FILE_BROWSER_CMD:-thunar}"
+text_cmd="${TEXT_EDITOR_CMD:-geany}"
+web_cmd="${WEB_BROWSER_CMD:-firefox}"
+music_cmd="${MUSIC_CMD:-alacritty -e ncmpcpp}"
+setting_cmd="${SETTINGS_CMD:-xfce4-settings-manager}"
 
 # Options
 layout=`cat ${theme} | grep 'USE_ICON' | cut -d'=' -f2`

diff --git a/files/applets/bin/battery.sh b/files/applets/bin/battery.sh
@@ -6,8 +6,10 @@
 ## Applets : Battery
 
 # Import Current Theme
-source "$HOME"/.config/rofi/applets/shared/theme.bash
-theme="$type/$style"
+SCRIPT_INVOCATION="$0"
+INPUT_THEME="$1"
+SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
+source "$SCRIPT_DIR/../shared/theme.bash"
 
 # Battery Info
 battery="`acpi -b | cut -d',' -f1 | cut -d':' -f1`"

diff --git a/files/applets/bin/brightness.sh b/files/applets/bin/brightness.sh
@@ -6,8 +6,10 @@
 ## Applets : Brightness
 
 # Import Current Theme
-source "$HOME"/.config/rofi/applets/shared/theme.bash
-theme="$type/$style"
+SCRIPT_INVOCATION="$0"
+INPUT_THEME="$1"
+SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
+source "$SCRIPT_DIR/../shared/theme.bash"
 
 # Brightness Info
 backlight="$(printf "%.0f\n" `light -G`)"

diff --git a/files/applets/bin/mpd.sh b/files/applets/bin/mpd.sh
@@ -6,8 +6,11 @@
 ## Applets : MPD (music)
 
 # Import Current Theme
-source "$HOME"/.config/rofi/applets/shared/theme.bash
-theme="$type/$style"
+SCRIPT_INVOCATION="$0"
+INPUT_THEME="$1"
+SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
+source "$SCRIPT_DIR/../shared/theme.bash"
+
 
 # Theme Elements
 status="`mpc status`"

diff --git a/files/applets/bin/powermenu.sh b/files/applets/bin/powermenu.sh
@@ -6,12 +6,17 @@
 ## Applets : Power Menu
 
 # Import Current Theme
-source "$HOME"/.config/rofi/applets/shared/theme.bash
-theme="$type/$style"
+SCRIPT_INVOCATION="$0"
+INPUT_THEME="$1"
+SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
+source "$SCRIPT_DIR/../shared/theme.bash"
 
 # Theme Elements
 prompt="`hostname`"
-mesg="Uptime : `uptime -p | sed -e 's/up //g'`"
+
+uptime=$($SCRIPT_DIR/../../shared/uptime.sh)
+
+mesg="Uptime : $uptime"
 
 if [[ ( "$theme" == *'type-1'* ) || ( "$theme" == *'type-3'* ) || ( "$theme" == *'type-5'* ) ]]; then
 	list_col='1'

diff --git a/files/applets/bin/quicklinks.sh b/files/applets/bin/quicklinks.sh
@@ -6,8 +6,10 @@
 ## Applets : Quick Links
 
 # Import Current Theme
-source "$HOME"/.config/rofi/applets/shared/theme.bash
-theme="$type/$style"
+SCRIPT_INVOCATION="$0"
+INPUT_THEME="$1"
+SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
+source "$SCRIPT_DIR/../shared/theme.bash"
 
 # Theme Elements
 prompt='Quick Links'

diff --git a/files/applets/bin/screenshot.sh b/files/applets/bin/screenshot.sh
@@ -6,8 +6,10 @@
 ## Applets : Screenshot
 
 # Import Current Theme
-source "$HOME"/.config/rofi/applets/shared/theme.bash
-theme="$type/$style"
+SCRIPT_INVOCATION="$0"
+INPUT_THEME="$1"
+SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
+source "$SCRIPT_DIR/../shared/theme.bash"
 
 # Theme Elements
 prompt='Screenshot'

diff --git a/files/applets/bin/volume.sh b/files/applets/bin/volume.sh
@@ -6,8 +6,11 @@
 ## Applets : Volume
 
 # Import Current Theme
-source "$HOME"/.config/rofi/applets/shared/theme.bash
-theme="$type/$style"
+SCRIPT_INVOCATION="$0"
+INPUT_THEME="$1"
+SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
+source "$SCRIPT_DIR/../shared/theme.bash"
+
 
 # Volume Info
 mixer="`amixer info Master | grep 'Mixer name' | cut -d':' -f2 | tr -d \',' '`"

diff --git a/files/applets/shared/colors.rasi b/files/applets/shared/colors.rasi
@@ -15,4 +15,4 @@
 
 /* Import color-scheme from `colors` directory */
 
-@import "~/.config/rofi/colors/onedark.rasi"
+@import "../../colors/onedark.rasi"
diff --git a/files/applets/shared/theme.bash b/files/applets/shared/theme.bash
@@ -1,4 +1,19 @@
 ## Current Theme
+DEFAULT_TYPE='type-1'
+DEFAULT_STYLE='style-1'
 
-type="$HOME/.config/rofi/applets/type-1"
-style='style-1.rasi'
+# INPUT_THEME should be set by the script that sources this file, 
+# if the user wants to override the default theme.
+if [ -z "$INPUT_THEME" ]; then
+    theme="$SCRIPT_DIR/../$DEFAULT_TYPE/$DEFAULT_STYLE.rasi"
+elif [[ $1 == "-h" || $1 == "--help" ]]; then
+    echo "Usage: $SCRIPT_INVOCATION [theme]"
+    exit 0
+else
+    theme="$SCRIPT_DIR/../$theme.rasi"
+    if [ ! -f "$theme" ]; then
+      # fail if we still can't find it.
+      echo "Theme not found!"
+      exit 1
+    fi
+fi
diff --git a/files/applets/type-4/style-1.rasi b/files/applets/type-4/style-1.rasi
@@ -64,7 +64,7 @@ inputbar {
     border-radius:               0px;
     border-color:                @selected;
     background-color:            transparent;
-    background-image:            url("~/.config/rofi/images/a.png", width);
+    background-image:            url("./images/a.png", width);
     text-color:                  @foreground;
     children:                    [ "textbox-prompt-colon", "prompt"];
 }

diff --git a/files/applets/type-4/style-2.rasi b/files/applets/type-4/style-2.rasi
@@ -64,7 +64,7 @@ inputbar {
     border-radius:               20px;
     border-color:                @selected;
     background-color:            transparent;
-    background-image:            url("~/.config/rofi/images/d.png", width);
+    background-image:            url("./images/d.png", width);
     text-color:                  @foreground;
     children:                    [ "dummy", "textbox-prompt-colon", "prompt", "dummy"];
 }

diff --git a/files/applets/type-4/style-3.rasi b/files/applets/type-4/style-3.rasi
@@ -64,7 +64,7 @@ inputbar {
     border-radius:               40px;
     border-color:                @selected;
     background-color:            transparent;
-    background-image:            url("~/.config/rofi/images/i.jpg", width);
+    background-image:            url("./images/i.jpg", width);
     text-color:                  @foreground;
     children:                    [ "textbox-prompt-colon", "dummy", "prompt"];
 }

diff --git a/files/applets/type-5/style-1.rasi b/files/applets/type-5/style-1.rasi
@@ -59,7 +59,7 @@ mainbox {
 /*****----- Imagebox -----*****/
 imagebox {
     background-color:            transparent;
-    background-image:            url("~/.config/rofi/images/e.jpg", height);
+    background-image:            url("./images/e.jpg", height);
     children:                    [ "dummy", "inputbar", "dummy" ];
 }
 

diff --git a/files/applets/type-5/style-2.rasi b/files/applets/type-5/style-2.rasi
@@ -60,7 +60,7 @@ mainbox {
 imagebox {
     border-radius:               20px;
     background-color:            transparent;
-    background-image:            url("~/.config/rofi/images/j.jpg", height);
+    background-image:            url("./images/j.jpg", height);
     children:                    [ "dummy", "inputbar", "dummy" ];
 }
 

diff --git a/files/applets/type-5/style-3.rasi b/files/applets/type-5/style-3.rasi
@@ -62,7 +62,7 @@ imagebox {
     border-radius:               100%;
     border-color:                @selected;
     background-color:            transparent;
-    background-image:            url("~/.config/rofi/images/g.png", height);
+    background-image:            url("./images/g.png", height);
     children:                    [ "dummy", "inputbar", "dummy" ];
 }
 

diff --git a/files/launchers/type-1/launcher.sh b/files/launchers/type-1/launcher.sh
@@ -11,10 +11,16 @@
 ## style-6     style-7     style-8     style-9     style-10
 ## style-11    style-12    style-13    style-14    style-15
 
-dir="$HOME/.config/rofi/launchers/type-1"
-theme='style-1'
+INPUT_THEME=$1  
+SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
+theme=$($SCRIPT_DIR/../../shared/theme.sh "$SCRIPT_DIR" '1' '15' "$INPUT_THEME")
+
+if [ $? -ne 0 ]; then
+    echo $theme
+    exit 1
+fi
 
 ## Run
 rofi \
     -show drun \
-    -theme ${dir}/${theme}.rasi
+    -theme $theme
diff --git a/files/launchers/type-1/shared/colors.rasi b/files/launchers/type-1/shared/colors.rasi
@@ -15,4 +15,4 @@
 
 /* Import color-scheme from `colors` directory */
 
-@import "~/.config/rofi/colors/onedark.rasi"
+@import "../../../colors/onedark.rasi"
diff --git a/files/launchers/type-2/launcher.sh b/files/launchers/type-2/launcher.sh
@@ -11,10 +11,16 @@
 ## style-6     style-7     style-8     style-9     style-10
 ## style-11    style-12    style-13    style-14    style-15
 
-dir="$HOME/.config/rofi/launchers/type-2"
-theme='style-1'
+INPUT_THEME=$1  
+SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
+theme=$($SCRIPT_DIR/../../shared/theme.sh "$SCRIPT_DIR" '1' '15' "$INPUT_THEME")
+
+if [ $? -ne 0 ]; then
+    echo $theme
+    exit 1
+fi
 
 ## Run
 rofi \
     -show drun \
-    -theme ${dir}/${theme}.rasi
+    -theme $theme
diff --git a/files/launchers/type-2/shared/colors.rasi b/files/launchers/type-2/shared/colors.rasi
@@ -15,4 +15,4 @@
 
 /* Import color-scheme from `colors` directory */
 
-@import "~/.config/rofi/colors/onedark.rasi"
+@import "../../../colors/onedark.rasi"
diff --git a/files/launchers/type-3/launcher.sh b/files/launchers/type-3/launcher.sh
@@ -10,10 +10,18 @@
 ## style-1     style-2     style-3     style-4     style-5
 ## style-6     style-7     style-8     style-9     style-10
 
-dir="$HOME/.config/rofi/launchers/type-3"
-theme='style-10'
+INPUT_THEME=$1  
+SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
+theme=$($SCRIPT_DIR/../../shared/theme.sh "$SCRIPT_DIR" '10' '10' "$INPUT_THEME")
+
+if [ $? -ne 0 ]; then
+    echo $theme
+    exit 1
+fi
+
+
 
 ## Run
 rofi \
     -show drun \
-    -theme ${dir}/${theme}.rasi
+    -theme $theme
diff --git a/files/launchers/type-3/shared/colors.rasi b/files/launchers/type-3/shared/colors.rasi
@@ -15,4 +15,4 @@
 
 /* Import color-scheme from `colors` directory */
 
-@import "~/.config/rofi/colors/onedark.rasi"
+@import "../../../colors/onedark.rasi"
diff --git a/files/launchers/type-4/launcher.sh b/files/launchers/type-4/launcher.sh
@@ -10,10 +10,16 @@
 ## style-1     style-2     style-3     style-4     style-5
 ## style-6     style-7     style-8     style-9     style-10
 
-dir="$HOME/.config/rofi/launchers/type-4"
-theme='style-1'
+INPUT_THEME=$1  
+SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
+theme=$($SCRIPT_DIR/../../shared/theme.sh "$SCRIPT_DIR" '1' '10' "$INPUT_THEME")
+
+if [ $? -ne 0 ]; then
+    echo $theme
+    exit 1
+fi
 
 ## Run
 rofi \
     -show drun \
-    -theme ${dir}/${theme}.rasi
+    -theme $theme
diff --git a/files/launchers/type-4/shared/colors.rasi b/files/launchers/type-4/shared/colors.rasi
@@ -15,4 +15,4 @@
 
 /* Import color-scheme from `colors` directory */
 
-@import "~/.config/rofi/colors/onedark.rasi"
+@import "../../../colors/onedark.rasi"
diff --git a/files/launchers/type-5/launcher.sh b/files/launchers/type-5/launcher.sh
@@ -9,10 +9,16 @@
 #
 ## style-1     style-2     style-3     style-4     style-5
 
-dir="$HOME/.config/rofi/launchers/type-5"
-theme='style-1'
+INPUT_THEME=$1  
+SCRIPT_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
+theme=$($SCRIPT_DIR/../../shared/theme.sh "$SCRIPT_DIR" '1' '5' "$INPUT_THEME")
+
+if [ $? -ne 0 ]; then
+    echo $theme
+    exit 1
+fi
 
 ## Run
 rofi \
     -show drun \
-    -theme ${dir}/${theme}.rasi
+    -theme $theme
diff --git a/files/launchers/type-5/style-1.rasi b/files/launchers/type-5/style-1.rasi
@@ -39,7 +39,7 @@ window {
     border-radius:               0px;
     border-color:                black;
     cursor:                      "default";
-    background-image:            url("~/.config/rofi/images/paper.png", none);
+    background-image:            url("./images/paper.png", none);
 }
 
 /*****----- Main Box -----*****/

diff --git a/files/launchers/type-5/style-2.rasi b/files/launchers/type-5/style-2.rasi
@@ -41,7 +41,7 @@ window {
     padding:                     0px;
     border-radius:               12px;
     cursor:                      "default";
-    background-image:            url("~/.config/rofi/images/gradient.png", width);
+    background-image:            url("./images/gradient.png", width);
 }
 
 /*****----- Main Box -----*****/

diff --git a/files/launchers/type-5/style-5.rasi b/files/launchers/type-5/style-5.rasi
@@ -42,7 +42,7 @@ window {
     border-radius:               20px;
     cursor:                      "default";
     background-color:            #162022;
-    background-image:            url("~/.config/rofi/images/flowers-1.png", width);
+    background-image:            url("./images/flowers-1.png", width);
 }
 
 /*****----- Main Box -----*****/
@@ -63,7 +63,7 @@ inputbar {
     border:                      2px;
     border-radius:               20px;
     border-color:                white;
-    background-image:            url("~/.config/rofi/images/flowers-3.png", none);
+    background-image:            url("./images/flowers-3.png", none);
     children:                    [ "textbox-prompt-colon", "entry" ];
 }
 
@@ -108,7 +108,7 @@ listview {
     border:                      2px;
     border-radius:               20px;
     border-color:                white;
-    background-image:            url("~/.config/rofi/images/flowers-2.png", width);
+    background-image:            url("./images/flowers-2.png", width);
     cursor:                      "default";
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,4 +15,4 @@

		/* Import color-scheme from `colors` directory */

		@import "~/.config/rofi/colors/onedark.rasi"
		@import "../../colors/onedark.rasi"