Merge pull request #13 from sfarajli/dev

Dev

6 files changed, 115 insertions, 71 deletions

diff --git a/Makefile b/Makefile
index 1928b2b..ad2fc39 100644
--- a/Makefile
+++ b/Makefile
@@ -1,51 +1,58 @@
 .POSIX:
 
-DWM = dwm-farajli-6.5
-ST = st-farajli-0.9.2
-DMENU = dmenu-farajli-5.3
-SLSTATUS = slstatus-farajli-1.0
-
-CONFDIR = $(HOME)/.config
-MUSICDIR = $(HOME)/music
-PROJDIR = $(HOME)/proj
-BOOKDIR = $(HOME)/tproj
+DWM         = dwm-farajli-6.5
+ST          = st-farajli-0.9.2
+DMENU       = dmenu-farajli-5.3
+SLSTATUS    = slstatus-farajli-1.0
+FONT1       = LiberationMono
+FONT2       = JetBrainsMono
+
+SOFTWARE    = $(DWM) $(DMENU) $(SLSTATUS) $(ST)
+FONTS       = $(FONT1) $(FONT2)
+ARCHIVE     = $(SOFTWARE:=.tar.gz) $(FONTS:=.tar.gz)
+
+CONFDIR     = $(HOME)/.config
+MUSICDIR    = $(HOME)/music
+PROJDIR     = $(HOME)/proj
+BOOKDIR     = $(HOME)/tproj
 TESTPROJDIR = $(HOME)/tproj
-BINDIR = $(HOME)/.local/bin
+BINDIR      = $(HOME)/.local/bin
+FONTDIR     = $(HOME)/.local/share/fonts/
 
-BASHRC = $(HOME)/.bashrc
-ZSHRC = $(HOME)/.zshrc
-ZPROFILE = $(HOME)/.zprofile
+BASHRC      = $(HOME)/.bashrc
+ZSHRC       = $(HOME)/.zshrc
+ZPROFILE    = $(HOME)/.zprofile
 BASHPROFILE = $(HOME)/.bash_profile
-GITCONFIG = $(HOME)/.gitconfig
+GITCONFIG   = $(HOME)/.gitconfig
 
-COPY = cp -r
-LINK = ln -sf
+COPY        = cp -r
+LINK        = ln -sf
 
-all: config scripts directory check
+all: config scripts directory
 
-full: config scripts git directory desktop
+full: config scripts directory desktop
 
-desktop: $(DWM) $(ST) $(DMENU) $(SLSTATUS)
+desktop: dmenu-install dwm-install slstatus-install st-install font1-install font2-install check
 
 config:
 	mkdir -p $(CONFDIR)/sites
-	$(COPY) config/bash/bashrc		$(BASHRC)
-	$(COPY) config/zsh/zshrc		$(ZSHRC)
-	$(COPY) config/lf 			$(CONFDIR)
-	$(COPY) config/mpv 			$(CONFDIR)
-	$(COPY) config/sxiv 			$(CONFDIR)
-	$(COPY) config/nsxiv 			$(CONFDIR)
-	$(COPY) config/picom 			$(CONFDIR)
-	$(COPY) config/qutebrowser 		$(CONFDIR)
-	$(COPY) config/shell 			$(CONFDIR)
-	$(COPY) config/vim			$(CONFDIR)
-	$(COPY) config/nvim			$(CONFDIR)
-	$(COPY) config/x11 			$(CONFDIR)
-	$(COPY) config/zathura 			$(CONFDIR)
-	$(COPY) config/mimeapps.list 		$(CONFDIR)
-	$(COPY) config/sites/bookmarks.txt 	$(CONFDIR)/sites
-	$(LINK) $(CONFDIR)/shell/profile	$(BASHPROFILE)
-	$(LINK) $(CONFDIR)/shell/profile	$(ZPROFILE)
+	$(COPY) config/bash/bashrc              $(BASHRC)
+	$(COPY) config/zsh/zshrc                $(ZSHRC)
+	$(COPY) config/lf                       $(CONFDIR)
+	$(COPY) config/mpv                      $(CONFDIR)
+	$(COPY) config/sxiv                     $(CONFDIR)
+	$(COPY) config/nsxiv                    $(CONFDIR)
+	$(COPY) config/picom                    $(CONFDIR)
+	$(COPY) config/qutebrowser              $(CONFDIR)
+	$(COPY) config/shell                    $(CONFDIR)
+	$(COPY) config/vim                      $(CONFDIR)
+	$(COPY) config/nvim                     $(CONFDIR)
+	$(COPY) config/x11                      $(CONFDIR)
+	$(COPY) config/zathura                  $(CONFDIR)
+	$(COPY) config/mimeapps.list            $(CONFDIR)
+	$(COPY) config/sites/bookmarks.txt      $(CONFDIR)/sites
+	$(LINK) $(CONFDIR)/shell/profile        $(BASHPROFILE)
+	$(LINK) $(CONFDIR)/shell/profile        $(ZPROFILE)
 
 git:
 	sed '/# signingkey = <to be set manually>/d' config/git/gitconfig > $(GITCONFIG)
