commit e9fd535dbc3f03fdcfc6051c0d5497ba7c9dd0b0
parent 79f30dd9d2e52f9ad54655e6c576eeb05e0d37b1
Author: Mahdi Mirzade <[email protected]>
Date: Sat, 6 Aug 2022 03:26:12 +0430
Improve Makefile, clean config.mk, add Xorg's touchpad tap-to-click
Diffstat:
6 files changed, 130 insertions(+), 109 deletions(-)
diff --git a/Makefile b/Makefile
@@ -7,26 +7,35 @@ help:
@grep '^[a-zA-Z_-]*:.*## .*$$' Makefile \
| awk -F ':.*##' '{printf "\033[34m%-20s\033[0m %s\n", $$1, $$2}'
-arch: ## Install packages for my arch setup from `pkgs-arch.mk`
+arch: ## Install packages for my arch setup from pkgs-arch.mk
$(PACMAN) $(PACMAN_PKGS)
-freebsd: ## Install packages for my freebsd setup from `pkgs-freebsd.mk`
+freebsd: ## Install packages for my freebsd setup from pkgs-freebsd.mk
$(PKG) $(FREEBSD_PKGS)
$(PERM) echo "permit nopass keepenv :wheel" > /usr/local/etc/doas.conf
-freebsd-backup: ## Backup packages from my freebsd setup to `pkgs-freebsd.mk`
- pkg prime-list > freebsd.pkgs
- sed 's/^/FREEBSD_PKGS\t+= /' freebsd.pkgs > freebsd.pkgs.tmp
- mv freebsd.pkgs.tmp freebsd.pkgs
+freebsd-backup: ## Backup packages from my freebsd setup to pkgs-freebsd.mk
+ 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
+
+scheme: ## Create 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
+ 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
+ rm configs-dirs.mk.tmp configs-files.mk.tmp
link: ## Force link dotfiles to $HOME
- @for CONFIG_DIR in $(CONFIGS_DIR); do $(MKDIR) $${HOME}/$$CONFIG_DIR; done
- @for CONFIG in $(CONFIGS); do $(LN) $${PWD}/$$CONFIG $${HOME}/$$CONFIG; done
+ @for CONFIG_MKDIR in $(CONFIGS_MKDIR); do $(MKDIR) $${HOME}/$$CONFIG_MKDIR; done
+ @for CONFIG_FILE in $(CONFIGS_FILES); do $(LN) $${PWD}/$$CONFIG_FILE $${HOME}/$$CONFIG_FILE; done
$(EXTRACT) ${HOME}/.local/share/fonts.tar.gz
copy: ## Force copy dotfiles to $HOME
- @for CONFIG_DIR in $(CONFIGS_DIR); do $(MKDIR) $${HOME}/$$CONFIG_DIR; done
- @for CONFIG in $(CONFIGS); do $(CP) $${PWD}/$$CONFIG $${HOME}/$$CONFIG; done
+ @for CONFIG_DIR in $(CONFIGS_MKDIR); do $(MKDIR) $${HOME}/$$CONFIG_DIR; done
+ @for CONFIG_FILE in $(CONFIGS_FILES); do $(CP) $${PWD}/$$CONFIG_FILE $${HOME}/$$CONFIG_FILE; done
$(EXTRACT) ${HOME}/.local/share/fonts.tar.gz
desktop: dwm dmenu st surf tabbed slock ## Install my suckless desktop suite (dwm/dmenu/st/surf/tabbed/slock)
@@ -34,41 +43,41 @@ desktop: dwm dmenu st surf tabbed slock ## Install my suckless desktop suite (dw
dwm: ## Install my build of dwm
$(MKDIR) ${HOME}/.local/src
rm -rf ${HOME}/.local/src/dwm
- $(GIT) clone git://mahdi.pw/dwm.git ${HOME}/.local/src/dwm
+ cp -rf ${PWD}/.local/src/dwm ${HOME}/.local/src/dwm
cd ${HOME}/.local/src/dwm
$(RUN_PERM) make install
dmenu: ## Install my build of dmenu
$(MKDIR) ${HOME}/.local/src
rm -rf ${HOME}/.local/src/dmenu
- $(GIT) clone git://mahdi.pw/dmenu.git ${HOME}/.local/src/dmenu
+ cp -rf ${PWD}/.local/src/dmenu ${HOME}/.local/src/dmenu
cd ${HOME}/.local/src/dmenu
$(RUN_PERM) make install
st: ## Install my build of st
$(MKDIR) ${HOME}/.local/src
rm -rf ${HOME}/.local/src/st
- $(GIT) clone git://mahdi.pw/st.git ${HOME}/.local/src/st
+ cp -rf ${PWD}/.local/src/st ${HOME}/.local/src/st
cd ${HOME}/.local/src/st
$(RUN_PERM) make install
surf: ## Install my build of surf
$(MKDIR) ${HOME}/.local/src
rm -rf ${HOME}/.local/src/surf
- $(GIT) clone git://mahdi.pw/surf.git ${HOME}/.local/src/surf
+ cp -rf ${PWD}/.local/src/surf ${HOME}/.local/src/surf
cd ${HOME}/.local/src/surf
$(RUN_PERM) make install
tabbed: ## Install my build of tabbed
$(MKDIR) ${HOME}/.local/src
rm -rf ${HOME}/.local/src/tabbed
- $(GIT) clone git://mahdi.pw/tabbed.git ${HOME}/.local/src/tabbed
+ cp -rf ${PWD}/.local/src/tabbed ${HOME}/.local/src/tabbed
cd ${HOME}/.local/src/tabbed
$(RUN_PERM) make install
slock: ## Install by build of slock
$(MKDIR) ${HOME}/.local/src
rm -rf ${HOME}/.local/src/slock
- $(GIT) clone git://mahdi.pw/slock.git ${HOME}/.local/src/slock
+ cp -rf ${PWD}/.local/src/slock ${HOME}/.local/src/slock
cd ${HOME}/.local/src/slock
$(RUN_PERM) make install
diff --git a/config.mk b/config.mk
@@ -1,101 +1,12 @@
--include pkgs-arch.mk
--include pkgs-freebsd.mk
-
CP = cp -f
LN = ln -vsf
-GIT = git
MKDIR = mkdir -p
EXTRACT = tar -C ${HOME}/.local/share -xzf
RUN_PERM = doas
PKG = $(RUN_PERM) pkg install
PACMAN = $(RUN_PERM) pacman --needed -S
-# Necessary directories in $HOME
-CONFIGS_DIR += .config/fontconfig
-CONFIGS_DIR += .config/git
-CONFIGS_DIR += .config/Kvantum
-CONFIGS_DIR += .config/mbsync
-CONFIGS_DIR += .config/mpv
-CONFIGS_DIR += .config/mpv/scripts
-CONFIGS_DIR += .config/mutt
-CONFIGS_DIR += .config/picom
-CONFIGS_DIR += .config/qutebrowser
-CONFIGS_DIR += .config/shell
-CONFIGS_DIR += .config/surf
-CONFIGS_DIR += .config/surf/styles
-CONFIGS_DIR += .config/vis
-CONFIGS_DIR += .config/wget
-CONFIGS_DIR += .config/x11
-CONFIGS_DIR += .config/x11/themes
-CONFIGS_DIR += .config/yt-dlp
-CONFIGS_DIR += .config/zathura
-CONFIGS_DIR += .local/bin
-CONFIGS_DIR += .local/share
-
-# Config files
-CONFIGS += .config/fontconfig/fonts.conf
-CONFIGS += .config/git/config
-CONFIGS += .config/Kvantum/kvantum.kvconfig
-CONFIGS += .config/mbsync/mbsyncrc
-CONFIGS += .config/mpv/input.conf
-CONFIGS += .config/mpv/mpv.conf
-CONFIGS += .config/mpv/scripts/mpvSockets.lua
-CONFIGS += .config/mpv/scripts/SmartCopyPaste.lua
-CONFIGS += .config/mutt/alias
-CONFIGS += .config/mutt/display
-CONFIGS += .config/mutt/mailcap
-CONFIGS += .config/mutt/muttrc
-CONFIGS += .config/mutt/muttrc.bak
-CONFIGS += .config/picom/picom.conf
-CONFIGS += .config/qutebrowser/config.py
-CONFIGS += .config/shell/aliasrc
-CONFIGS += .config/shell/inputrc
-CONFIGS += .config/shell/profile
-CONFIGS += .config/surf/script.js
-CONFIGS += .config/surf/styles/default.css
-CONFIGS += .config/surf/styles/default.css.in
-CONFIGS += .config/vis/visrc.lua
-CONFIGS += .config/wget/wgetrc
-CONFIGS += .config/x11/colors
-CONFIGS += .config/x11/fonts
-CONFIGS += .config/x11/themes/dracula
-CONFIGS += .config/x11/themes/gruvbox-dark
-CONFIGS += .config/x11/themes/nord
-CONFIGS += .config/x11/themes/oceanic-next
-CONFIGS += .config/x11/themes/onedark
-CONFIGS += .config/x11/themes/solarized-dark
-CONFIGS += .config/x11/themes/tomorrownight
-CONFIGS += .config/x11/xinitrc
-CONFIGS += .config/x11/xresources
-CONFIGS += .config/yt-dlp/config
-CONFIGS += .config/zathura/zathurarc
-CONFIGS += .config/zathura/zathurarc.in
-CONFIGS += .local/bin/bright
-CONFIGS += .local/bin/bg-gen
-CONFIGS += .local/bin/bg-set
-CONFIGS += .local/bin/dmenu-archwiki
-CONFIGS += .local/bin/dmenu-askpass
-CONFIGS += .local/bin/dmenu-emoji
-CONFIGS += .local/bin/dmenu-fix-sheet
-CONFIGS += .local/bin/dmenu-man
-CONFIGS += .local/bin/dmenu-mpd
-CONFIGS += .local/bin/dmenu-power
-CONFIGS += .local/bin/dmenu-record
-CONFIGS += .local/bin/doas-askpass
-CONFIGS += .local/bin/dwm-bar
-CONFIGS += .local/bin/email
-CONFIGS += .local/bin/ix
-CONFIGS += .local/bin/lock
-CONFIGS += .local/bin/media-controller
-CONFIGS += .local/bin/metch
-CONFIGS += .local/bin/pacman-rm
-CONFIGS += .local/bin/pacman-up
-CONFIGS += .local/bin/screenshot
-CONFIGS += .local/bin/theme-sel
-CONFIGS += .local/bin/toggle-touch
-CONFIGS += .local/bin/upload
-CONFIGS += .local/bin/volume
-CONFIGS += .local/bin/webcam
-CONFIGS += .local/share/fonts.tar.gz
-CONFIGS += .kshrc
-CONFIGS += .mkshrc
+-include pkgs-arch.mk
+-include pkgs-freebsd.mk
+-include configs-dirs.mk
+-include configs-files.mk
diff --git a/configs-dirs.mk b/configs-dirs.mk
@@ -0,0 +1,25 @@
+CONFIGS_MKDIR += .config
+CONFIGS_MKDIR += .config/Kvantum
+CONFIGS_MKDIR += .config/fontconfig
+CONFIGS_MKDIR += .config/git
+CONFIGS_MKDIR += .config/mbsync
+CONFIGS_MKDIR += .config/mpv
+CONFIGS_MKDIR += .config/mpv/scripts
+CONFIGS_MKDIR += .config/mutt
+CONFIGS_MKDIR += .config/picom
+CONFIGS_MKDIR += .config/qutebrowser
+CONFIGS_MKDIR += .config/shell
+CONFIGS_MKDIR += .config/surf
+CONFIGS_MKDIR += .config/surf/styles
+CONFIGS_MKDIR += .config/vis
+CONFIGS_MKDIR += .config/wget
+CONFIGS_MKDIR += .config/x11
+CONFIGS_MKDIR += .config/x11/themes
+CONFIGS_MKDIR += .config/yt-dlp
+CONFIGS_MKDIR += .config/zathura
+CONFIGS_MKDIR += .local
+CONFIGS_MKDIR += .local/bin
+CONFIGS_MKDIR += .local/run
+CONFIGS_MKDIR += .local/share
+CONFIGS_MKDIR += .local/src
+CONFIGS_MKDIR += .local/state
diff --git a/configs-files.mk b/configs-files.mk
@@ -0,0 +1,69 @@
+CONFIGS_FILES += .config/Kvantum/kvantum.kvconfig
+CONFIGS_FILES += .config/fontconfig/fonts.conf
+CONFIGS_FILES += .config/git/config
+CONFIGS_FILES += .config/mbsync/mbsyncrc
+CONFIGS_FILES += .config/mpv/input.conf
+CONFIGS_FILES += .config/mpv/mpv.conf
+CONFIGS_FILES += .config/mpv/scripts/SmartCopyPaste.lua
+CONFIGS_FILES += .config/mpv/scripts/mpvSockets.lua
+CONFIGS_FILES += .config/mutt/alias
+CONFIGS_FILES += .config/mutt/display
+CONFIGS_FILES += .config/mutt/mailcap
+CONFIGS_FILES += .config/mutt/muttrc
+CONFIGS_FILES += .config/mutt/muttrc.bak
+CONFIGS_FILES += .config/picom/picom.conf
+CONFIGS_FILES += .config/qutebrowser/config.py
+CONFIGS_FILES += .config/shell/aliasrc
+CONFIGS_FILES += .config/shell/inputrc
+CONFIGS_FILES += .config/shell/profile
+CONFIGS_FILES += .config/surf/script.js
+CONFIGS_FILES += .config/surf/styles/default.css
+CONFIGS_FILES += .config/surf/styles/default.css.in
+CONFIGS_FILES += .config/vis/visrc.lua
+CONFIGS_FILES += .config/wget/wgetrc
+CONFIGS_FILES += .config/x11/colors
+CONFIGS_FILES += .config/x11/fonts
+CONFIGS_FILES += .config/x11/themes/dracula
+CONFIGS_FILES += .config/x11/themes/gruvbox-dark
+CONFIGS_FILES += .config/x11/themes/nord
+CONFIGS_FILES += .config/x11/themes/oceanic-next
+CONFIGS_FILES += .config/x11/themes/onedark
+CONFIGS_FILES += .config/x11/themes/solarized-dark
+CONFIGS_FILES += .config/x11/themes/tomorrownight
+CONFIGS_FILES += .config/x11/xinitrc
+CONFIGS_FILES += .config/x11/xresources
+CONFIGS_FILES += .config/yt-dlp/config
+CONFIGS_FILES += .config/zathura/zathurarc
+CONFIGS_FILES += .config/zathura/zathurarc.in
+CONFIGS_FILES += .kshrc
+CONFIGS_FILES += .local/bin/bg-gen
+CONFIGS_FILES += .local/bin/bg-set
+CONFIGS_FILES += .local/bin/bright
+CONFIGS_FILES += .local/bin/dmenu-archwiki
+CONFIGS_FILES += .local/bin/dmenu-askpass
+CONFIGS_FILES += .local/bin/dmenu-emoji
+CONFIGS_FILES += .local/bin/dmenu-fix-sheet
+CONFIGS_FILES += .local/bin/dmenu-man
+CONFIGS_FILES += .local/bin/dmenu-mpd
+CONFIGS_FILES += .local/bin/dmenu-power
+CONFIGS_FILES += .local/bin/dmenu-record
+CONFIGS_FILES += .local/bin/doas-askpass
+CONFIGS_FILES += .local/bin/dwm-bar
+CONFIGS_FILES += .local/bin/email
+CONFIGS_FILES += .local/bin/ix
+CONFIGS_FILES += .local/bin/lock
+CONFIGS_FILES += .local/bin/media-controller
+CONFIGS_FILES += .local/bin/metch
+CONFIGS_FILES += .local/bin/pacman-rm
+CONFIGS_FILES += .local/bin/pacman-up
+CONFIGS_FILES += .local/bin/screenshot
+CONFIGS_FILES += .local/bin/theme-sel
+CONFIGS_FILES += .local/bin/toggle-touch
+CONFIGS_FILES += .local/bin/upload
+CONFIGS_FILES += .local/bin/volume
+CONFIGS_FILES += .local/bin/vpn
+CONFIGS_FILES += .local/bin/webcam
+CONFIGS_FILES += .local/share/fonts.tar.gz
+CONFIGS_FILES += .mkshrc
+CONFIGS_FILES += .profile
+CONFIGS_FILES += .viminfo
diff --git a/etc/X11/xorg.conf.d/40-libinput.conf b/etc/X11/xorg.conf.d/40-libinput.conf
@@ -0,0 +1,7 @@
+Section "InputClass"
+ Identifier "libinput touchpad catchall"
+ MatchIsTouchpad "on"
+ MatchDevicePath "/dev/input/event*"
+ Driver "libinput"
+ Option "Tapping" "on"
+EndSection
diff --git a/scheme-dirs.mk b/scheme-dirs.mk
