commit a51eb8e65f29ef0b2f9ea301e250e5da96054b90
parent 853b49539924c24f529297a501532419301cd7e5
Author: Mahdi Mirzade <[email protected]>
Date: Sun, 9 Oct 2022 02:11:13 +0330
divide 'Makefile's backup commands into 'Backup' for more clean interface, remove junk from README
Diffstat:
| M | Makefile | | | 67 | +++++++++++++++++-------------------------------------------------- |
| M | README | | | 1 | - |
2 files changed, 17 insertions(+), 51 deletions(-)
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@
include config.mk
help:
- @grep '^[a-zA-Z_-]*:.*## .*$$' Makefile \
+ @grep '^[a-zA-Z0-9_-]*:.*## .*$$' Makefile \
| awk -F ':.*##' '{printf "\033[34m%-20s\033[0m %s\n", $$1, $$2}'
font: ## Install fonts to $HOME/.local/share/fonts
@@ -37,39 +37,6 @@ freebsd: ## Install packages for my freebsd setup
$(INSTALL_FREEBSD) $(FREEBSD_PKGS)
$(RUN_PERM) $(CP) etc/doas.conf /usr/local/etc/doas.conf
-backup-arch: ## Backup packages from my arch setup
- pacman -Q | awk '{print $1}' > pkgs-arch.mk
- sed 's/^/ARCH_PKGS\t+= /' pkgs-arch.mk > pkgs-arch.mk.tmp
- mv pkgs-arch.mk.tmp pkgs-arch.mk
- mv pkgs-arch.mk inc/pkgs-arch.mk
-
-backup-alpine: ## Backup packages from my alpine setup
- cat /etc/apk/world > pkgs-alpine.mk
- sed 's/^/ALPINE_PKGS\t+= /' pkgs-alpine.mk > pkgs-alpine.mk.tmp
- mv pkgs-alpine.mk.tmp pkgs-alpine.mk
- mv pkgs-alpine.mk inc/pkgs-alpine.mk
-
-backup-freebsd: ## Backup packages from my freebsd setup
- pkg prime-list > pkgs-freebsd.mk
- sed 's/^/FREEBSD_PKGS\t+= /' pkgs-freebsd.mk > pkgs-freebsd.mk.tmp
- mv pkgs-freebsd.mk.tmp pkgs-freebsd.mk
- mv pkgs-freebsd.mk inc/pkgs-freebsd.mk
-
-backup-scheme: ## Generate inc/{configs-dirs.mk,configs-files.mk}
- find . -type d > configs-dirs.mk
- sort configs-dirs.mk > configs-dirs.mk.tmp
- sed 's/^\.\///g;/^\.$$/d;/^\.git/d;/^\./!d;/^\.local\/src\//d;s/^/CONFIGS_MKDIR\t+= /' configs-dirs.mk.tmp > configs-dirs.mk
- mv configs-dirs.mk inc/configs-dirs.mk
- find . -type f > configs-files.mk
- sort configs-files.mk > configs-files.mk.tmp
- sed 's/^\.\///g;/^\.$$/d;/^\.git/d;/^\./!d;/^\.local\/src\//d;s/^/CONFIGS_FILES\t+= /' configs-files.mk.tmp > configs-files.mk
- mv configs-files.mk inc/configs-files.mk
- rm configs-dirs.mk.tmp configs-files.mk.tmp
-
-backup-files: ## Force copy files from ~/ to ./ (inc/configs-files.mk)
- @for CONFIG_FILE in $(CONFIGS_FILES); do $(CP) $${HOME}/$$CONFIG_FILE $${PWD}/$$CONFIG_FILE; done
- $(RUN_PERM) $(CP) /etc/X11/xorg.conf.d/40-libinput.conf etc/X11/xorg.conf.d/40-libinput.conf
-
# --------------------------------- #
# | Suckless software collection: | #
# --------------------------------- #
@@ -81,13 +48,6 @@ dmenu: ## Install my build of dmenu
cp -rf ${PWD}/.local/src/dmenu ${HOME}/.local/src/dmenu
cd ${HOME}/.local/src/dmenu; $(RUN_PERM) make install
-dzen2: ## Install dzen2
- $(MKDIR) ${HOME}/.local/src
- rm -rf ${HOME}/.local/src/dzen2
- git submodule update --init --remote ${PWD}/.local/src/dzen2
- cp -rf ${PWD}/.local/src/dzen2 ${HOME}/.local/src/dzen2
- cd ${HOME}/.local/src/dzen2; $(RUN_PERM) make install
-
dwm: ## Install my build of dwm
$(MKDIR) ${HOME}/.local/src
rm -rf ${HOME}/.local/src/dwm
@@ -102,13 +62,6 @@ slock: ## Install my build of slock
cp -rf ${PWD}/.local/src/slock ${HOME}/.local/src/slock
cd ${HOME}/.local/src/slock; $(RUN_PERM) make install
-smenu: ## Install smenu
- $(MKDIR) ${HOME}/.local/src
- rm -rf ${HOME}/.local/src/smenu
- git submodule update --init --remote ${PWD}/.local/src/smenu
- cp -rf ${PWD}/.local/src/smenu ${HOME}/.local/src/smenu
- cd ${HOME}/.local/src/slock; ./configure; ./build.sh; $(RUN_PERM) make install
-
st: ## Install my build of st
$(MKDIR) ${HOME}/.local/src
rm -rf ${HOME}/.local/src/st
@@ -130,11 +83,25 @@ tabbed: ## Install my build of tabbed
cp -rf ${PWD}/.local/src/tabbed ${HOME}/.local/src/tabbed
cd ${HOME}/.local/src/tabbed; $(RUN_PERM) make install
-xwallpaper: ## Install my build of xwallpaper
+dzen2: ## Install dzen2
+ $(MKDIR) ${HOME}/.local/src
+ rm -rf ${HOME}/.local/src/dzen2
+ git submodule update --init --remote ${PWD}/.local/src/dzen2
+ cp -rf ${PWD}/.local/src/dzen2 ${HOME}/.local/src/dzen2
+ cd ${HOME}/.local/src/dzen2; $(RUN_PERM) make install
+
+smenu: ## Install smenu
+ $(MKDIR) ${HOME}/.local/src
+ rm -rf ${HOME}/.local/src/smenu
+ git submodule update --init --remote ${PWD}/.local/src/smenu
+ cp -rf ${PWD}/.local/src/smenu ${HOME}/.local/src/smenu
+ cd ${HOME}/.local/src/slock; ./configure; ./build.sh; $(RUN_PERM) make install
+
+xwallpaper: ## Install xwallpaper
$(MKDIR) ${HOME}/.local/src
rm -rf ${HOME}/.local/src/xwallpaper
git submodule update --init --remote ${PWD}/.local/src/xwallpaper
cp -rf ${PWD}/.local/src/xwallpaper ${HOME}/.local/src/xwallpaper
cd ${HOME}/.local/src/xwallpaper; ./autogen.sh; $(RUN_PERM) make install
-desktop: dmenu dzen2 dwm slock smenu st surf tabbed xwallpaper ## Install my suckless desktop suite (dmenu/dzen2/dwm/slock/smenu/st/surf/tabbed/xwallpaper)
+desktop: dmenu dwm slock st surf tabbed dzen2 smenu xwallpaper ## Install my suckless desktop suite (dmenu/dwm/slock/st/surf/tabbed/dzen2/smenu/xwallpaper)
diff --git a/README b/README
@@ -9,7 +9,6 @@ dotfiles
├── mpv: Audio/Video player
├── mutt: Email client
├── qutebrowser: Web browser [Backup to surf]
-├── shell: Shell configuration/Env files
├── surf: Web browser
├── vis: Text editor
├── wget: Network downloader
