From f621301ef38463216a40b846aa4746df51599749 Mon Sep 17 00:00:00 2001 From: Suleyman Farajli Date: Sat, 21 Jun 2025 21:20:23 +0400 Subject: fix(zsh): create zsh history cache file in installation --- Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index ad2fc39..70861a6 100644 --- a/Makefile +++ b/Makefile @@ -19,11 +19,12 @@ TESTPROJDIR = $(HOME)/tproj BINDIR = $(HOME)/.local/bin FONTDIR = $(HOME)/.local/share/fonts/ -BASHRC = $(HOME)/.bashrc -ZSHRC = $(HOME)/.zshrc -ZPROFILE = $(HOME)/.zprofile BASHPROFILE = $(HOME)/.bash_profile +BASHRC = $(HOME)/.bashrc GITCONFIG = $(HOME)/.gitconfig +ZCACHE = $(HOME)/.cache/zsh/history +ZPROFILE = $(HOME)/.zprofile +ZSHRC = $(HOME)/.zshrc COPY = cp -r LINK = ln -sf @@ -53,6 +54,8 @@ config: $(COPY) config/sites/bookmarks.txt $(CONFDIR)/sites $(LINK) $(CONFDIR)/shell/profile $(BASHPROFILE) $(LINK) $(CONFDIR)/shell/profile $(ZPROFILE) + mkdir -p $$(dirname $(ZCACHE)) + touch $(ZCACHE) git: sed '/# signingkey = /d' config/git/gitconfig > $(GITCONFIG) -- cgit v1.2.3 From 61a96f4c817938e6f2b0a0c2a6c43a310228908e Mon Sep 17 00:00:00 2001 From: Suleyman Farajli Date: Sat, 21 Jun 2025 21:25:29 +0400 Subject: style(makefile): sort alphabetically and logically --- Makefile | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index 70861a6..4ecdfc6 100644 --- a/Makefile +++ b/Makefile @@ -1,23 +1,23 @@ .POSIX: -DWM = dwm-farajli-6.5 -ST = st-farajli-0.9.2 DMENU = dmenu-farajli-5.3 -SLSTATUS = slstatus-farajli-1.0 +DWM = dwm-farajli-6.5 FONT1 = LiberationMono FONT2 = JetBrainsMono +SLSTATUS = slstatus-farajli-1.0 +ST = st-farajli-0.9.2 -SOFTWARE = $(DWM) $(DMENU) $(SLSTATUS) $(ST) FONTS = $(FONT1) $(FONT2) +SOFTWARE = $(DWM) $(DMENU) $(SLSTATUS) $(ST) ARCHIVE = $(SOFTWARE:=.tar.gz) $(FONTS:=.tar.gz) +BINDIR = $(HOME)/.local/bin +BOOKDIR = $(HOME)/tproj CONFDIR = $(HOME)/.config +FONTDIR = $(HOME)/.local/share/fonts/ MUSICDIR = $(HOME)/music PROJDIR = $(HOME)/proj -BOOKDIR = $(HOME)/tproj TESTPROJDIR = $(HOME)/tproj -BINDIR = $(HOME)/.local/bin -FONTDIR = $(HOME)/.local/share/fonts/ BASHPROFILE = $(HOME)/.bash_profile BASHRC = $(HOME)/.bashrc @@ -29,33 +29,33 @@ ZSHRC = $(HOME)/.zshrc COPY = cp -r LINK = ln -sf -all: config scripts directory +all: config directory scripts -full: config scripts directory desktop +full: config desktop directory scripts -desktop: dmenu-install dwm-install slstatus-install st-install font1-install font2-install check +desktop: dmenu-install dwm-install font1-install font2-install check slstatus-install st-install config: - mkdir -p $(CONFDIR)/sites + mkdir -p $$(dirname $(ZCACHE)) + mkdir -p $(CONFDIR)/sites + touch $(ZCACHE) $(COPY) config/bash/bashrc $(BASHRC) - $(COPY) config/zsh/zshrc $(ZSHRC) $(COPY) config/lf $(CONFDIR) + $(COPY) config/mimeapps.list $(CONFDIR) $(COPY) config/mpv $(CONFDIR) - $(COPY) config/sxiv $(CONFDIR) $(COPY) config/nsxiv $(CONFDIR) + $(COPY) config/nvim $(CONFDIR) $(COPY) config/picom $(CONFDIR) $(COPY) config/qutebrowser $(CONFDIR) $(COPY) config/shell $(CONFDIR) + $(COPY) config/sites/bookmarks.txt $(CONFDIR)/sites + $(COPY) config/sxiv $(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 + $(COPY) config/zsh/zshrc $(ZSHRC) $(LINK) $(CONFDIR)/shell/profile $(BASHPROFILE) $(LINK) $(CONFDIR)/shell/profile $(ZPROFILE) - mkdir -p $$(dirname $(ZCACHE)) - touch $(ZCACHE) git: sed '/# signingkey = /d' config/git/gitconfig > $(GITCONFIG) @@ -72,10 +72,10 @@ scripts: 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/zsh/zshrc $(ZSHRC) $(COPY) scripts/noc arch-linux: -- cgit v1.2.3 From 6064f3172e3f56f6fc6563d7ec334b42e8ae94a7 Mon Sep 17 00:00:00 2001 From: Suleyman Farajli Date: Sat, 21 Jun 2025 21:28:59 +0400 Subject: feat(profile): export ZSHRC as an environmental variables --- config/shell/profile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/shell/profile b/config/shell/profile index 9125131..cb881cd 100644 --- a/config/shell/profile +++ b/config/shell/profile @@ -5,7 +5,7 @@ export XDG_CONFIG_HOME="$HOME/.config" export XDG_DATA_HOME="$HOME/.local/share" export XDG_STATE_HOME="$HOME/.local/state" export XINITRC="$XDG_CONFIG_HOME/x11/xinitrc" -export ZSHRC="$XDG_CONFIG_HOME/zsh/zshrc" +export ZSHRC="$HOME/.zshrc" export BASHRC="$HOME/.bashrc" mkdir -p "${XDG_BIN_DIR}" -- cgit v1.2.3 From c6f13886d3dfe6c0fd483cb0fbb179a98dc85020 Mon Sep 17 00:00:00 2001 From: Suleyman Farajli Date: Sat, 21 Jun 2025 21:37:01 +0400 Subject: fix(profile): export path variable - Use ${HOME} syntax instead of $HOME. - Quote $PATH variable. --- config/shell/profile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/config/shell/profile b/config/shell/profile index cb881cd..4ee9679 100644 --- a/config/shell/profile +++ b/config/shell/profile @@ -1,15 +1,15 @@ # Directories and Files -export XDG_BIN_DIR="$HOME/.local/bin" -export XDG_CACHE_HOME="$HOME/.cache" -export XDG_CONFIG_HOME="$HOME/.config" -export XDG_DATA_HOME="$HOME/.local/share" -export XDG_STATE_HOME="$HOME/.local/state" -export XINITRC="$XDG_CONFIG_HOME/x11/xinitrc" -export ZSHRC="$HOME/.zshrc" -export BASHRC="$HOME/.bashrc" +export XDG_BIN_DIR="${HOME}/.local/bin" +export XDG_CACHE_HOME="${HOME}/.cache" +export XDG_CONFIG_HOME="${HOME}/.config" +export XDG_DATA_HOME="${HOME}/.local/share" +export XDG_STATE_HOME="${HOME}/.local/state" +export XINITRC="${XDG_CONFIG_HOME}/x11/xinitrc" +export ZSHRC="${HOME}/.zshrc" +export BASHRC="${HOME}/.bashrc" mkdir -p "${XDG_BIN_DIR}" -PATH="${XDG_BIN_DIR}":$PATH +export PATH="${XDG_BIN_DIR}:${PATH}" # Environment variables [ -x "$(command -v vim)" ] && export EDITOR="vim" @@ -19,7 +19,7 @@ PATH="${XDG_BIN_DIR}":$PATH [ -x "$(command -v qutebrowser)" ] && export BROWSER="qutebrowser" [ -x "$(command -v firefox)" ] && export BROWSER="firefox" -export MAKEFLAGS="-j8" # Reduce compile times +export MAKEFLAGS="-j8" # Reduce compile times # Source bashrc for tty -[ -n "$BASH_VERSION" ] && [ -f "${BASHRC}" ] && . "${BASHRC}" +[ -n "${BASH_VERSION}" ] && [ -f "${BASHRC}" ] && . "${BASHRC}" -- cgit v1.2.3 From adc32350caaa166fa6c9937f310551c08f88657b Mon Sep 17 00:00:00 2001 From: Suleyman Farajli Date: Sat, 21 Jun 2025 21:38:50 +0400 Subject: style(profile): sort logically and alphabetically --- config/shell/profile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/shell/profile b/config/shell/profile index 4ee9679..23434bd 100644 --- a/config/shell/profile +++ b/config/shell/profile @@ -1,12 +1,12 @@ # Directories and Files +export BASHRC="${HOME}/.bashrc" +export ZSHRC="${HOME}/.zshrc" +export XINITRC="${XDG_CONFIG_HOME}/x11/xinitrc" export XDG_BIN_DIR="${HOME}/.local/bin" export XDG_CACHE_HOME="${HOME}/.cache" export XDG_CONFIG_HOME="${HOME}/.config" export XDG_DATA_HOME="${HOME}/.local/share" export XDG_STATE_HOME="${HOME}/.local/state" -export XINITRC="${XDG_CONFIG_HOME}/x11/xinitrc" -export ZSHRC="${HOME}/.zshrc" -export BASHRC="${HOME}/.bashrc" mkdir -p "${XDG_BIN_DIR}" export PATH="${XDG_BIN_DIR}:${PATH}" -- cgit v1.2.3 From 75911c83ea3b8123093071574746d2bbdadb2653 Mon Sep 17 00:00:00 2001 From: Suleyman Farajli Date: Sat, 21 Jun 2025 21:39:40 +0400 Subject: fix(profile): use `TERM` environmental variable instead of `TERMINAL` --- config/shell/profile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/shell/profile b/config/shell/profile index 23434bd..c12de58 100644 --- a/config/shell/profile +++ b/config/shell/profile @@ -14,8 +14,8 @@ export PATH="${XDG_BIN_DIR}:${PATH}" # Environment variables [ -x "$(command -v vim)" ] && export EDITOR="vim" [ -x "$(command -v nvim)" ] && export EDITOR="nvim" -[ -x "$(command -v alacritty)" ] && export TERMINAL="alacritty" -[ -x "$(command -v st)" ] && export TERMINAL="st" +[ -x "$(command -v alacritty)" ] && export TERM="alacritty" +[ -x "$(command -v st)" ] && export TERM="st" [ -x "$(command -v qutebrowser)" ] && export BROWSER="qutebrowser" [ -x "$(command -v firefox)" ] && export BROWSER="firefox" -- cgit v1.2.3