Updated Dots Configuration

2 files changed, 22 insertions, 29 deletions

diff --git a/scripts/.local/bin/colorset b/scripts/.local/bin/colorset
index 38eb44c..6eaf9e4 100755
--- a/scripts/.local/bin/colorset
+++ b/scripts/.local/bin/colorset
@@ -7,41 +7,38 @@ else
 fi
 
 # Checking for non-existant dirs
-! [ -f "$SUCK"/colors/dmenu ] && mkdir -p "$SUCK"/colors/dmenu
-! [ -f "$SUCK"/colors/dwm ] && mkdir -p "$SUCK"/colors/dwm
-! [ -f "$SUCK"/colors/neovimb/src ] && mkdir -p "$SUCK"/colors/neovimb/src
-! [ -f "$SUCK"/colors/st ] && mkdir -p "$SUCK"/colors/st
+! [ -f "$SRC"/colors/dmenu ] && mkdir -p "$SRC"/colors/dmenu
+! [ -f "$SRC"/colors/dwm ] && mkdir -p "$SRC"/colors/dwm
+! [ -f "$SRC"/colors/neovimb/src ] && mkdir -p "$SRC"/colors/neovimb/src
+! [ -f "$SRC"/colors/st ] && mkdir -p "$SRC"/colors/st
 
 # Purging previous colorscheme files
-convert "$1" "$SUCK"/colors/wallpaper.png
+convert "$1" "$SRC"/colors/wallpaper.png
 
 # Setting the new colorscheme based on the wallpaper and making some color tweaks
-cp -rf ~/.cache/wal/colors-wal-dmenu.h "$SUCK"/colors/dmenu/colors.h
-cp -rf ~/.cache/wal/colors-wal-st.h "$SUCK"/colors/st/colors.h
-head -7 ~/.cache/wal/colors-wal-dwm.h > "$SUCK"/colors/dwm/colors.h
-sed -i s/"$(grep norm_border "$SUCK"/colors/dwm/colors.h | cut -d# -f 2 | cut -d\" -f 1)"/"$(grep black "$SUCK"/colors/st/colors.h | head -1 | cut -d# -f 2 | cut -d\" -f 1)"/g "$SUCK"/colors/dwm/colors.h
+cp -rf ~/.cache/wal/colors-wal-dmenu.h "$SRC"/colors/dmenu/colors.h
+cp -rf ~/.cache/wal/colors-wal-st.h "$SRC"/colors/st/colors.h
+head -7 ~/.cache/wal/colors-wal-dwm.h > "$SRC"/colors/dwm/colors.h
+sed -i s/"$(grep norm_border "$SRC"/colors/dwm/colors.h | cut -d# -f 2 | cut -d\" -f 1)"/"$(grep black "$SRC"/colors/st/colors.h | head -1 | cut -d# -f 2 | cut -d\" -f 1)"/g "$SRC"/colors/dwm/colors.h
 
 ###
-cp -rf "$XDG_CONFIG_HOME"/neovimb/config.h "$SUCK"/colors/neovimb/src/
+cp -rf "$XDG_CONFIG_HOME"/suckless/neovimb/config.h "$SRC"/colors/neovimb/src/
 ###
-OLDSTRING=$(grep SETTING_INPUT_CSS "$SUCK"/colors/neovimb/src/config.h)
-NEWSTRING="#define SETTING_INPUT_CSS                     \"background-color:$(head -2 "$SUCK"/colors/dwm/colors.h | grep bg | cut -d\" -f2);color:$(head -2 "$SUCK"/colors/dwm/colors.h | grep fg | cut -d\" -f2);font:\" SETTING_GUI_FONT_NORMAL"
-sed -i s."$OLDSTRING"."$NEWSTRING".g "$SUCK"/colors/neovimb/src/config.h
+OLDSTRING=$(grep SETTING_INPUT_CSS "$SRC"/colors/neovimb/src/config.h)
+NEWSTRING="#define SETTING_INPUT_CSS                     \"background-color:$(head -2 "$SRC"/colors/dwm/colors.h | grep bg | cut -d\" -f2);color:$(head -2 "$SRC"/colors/dwm/colors.h | grep fg | cut -d\" -f2);font:\" SETTING_GUI_FONT_NORMAL"
+sed -i s."$OLDSTRING"."$NEWSTRING".g "$SRC"/colors/neovimb/src/config.h
 ###
