summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Depmfile2
-rw-r--r--Makefile12
-rwxr-xr-xscripts/cp.sh7
-rwxr-xr-xscripts/set_theme.sh10
4 files changed, 7 insertions, 24 deletions
diff --git a/Depmfile b/Depmfile
index c40e39c..78966f2 100644
--- a/Depmfile
+++ b/Depmfile
@@ -1,2 +1,2 @@
AUR_PACKAGES: light
-ARCH_PACKAGES: adobe-source-code-pro-fonts base-devel imlib2 libwebp xorg libxft feh picom mpc pamixer caja calcurse alsa-utils vim galculator ranger pavucontrol scrot dunst
+ARCH_PACKAGES: adobe-source-code-pro-fonts base-devel inter-font imlib2 libwebp xorg libxft feh picom mpc pamixer caja calcurse alsa-utils vim galculator ranger pavucontrol scrot dunst
diff --git a/Makefile b/Makefile
index 7c3775b..0475fd5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
include config.mk
SHELL := /bin/bash
+CONFIG = config
+include ${CONFIG}
all: sarc
help:
@echo "sarc compilation"
@echo ""
@echo " c, clean: cleans dir"
- @echo " cleanp: really cleans dir"
- @echo " cfg,config: sets a theme for sarc"
@echo " install: installs build"
@echo
@echo "running with no args will just build it"
@@ -16,8 +16,10 @@ config:
@./scripts/set_theme.sh
@echo "Run make to compile sarc"
sarc: clean
- ./scripts/cp.sh
- ${COLOR}
+ cp ./profiles/${PROFILE}/keys.h ./wm/dwm-6.4/
+ cp ./profiles/${PROFILE}/blocks.h ./wm/dwmblocks/
+ cp ./theme/${THEME}/${THEME}.png ~/.config/wallpaper.png
+ cp ./theme/${THEME}/colors.h .
cp wm/${DMENU}/config.h wm/${DMENU}/real_config.h
./scripts/pre_build.sh
mkdir -p ~/.config/sarc/
@@ -42,8 +44,6 @@ clean:
rm -rf colors.h wm/${DMENU}/real_config.h
part:
./scripts/cp.sh
-cleanp: clean
- rm -rf .config
feh_fix:
cp scripts/fehbg ${PREFIX}/bin/
test1:
diff --git a/scripts/cp.sh b/scripts/cp.sh
deleted file mode 100755
index 8fe3ebd..0000000
--- a/scripts/cp.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-source ./sarc.conf
-cp ./profiles/$PROFILE/keys.h ./wm/dwm-6.4/
-cp ./profiles/$PROFILE/blocks.h ./wm/dwmblocks/
-cp ./theme/$THEME/$THEME.png ~/.config/wallpaper.png
-cp ./theme/$THEME/colors.h .
-
diff --git a/scripts/set_theme.sh b/scripts/set_theme.sh
deleted file mode 100755
index b616b4f..0000000
--- a/scripts/set_theme.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-echo "Choose a profile: "; ls ./profiles/
-read profile
-echo "PROFILE=$profile" >> ./.config
-
-echo "Choose a theme:" && ls ./theme/
-read theme
-echo "THEME=$theme" >> ./.config
-echo "Set theme to $theme"