@@ -57,41 +64,54 @@ git:
 	@echo "    git config --global user.signingkey <YOUR_KEY_ID>" >&2
 
 scripts:
-	mkdir -p $(BINDIR)
-	$(COPY) scripts/* 			$(BINDIR)
+	mkdir -p          $(BINDIR)
+	$(COPY) scripts/* $(BINDIR)
 
 server:
-	$(COPY) config/bash/bashrc 	$(BASHRC)
-	$(COPY) config/zsh/zshrc 	$(ZSHRC)
-	$(COPY) config/lf 		$(CONFDIR)
-	$(COPY) config/shell		$(CONFDIR)
-	$(COPY) config/vim		$(CONFDIR)
+	$(COPY) config/bash/bashrc $(BASHRC)
+	$(COPY) config/zsh/zshrc   $(ZSHRC)
+	$(COPY) config/lf          $(CONFDIR)
+	$(COPY) config/shell       $(CONFDIR)
+	$(COPY) config/vim         $(CONFDIR)
+	$(COPY) scripts/noc
 
 arch-linux:
 	sudo $(COPY) distros/arch-linux/pacman.conf /etc
 
 directory:
-	mkdir -p 	$(CONFDIR) \
-			$(MUSICDIR) \
-			$(PROJDIR) \
-			$(BOOKDIR) \
-			$(TESTPROJDIR) \
-			$(BINDIR)
-
-$(DWM).tar.gz $(ST).tar.gz $(DMENU).tar.gz $(SLSTATUS).tar.gz: clean
+	mkdir -p \
+		$(BINDIR)      \
+		$(BOOKDIR)     \
+		$(CONFDIR)     \
+		$(MUSICDIR)    \
+		$(PROJDIR)     \
+		$(TESTPROJDIR)
+
+sync: $(ARCHIVE)
+
+$(ARCHIVE):
 	curl -LO https://farajli.net/archive/$@
 
-$(DWM): $(DWM).tar.gz
-$(ST): $(ST).tar.gz
-$(DMENU): $(DMENU).tar.gz
-$(SLSTATUS): $(SLSTATUS).tar.gz
+dmenu-install: $(DMENU).tar.gz
+dwm-install: $(DWM).tar.gz
+slstatus-install: $(SLSTATUS).tar.gz
+st-install: $(ST).tar.gz
+font1-install: $(FONT1).tar.gz
+font2-install: $(FONT2).tar.gz
 
-$(DWM) $(ST) $(DMENU) $(SLSTATUS):
-	tar -xf $<
-	cd $@; PREFIX=~/.local make install
+dmenu-install dwm-install slstatus-install st-install:
+	tar xf $<
+	PREFIX=~/.local make -C $$(basename $< .tar.gz) install
+
+font1-install font2-install:
+	tar xf $<
+	$(COPY) $$(basename $< .tar.gz) $(FONTDIR)
 
 check:
-	@-./dep.sh
+	@./dep.sh
+
+fullcheck:
+	@./dep.sh --optional
 
 dist: clean
 	mkdir -p slcf/
@@ -100,10 +120,8 @@ dist: clean
 	rm -rf slcf/
 
 clean:
-	rm -rf slcf/ slcf.tar.gz \
-		$(DWM) $(DWM).tar.gz \
-		$(ST) $(ST).tar.gz \
-		$(DMENU) $(DMENU).tar.gz \
-		$(SLSTATUS) $(SLSTATUS).tar.gz
+	rm -rf slcf/ slcf.tar.gz $(ARCHIVE) $(FONTS) $(SOFTWARE)
 
-.PHONY: all config desktop scripts server arch-linux directory full check
+.PHONY: all arch-linux check clean config desktop directory dist    \
+	dmenu-install dwm-install font1-install font2-install fonts \
+	full fullcheck git scripts server slstatus-install st-install sync
diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index dc96c1a..7f77404 100644
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -79,4 +79,4 @@ vim.keymap.set('n', '<leader>e', '<cmd>Neotree toggle right<CR>', { noremap = tr
 
 -- Other
 vim.keymap.set('n', '<leader><leader>', '<cmd>w!<CR>' , { noremap = true, silent = true })
-vim.keymap.set('n', '<leader>q'       , '<cmd>wqa!<CR>', { noremap = true, silent = true })
+vim.keymap.set('n', '<leader>q'       , '<cmd>wq!<CR>', { noremap = true, silent = true })
diff --git a/config/vim/vimrc b/config/vim/vimrc
index a7d1c0c..1cbd86c 100644
--- a/config/vim/vimrc
+++ b/config/vim/vimrc
@@ -41,4 +41,4 @@ inoremap <C-Space> <Esc>
 
 " Other
 nnoremap <silent> <leader><leader> :w!<CR>
-nnoremap <silent> <leader>q :wqa!<CR>
+nnoremap <silent> <leader>q :wq!<CR>
diff --git a/config/zathura/zathurarc b/config/zathura/zathurarc
index ea95f22..2598c2f 100755
--- a/config/zathura/zathurarc
+++ b/config/zathura/zathurarc
@@ -112,7 +112,7 @@ set default-bg "#282c34"
 
 set recolor-keephue
 set font "Liberation Mono 9"
-map n toggle_statusbar
+map t toggle_statusbar
 map i recolor
 map J zoom in
 map K zoom out
diff --git a/config/zsh/zshrc b/config/zsh/zshrc
index 4b50761..5805115 100755
--- a/config/zsh/zshrc
+++ b/config/zsh/zshrc
@@ -60,9 +60,10 @@ setopt HIST_FIND_NO_DUPS     # Don't show duplicate commands when backward searc
 
 # Custom keybinds
 bindkey '^R' history-incremental-search-backward
+bindkey -s '^f' '^uls\n'
 bindkey -s '^o' '^ulfcd\n'
-bindkey -s '^f' '^ucd "$(dirname "$(fzf --reverse)")"\n'
 bindkey -s '^v' '^u!!\n'
+bindkey ^@ vi-cmd-mode
 
 if [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/shell/aliasrc" ];then
 	source "${XDG_CONFIG_HOME:-$HOME/.config}/shell/aliasrc"
diff --git a/dep.sh b/dep.sh
index 865a5be..9346702 100755
--- a/dep.sh
+++ b/dep.sh
@@ -29,6 +29,30 @@ check() {
 
 retval=0
 
+# Optional Dependencies, skip QEMU and lualatex check
+[ "${1}" = "--optional" ] && check \
+	cmus                                    \
+	latex,pdflatex:"Latex is missing"       \
+	mutt,neomutt                            \
+	pamus                                   \
+	pandoc                                  \
+	shellcheck                              \
+	trans:"Translate shell is missing"      \
+        abook                                   \
+        acpi                                    \
+        cmus                                    \
+        dash                                    \
+        docker                                  \
+        ffmpeg                                  \
+        less                                    \
+        pass                                    \
+        python3                                 \
+        rsync                                   \
+        sudo                                    \
+        tldr,"A tldr implementation is missing" \
+        unclutter,"unclutter-xfixes is missing" \
+        yt-dlp
+
 # Programs
 check \
     Xorg                           \
@@ -44,8 +68,9 @@ check \
     startx:"xorg-xinit is missing" \
     sxiv,nsxiv                     \
     vim,nvim                       \
+    xclip                          \
     zathura                        \
-    zsh,bash || retval=1
+    zsh,bash
 
 # Script dependencies
 check \
@@ -54,7 +79,7 @@ check \
     xgamma                        \
     xinput                        \
     xset                          \
-    xwallpaper || retval=1
+    xwallpaper
 
 # Build dependencies
 check \