-OLDSTRING=$(grep SETTING_STATUS_CSS "$SUCK"/colors/neovimb/src/config.h)
-NEWSTRING="#define SETTING_STATUS_CSS                    \"color:$(tail -3 "$SUCK"/colors/dwm/colors.h | grep fg | cut -d\" -f2);background-color:$(tail -3 "$SUCK"/colors/dwm/colors.h | grep bg | cut -d\" -f2);font:\" SETTING_GUI_FONT_EMPH"
-sed -i s."$OLDSTRING"."$NEWSTRING".g "$SUCK"/colors/neovimb/src/config.h
+OLDSTRING=$(grep SETTING_STATUS_CSS "$SRC"/colors/neovimb/src/config.h)
+NEWSTRING="#define SETTING_STATUS_CSS                    \"color:$(tail -3 "$SRC"/colors/dwm/colors.h | grep fg | cut -d\" -f2);background-color:$(tail -3 "$SRC"/colors/dwm/colors.h | grep bg | cut -d\" -f2);font:\" SETTING_GUI_FONT_EMPH"
+sed -i s."$OLDSTRING"."$NEWSTRING".g "$SRC"/colors/neovimb/src/config.h
 ###
-OLDSTRING=$(grep SETTING_STATUS_SSL_CSS "$SUCK"/colors/neovimb/src/config.h)
-NEWSTRING="#define SETTING_STATUS_SSL_CSS                \"background-color:$(tail -3 "$SUCK"/colors/dwm/colors.h | grep bg | cut -d\" -f2);color:$(tail -3 "$SUCK"/colors/dwm/colors.h | grep fg | cut -d\" -f2);\""
-sed -i s."$OLDSTRING"."$NEWSTRING".g "$SUCK"/colors/neovimb/src/config.h
+OLDSTRING=$(grep SETTING_STATUS_SSL_CSS "$SRC"/colors/neovimb/src/config.h)
+NEWSTRING="#define SETTING_STATUS_SSL_CSS                \"background-color:$(tail -3 "$SRC"/colors/dwm/colors.h | grep bg | cut -d\" -f2);color:$(tail -3 "$SRC"/colors/dwm/colors.h | grep fg | cut -d\" -f2);\""
+sed -i s."$OLDSTRING"."$NEWSTRING".g "$SRC"/colors/neovimb/src/config.h
 
 # Recompiling Suckless Programs with new colorscheme
-cp -rf "$SUCK"/colors/* "$SUCK"
-cp -rf "$SUCK"/colors/wallpaper.png ~/.config/wallpaper
+cp -rf "$SRC"/colors/* "$SRC"
+cp -rf "$SRC"/colors/wallpaper.png ~/.config/wallpaper
 
 xwallpaper --stretch "$WALLPAPER"
-cd "$SUCK"/dwm && git pull ; doas make clean install ; make clean
-cd "$SUCK"/dmenu && git pull ; doas make clean install ; make clean
-cd "$SUCK"/neovimb && git pull ; doas make clean install ; make clean
-cd "$SUCK"/st && git pull ; doas make clean install ; make clean
+"$SRC"/compileSource
diff --git a/scripts/.local/bin/flatpaks b/scripts/.local/bin/flatpaks
deleted file mode 100755
index 9e07a58..0000000
--- a/scripts/.local/bin/flatpaks
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# Flatpak Run Script
-flatpak run "$(flatpak list --app --columns=application | grep -vi "Application ID" | dmenu -i -l 15 -p "Flatpak:")"