From 5f136203cc781ed2195fa5e885d60fbbcc39ea61 Mon Sep 17 00:00:00 2001 From: ZachIR Date: Mon, 10 Jul 2023 22:42:05 -0500 Subject: Do not install doas.conf automatically --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b1ba142..966bde8 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ DCONFS := doas.conf all: -install: install-xconfigs install-zshconfigs vimplug-vim vimplug-nvim doas-conf +install: install-xconfigs install-zshconfigs vimplug-vim vimplug-nvim install-xconfigs: $(XCONFS) @echo "Installing Xorg conf files..." -- cgit v1.2.3 From cd934044acabb919e34a1bf3d13719bcb13decdb Mon Sep 17 00:00:00 2001 From: ZachIR Date: Sat, 15 Jul 2023 15:14:21 -0500 Subject: Install .profile separately from .zshenv --- Makefile | 9 +++- sh/profile | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ zsh/.zshenv | 129 +-------------------------------------------------------- 3 files changed, 143 insertions(+), 129 deletions(-) create mode 100644 sh/profile (limited to 'Makefile') diff --git a/Makefile b/Makefile index 966bde8..0faf846 100644 --- a/Makefile +++ b/Makefile @@ -2,11 +2,12 @@ VIM := $(shell command -v vim 2>/dev/null) NVIM := $(shell command -v nvim 2>/dev/null) XCONFS := X11/Xresources ZCONFS := zsh/.zshenv +SCONFS := sh/profile DCONFS := doas.conf all: -install: install-xconfigs install-zshconfigs vimplug-vim vimplug-nvim +install: install-xconfigs install-shconfigs install-zshconfigs vimplug-vim vimplug-nvim install-xconfigs: $(XCONFS) @echo "Installing Xorg conf files..." @@ -14,6 +15,12 @@ install-xconfigs: $(XCONFS) @ln -sf `pwd`/X11/Xresources ~/.Xresources @echo "Done." +install-shconfigs: $(SCONFS) + @echo "Installing SH conf files..." + @echo ".profile..." + @ln -sf `pwd`/sh/profile ~/.profile + @echo "Done." + install-zshconfigs: $(ZCONFS) @echo "Installing zsh conf files..." @echo ".zshenv..." diff --git a/sh/profile b/sh/profile new file mode 100644 index 0000000..09a81c1 --- /dev/null +++ b/sh/profile @@ -0,0 +1,134 @@ +# Import ENV from system +. /etc/profile +[ -f /etc/profile.d/nix-daemon.sh ] && . /etc/profile.d/nix-daemon.sh + +# Other XDG paths +export XDG_DATA_HOME=${XDG_DATA_HOME:="$HOME/.local/share"} +export XDG_CACHE_HOME=${XDG_CACHE_HOME:="$HOME/.cache"} +export XDG_CONFIG_HOME=${XDG_CONFIG_HOME:="$HOME/.config"} +[ -f "${XDG_CONFIG_HOME:-$HOME/.config}/user-dirs.dirs" ] && . "${XDG_CONFIG_HOME:-$HOME/.config}/user-dirs.dirs" + +# Doesn't seem to work +export ANDROID_SDK_HOME="$XDG_CONFIG_HOME"/android +export ANDROID_AVD_HOME="$XDG_DATA_HOME"/android/ +export ANDROID_EMULATOR_HOME="$XDG_DATA_HOME"/android/ +export ADB_VENDOR_KEY="$XDG_CONFIG_HOME"/android + +# Disable files +export LESSHISTFILE=- + +# Fixing Paths +export MBSYNCRC="$XDG_CONFIG_HOME"/isync/mbsyncrc +export ATOM_HOME="$XDG_DATA_HOME"/atom +export XINITRC="$XDG_CONFIG_HOME"/X11/xinitrc +export XSERVERRC="$XDG_CONFIG_HOME"/X11/xserverrc +export GEM_SPEC_CACHE="$XDG_DATA_HOME/ruby/specs" +export GEM_HOME="$XDG_DATA_HOME/ruby/gems" +export NPM_CONFIG_USERCONFIG=$XDG_CONFIG_HOME/npm/npmrc +export GOPATH="$XDG_DATA_HOME"/go +export GNUPGHOME="$XDG_DATA_HOME"/gnupg +export GRADLE_USER_HOME="$XDG_DATA_HOME"/gradle +export NUGET_PACKAGES="$XDG_CACHE_HOME"/NuGetPackages +export RXVT_SOCKET="$XDG_RUNTIME_DIR"/urxvtd +export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java +export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc +export ZDOTDIR=$HOME/.config/zsh +export CARGO_HOME="$XDG_DATA_HOME"/cargo +export WEECHAT_HOME="$XDG_CONFIG_HOME"/weechat +export PASSWORD_STORE_DIR="$XDG_DATA_HOME"/pass +export NOTMUCH_CONFIG="$XDG_CONFIG_HOME"/notmuch/notmuchrc +export NMBGIT="$XDG_DATA_HOME"/notmuch/nmbug +export WINEROOT="$XDG_DATA_HOME"/wineprefixes +export WINEPREFIX="$WINEROOT"/default +export MPD_HOST="$XDG_CONFIG_HOME/mpd/socket" + +# Scaling +export QT_AUTO_SCREEN_SCALE_FACTOR=0 +export QT_SCALE_FACTOR=1 +export QT_SCREEN_SCALE_FACTORS="1;1;1" +export GDK_SCALE=1 +export GDK_DPI_SCALE=1 + +# Theming +export QT_QPA_PLATFORMTHEME=qt5ct + +# Configure apps +export BEMENU_OPTS="-H 36 --fn \"mononoki Nerd Font Mono 24\" --nb \"#000000\" --nf \"#c5c8c6\" --hb \"#39c1ed\" --hf \"#000000\" --cb \"#000000\" --cf \"#000000\" --tf \"#000000\" --tb \"#39c1ed\" --fb \"#000000\" --ff \"#c5c8c6\" --fbb \"#39c1ed\" --fbf \"#198844\"" + +# Fix wayland stuff +export MOZ_ENABLE_WAYLAND=1 +export XKB_DEFAULT_OPTIONS=caps:escape +export XDG_CURRENT_DESKTOP=Unity + +# Default Apps +export EDITOR="nvim" +export READER="zathura" +export VISUAL="nvim" +export TERMINAL="alacritty" +export BROWSER="browser" +export VIDEO="mpv" +export IMAGE="sxiv" +export OPENER="xdg-open" +export PAGER="less" + +# Modern SDK +export N64_LIBGCCDIR="/opt/crashsdk/lib/gcc/mips64-elf/12.2.0" +export ROOT=/etc/n64 +export BLENDER_3_0="/usr/bin/blender" + +# DIRS +export SRCDIR="$HOME/.local/src" + +# OLD PATH +export SYSPATH="$PATH" + +# NEW PATH +unset PATH +if [ -d "$HOME/.local/bin/testing" ]; then + PATH="$HOME/.local/bin/testing" +fi +if [ -d "$HOME/.local/bin/shortcmds" ]; then + PATH="$PATH:$HOME/.local/bin/shortcmds" +fi +if [ -d "$HOME/.local/bin/generics" ]; then + PATH="$PATH:$HOME/.local/bin/generics" +fi +if [ -d "$HOME/.local/bin/scripts" ]; then + PATH="$PATH:$HOME/.local/bin/scripts" +fi +if [ -d "$HOME/.local/bin/sp" ]; then + PATH="$PATH:$HOME/.local/bin/sp" +fi +if [ -d "$HOME/.local/bin/blocks" ]; then + PATH="$PATH:$HOME/.local/bin/blocks" +fi +if [ -d "$HOME/.local/bin/ignore" ]; then + PATH="$PATH:$HOME/.local/bin/ignore" +fi +if [ -d "$HOME/local/bin/volsv" ]; then + PATH="$PATH:$HOME/.local/volsv" +fi +if [ -d "$HOME/.local/bin" ]; then + PATH="$PATH:$HOME/.local/bin" +fi +if [ -d "$HOME/.local/bin/flatpak-sc" ]; then + PATH="$PATH:$HOME/.local/bin/flatpak-sc" +fi +if [ -d "$HOME/.local/bin/flatpak/exports/bin" ]; then + PATH="$PATH:$HOME/.local/share/flatpak/exports/bin/" +fi +if [ -d "$CARGO_HOME/bin" ]; then + PATH="$PATH:$CARGO_HOME/bin" +fi +if [ -d "$GOPATH/bin" ]; then + PATH="$PATH:$GOPATH/bin" +fi +if [ -d "/var/lib/flatpak/exports/bin" ]; then + PATH="$PATH:/var/lib/flatpak/exports/bin" +fi + +# MERGE PATHS +export PATH="$PATH:$SYSPATH" + +# CLEANUP +unset SYSPATH diff --git a/zsh/.zshenv b/zsh/.zshenv index 1ac6756..286e11a 100644 --- a/zsh/.zshenv +++ b/zsh/.zshenv @@ -1,130 +1,3 @@ -# Import ENV from system -. /etc/profile -[ -f /etc/profile.d/nix-daemon.sh ] && . /etc/profile.d/nix-daemon.sh - +# ZSH SPECIFIC CONFIGS unset HISTFILE - -# Other XDG paths -export XDG_DATA_HOME=${XDG_DATA_HOME:="$HOME/.local/share"} -export XDG_CACHE_HOME=${XDG_CACHE_HOME:="$HOME/.cache"} -export XDG_CONFIG_HOME=${XDG_CONFIG_HOME:="$HOME/.config"} -[ -f "${XDG_CONFIG_HOME:-$HOME/.config}/user-dirs.dirs" ] && . "${XDG_CONFIG_HOME:-$HOME/.config}/user-dirs.dirs" - -# Doesn't seem to work -export ANDROID_SDK_HOME="$XDG_CONFIG_HOME"/android -export ANDROID_AVD_HOME="$XDG_DATA_HOME"/android/ -export ANDROID_EMULATOR_HOME="$XDG_DATA_HOME"/android/ -export ADB_VENDOR_KEY="$XDG_CONFIG_HOME"/android - -# Disable files -export LESSHISTFILE=- - -# Fixing Paths -export MBSYNCRC="$XDG_CONFIG_HOME"/isync/mbsyncrc -export ATOM_HOME="$XDG_DATA_HOME"/atom -export XINITRC="$XDG_CONFIG_HOME"/X11/xinitrc -export XSERVERRC="$XDG_CONFIG_HOME"/X11/xserverrc -export GEM_SPEC_CACHE="$XDG_DATA_HOME/ruby/specs" -export GEM_HOME="$XDG_DATA_HOME/ruby/gems" -export NPM_CONFIG_USERCONFIG=$XDG_CONFIG_HOME/npm/npmrc -export GOPATH="$XDG_DATA_HOME"/go -export GNUPGHOME="$XDG_DATA_HOME"/gnupg -export GRADLE_USER_HOME="$XDG_DATA_HOME"/gradle -export NUGET_PACKAGES="$XDG_CACHE_HOME"/NuGetPackages -export RXVT_SOCKET="$XDG_RUNTIME_DIR"/urxvtd -export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java -export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc export ZDOTDIR=$HOME/.config/zsh -#export HISTFILE="$XDG_DATA_HOME"/zsh/history -export CARGO_HOME="$XDG_DATA_HOME"/cargo -export WEECHAT_HOME="$XDG_CONFIG_HOME"/weechat -export PASSWORD_STORE_DIR="$XDG_DATA_HOME"/pass -export NOTMUCH_CONFIG="$XDG_CONFIG_HOME"/notmuch/notmuchrc -export NMBGIT="$XDG_DATA_HOME"/notmuch/nmbug -export WINEROOT="$XDG_DATA_HOME"/wineprefixes -export WINEPREFIX="$WINEROOT"/default - -export MPD_HOST="$XDG_CONFIG_HOME/mpd/socket" - -# Scaling -export QT_AUTO_SCREEN_SCALE_FACTOR=0 -export QT_SCALE_FACTOR=1 -export QT_SCREEN_SCALE_FACTORS="1;1;1" -export GDK_SCALE=1 -export GDK_DPI_SCALE=1 - -# Theming -export QT_QPA_PLATFORMTHEME=qt5ct - -# Configure apps -export BEMENU_OPTS="-H 36 --fn \"mononoki Nerd Font Mono 24\" --nb \"#000000\" --nf \"#c5c8c6\" --hb \"#39c1ed\" --hf \"#000000\" --cb \"#000000\" --cf \"#000000\" --tf \"#000000\" --tb \"#39c1ed\" --fb \"#000000\" --ff \"#c5c8c6\" --fbb \"#39c1ed\" --fbf \"#198844\"" - -# Fix wayland stuff -export MOZ_ENABLE_WAYLAND=1 -export XKB_DEFAULT_OPTIONS=caps:escape -export XDG_CURRENT_DESKTOP=Unity - -# Default Apps -export EDITOR="nvim" -export READER="zathura" -export VISUAL="nvim" -export TERMINAL="alacritty" -export BROWSER="browser" -export VIDEO="mpv" -export IMAGE="sxiv" -export OPENER="xdg-open" -export PAGER="less" - -# DIRS -export SRCDIR="$HOME/.local/src" - -# KSH -export ENV="$XDG_CONFIG_HOME/mksh/mkshrc" - -# OLD PATH -export SYSPATH="$PATH" - -# NEW PATH -unset PATH -if [ -d "$HOME/.local/bin/testing" ]; then - PATH="$HOME/.local/bin/testing" -fi -if [ -d "$HOME/.local/bin/shortcmds" ]; then - PATH="$PATH:$HOME/.local/bin/shortcmds" -fi -if [ -d "$HOME/.local/bin/generics" ]; then - PATH="$PATH:$HOME/.local/bin/generics" -fi -if [ -d "$HOME/.local/bin/scripts" ]; then - PATH="$PATH:$HOME/.local/bin/scripts" -fi -if [ -d "$HOME/.local/bin/sp" ]; then - PATH="$PATH:$HOME/.local/bin/sp" -fi -if [ -d "$HOME/.local/bin/blocks" ]; then - PATH="$PATH:$HOME/.local/bin/blocks" -fi -if [ -d "$HOME/.local/bin/ignore" ]; then - PATH="$PATH:$HOME/.local/bin/ignore" -fi -if [ -d "$HOME/.local/bin" ]; then - PATH="$PATH:$HOME/.local/bin" -fi -if [ -d "$HOME/.local/bin/flatpak-sc" ]; then - PATH="$PATH:$HOME/.local/bin/flatpak-sc" -fi -if [ -d "$HOME/.local/bin/flatpak/exports/bin" ]; then - PATH="$PATH:$HOME/.local/share/flatpak/exports/bin/" -fi -if [ -d "$CARGO_HOME/bin" ]; then - PATH="$PATH:$CARGO_HOME/bin" -fi -if [ -d "$GOPATH/bin" ]; then - PATH="$PATH:$GOPATH/bin" -fi - -# MERGE PATHS -export PATH="$PATH:$SYSPATH" - -# CLEANUP -unset SYSPATH -- cgit v1.2.3 From 663699322c45f2c830e167d142d6b3579e849eb4 Mon Sep 17 00:00:00 2001 From: zachir Date: Thu, 6 Jun 2024 15:16:14 -0500 Subject: Install ZDOTDIR globally and load profile manually This means I don't need to have either ~/.profile or ~/.zshenv symlinks in the home directory. This adds in an installer to set that up. --- Makefile | 18 +++--------------- installers/set_zshdirs.sh | 13 +++++++++++++ zsh/.zshenv | 1 + 3 files changed, 17 insertions(+), 15 deletions(-) create mode 100755 installers/set_zshdirs.sh (limited to 'Makefile') diff --git a/Makefile b/Makefile index 0faf846..e27af0a 100644 --- a/Makefile +++ b/Makefile @@ -1,28 +1,16 @@ VIM := $(shell command -v vim 2>/dev/null) NVIM := $(shell command -v nvim 2>/dev/null) -XCONFS := X11/Xresources ZCONFS := zsh/.zshenv -SCONFS := sh/profile DCONFS := doas.conf all: -install: install-xconfigs install-shconfigs install-zshconfigs vimplug-vim vimplug-nvim - -install-xconfigs: $(XCONFS) - @echo "Installing Xorg conf files..." - @echo "Xresources..." - @ln -sf `pwd`/X11/Xresources ~/.Xresources - @echo "Done." - -install-shconfigs: $(SCONFS) - @echo "Installing SH conf files..." - @echo ".profile..." - @ln -sf `pwd`/sh/profile ~/.profile - @echo "Done." +install: install-zshconfigs vimplug-vim vimplug-nvim install-zshconfigs: $(ZCONFS) @echo "Installing zsh conf files..." + @echo "Setting ZSHDOTDIR globally..." + @$(shell sudo installers/set_zshdirs.sh) @echo ".zshenv..." @ln -sf `pwd`/zsh/.zshenv ~/.zshenv @echo "Done." diff --git a/installers/set_zshdirs.sh b/installers/set_zshdirs.sh new file mode 100755 index 0000000..2d82f19 --- /dev/null +++ b/installers/set_zshdirs.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +if [ -f /etc/zshenv ]; then + ZSHENV="/etc/zshenv" +elif [ -d /etc/zsh ]; then + ZSHENV="/etc/zsh/zshenv" +else + ZSHENV="/etc/zshenv" +fi + +if ! grep -q "ZDOTDIR" $ZSHENV 2>/dev/null; then + echo "export ZDOTDIR=\"\$HOME\"/.config/zsh" >> $ZSHENV +fi diff --git a/zsh/.zshenv b/zsh/.zshenv index b8c9d48..f02f83a 100644 --- a/zsh/.zshenv +++ b/zsh/.zshenv @@ -1,4 +1,5 @@ # ZSH SPECIFIC CONFIGS unset HISTFILE export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" +[ -f /etc/profile ] && . /etc/profile [ -f "$XDG_CONFIG_HOME/sh/profile" ] && . "$XDG_CONFIG_HOME/sh/profile" -- cgit v1.2.3 From 44fbfc95f779e5d6bbdaaf250ada4dfcdae5cb2a Mon Sep 17 00:00:00 2001 From: ZachIR Date: Sat, 18 Jan 2025 23:39:25 -0600 Subject: Cleanup zsh configs + add zplug Just a couple plugins for syntax highlighting and history searching, removing a bunch of old unused files, and changing to just accept the standard of using dotfiles in the home directory. --- Makefile | 16 +++++--- installers/set_zshdirs.sh | 13 ------ sh/profile | 2 +- zsh/.zlogout | 1 - zsh/.zprofile | 6 --- zsh/.zshenv | 5 --- zsh/.zshrc | 100 ---------------------------------------------- zsh/zshenv | 6 +++ zsh/zshrc | 72 +++++++++++++++++++++++++++++++++ 9 files changed, 90 insertions(+), 131 deletions(-) delete mode 100755 installers/set_zshdirs.sh delete mode 100644 zsh/.zlogout delete mode 100644 zsh/.zprofile delete mode 100644 zsh/.zshenv delete mode 100644 zsh/.zshrc create mode 100644 zsh/zshenv create mode 100644 zsh/zshrc (limited to 'Makefile') diff --git a/Makefile b/Makefile index e27af0a..898fe9e 100644 --- a/Makefile +++ b/Makefile @@ -1,20 +1,26 @@ VIM := $(shell command -v vim 2>/dev/null) NVIM := $(shell command -v nvim 2>/dev/null) -ZCONFS := zsh/.zshenv +ZCONFS := zsh/zshenv zsh/zshrc +SCONFS := sh/profile DCONFS := doas.conf all: -install: install-zshconfigs vimplug-vim vimplug-nvim +install: install-zshconfigs install-shconfigs vimplug-vim vimplug-nvim install-zshconfigs: $(ZCONFS) @echo "Installing zsh conf files..." - @echo "Setting ZSHDOTDIR globally..." - @$(shell sudo installers/set_zshdirs.sh) @echo ".zshenv..." - @ln -sf `pwd`/zsh/.zshenv ~/.zshenv + @ln -sf `pwd`/zsh/zshenv ~/.zshenv + @echo ".zshrc..." + @ln -sf `pwd`/zsh/zshrc ~/.zshrc @echo "Done." +install-shconfigs: $(SCONFS) + @echo "Installing sh conf files..." + @echo ".profile..." + @ln -sf `pwd`/sh/profile ~/.profile + vimplug-vim: installers/vimplug_vim.sh ifdef VIM @echo "Installing vim-plug for vim..." diff --git a/installers/set_zshdirs.sh b/installers/set_zshdirs.sh deleted file mode 100755 index 2d82f19..0000000 --- a/installers/set_zshdirs.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -if [ -f /etc/zshenv ]; then - ZSHENV="/etc/zshenv" -elif [ -d /etc/zsh ]; then - ZSHENV="/etc/zsh/zshenv" -else - ZSHENV="/etc/zshenv" -fi - -if ! grep -q "ZDOTDIR" $ZSHENV 2>/dev/null; then - echo "export ZDOTDIR=\"\$HOME\"/.config/zsh" >> $ZSHENV -fi diff --git a/sh/profile b/sh/profile index de79a65..b83d012 100644 --- a/sh/profile +++ b/sh/profile @@ -36,7 +36,7 @@ export NUGET_PACKAGES="$XDG_CACHE_HOME"/NuGetPackages export RXVT_SOCKET="$XDG_RUNTIME_DIR"/urxvtd export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc -export ZDOTDIR=$HOME/.config/zsh +#export ZDOTDIR=$HOME/.config/zsh export CARGO_HOME="$XDG_DATA_HOME"/cargo export RUSTUP_HOME="$XDG_DATA_HOME"/rustup export WEECHAT_HOME="$XDG_CONFIG_HOME"/weechat diff --git a/zsh/.zlogout b/zsh/.zlogout deleted file mode 100644 index 33666be..0000000 --- a/zsh/.zlogout +++ /dev/null @@ -1 +0,0 @@ -rm -rf /tmp/xorg-awake diff --git a/zsh/.zprofile b/zsh/.zprofile deleted file mode 100644 index 1eae5e7..0000000 --- a/zsh/.zprofile +++ /dev/null @@ -1,6 +0,0 @@ -#export GDK_DPI_SCALE=0.7 - -#gnome_schema=org.gnome.desktop.interface -# -#gsettings set $gnome_schema gtk-theme 'Plata-Noir-Compact' -#gsettings set $gnome_schema icon-theme 'Papirus-Dark' diff --git a/zsh/.zshenv b/zsh/.zshenv deleted file mode 100644 index f02f83a..0000000 --- a/zsh/.zshenv +++ /dev/null @@ -1,5 +0,0 @@ -# ZSH SPECIFIC CONFIGS -unset HISTFILE -export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" -[ -f /etc/profile ] && . /etc/profile -[ -f "$XDG_CONFIG_HOME/sh/profile" ] && . "$XDG_CONFIG_HOME/sh/profile" diff --git a/zsh/.zshrc b/zsh/.zshrc deleted file mode 100644 index a00f116..0000000 --- a/zsh/.zshrc +++ /dev/null @@ -1,100 +0,0 @@ -HISTFILE="$ZDOTDIR"/hist -SAVEHIST=1000 -HISTSIZE=1000 -setopt APPEND_HISTORY -setopt HIST_FIND_NO_DUPS -setopt HIST_EXPIRE_DUPS_FIRST -setopt HIST_VERIFY -setopt HIST_IGNORE_DUPS -setopt INC_APPEND_HISTORY -setopt HIST_REDUCE_BLANKS - -_SH="zsh" - -if [ -f "$XDG_CONFIG_HOME"/sh/aliases ]; then - source "$XDG_CONFIG_HOME"/sh/aliases -fi -if [ -f "$XDG_CONFIG_HOME"/sh/functions ]; then - source "$XDG_CONFIG_HOME"/sh/functions -fi - -if [ -n "$ZDOTDIR"/.zshrc -a -f "$ZDOTDIR"/.zshrc ]; then - alias e='source "$ZDOTDIR"/.zshrc' -elif [ -f "$HOME"/.zshrc ]; then - alias e='source ~/.zshrc' -fi - -bindkey "^?" backward-delete-char - -# bindkey -v - -if [ "$TERM" = "st-256color" ] || [ "$TERM" = "xterm-256color" ]; then - function zle-line-init () { echoti smkx } - function zle-line-finish () { echoti rmkx } - - zle -N zle-line-init - zle -N zle-line-finish -fi - -unset COLOR1 -ZSHTHEMERC="${ZDOTDIR:-$HOME}/.zsh_theme" -[ -f "$ZSHTHEMERC" ] && . "$ZSHTHEMERC" - -if [ -z "$COLOR1" ]; then - case "$(whoami)" in - zachir) COLOR1="014" ;; - git) COLOR1="013" ;; - subsonic) COLOR1="012" ;; - *) COLOR1="015" ;; - esac -fi - -MYPROMPT='%B%S%F{'"$COLOR1"'}[%n@%m]:%f%s%F{015}%~%f%S%F{'"$COLOR1"'}%#%f%s%b ' -function zle-line-init zle-keymap-select { - VIM_PROMPT="%B%F{012}[%n@%m]:%f%F{015}%~%f%F{012}%#%f%b " - PS1="${${KEYMAP/vicmd/$VIM_PROMPT}/main/$MYPROMPT}" - #PS1="$PROMPT $KEYMAP" - zle reset-prompt -} - -unset COLOR1 - -zle -N zle-line-init -zle -N zle-keymap-select -export KEYTIMEOUT=1 - -fpath+="$ZDOTDIR/zfunc" - -autoload -Uz compinit promptinit -compinit -d $CONFIG/zcompdump -promptinit -autoload -Uz up-line-or-beginning-search down-line-or-beginning-search -zle -N up-line-or-beginning-search -zle -N down-line-or-beginning-search - -zstyle ':completion:*' menu select -zstyle ':completion::complete:*' gain-privileges 1 -zstyle ':completion:*' rehash true - -setopt COMPLETE_ALIASES -setopt AUTO_CD - -typeset -g -A key - -key[Up]="${terminfo[kcuu1]}" -key[Down]="${terminfo[kcud1]}" -key[Left]="${terminfo[kcub1]}" -key[Right]="${terminfo[kcuf1]}" -key[Shift-Tab]="${terminfo[kcbt]}" -key[Delete]="${terminfo[kdch1]}" - -[[ -n "${key[Up]}" ]] && bindkey -- "${key[Up]}" up-line-or-beginning-search -bindkey -- '^[[A' up-line-or-beginning-search -bindkey -- '^[[B' down-line-or-beginning-search -[[ -n "${key[Down]}" ]] && bindkey -- "${key[Down]}" down-line-or-beginning-search -[[ -n "${key[Left]}" ]] && bindkey -- "${key[Left]}" backward-char -[[ -n "${key[Right]}" ]] && bindkey -- "${key[Right]}" forward-char -[[ -n "${key[Shift-Tab]}" ]] && bindkey -- "${key[Shift-Tab]}" reverse-menu-complete -[[ -n "${key[Delete]}" ]] && bindkey -- "${key[Delete]}" delete-char - -eval "$(_AUTO_CPUFREQ_COMPLETE=zsh_source auto-cpufreq)" diff --git a/zsh/zshenv b/zsh/zshenv new file mode 100644 index 0000000..df0371e --- /dev/null +++ b/zsh/zshenv @@ -0,0 +1,6 @@ +# ZSH SPECIFIC CONFIGS +unset HISTFILE +export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" +export skip_global_compinit=1 +[ -f /etc/profile ] && . /etc/profile +[ -f "$XDG_CONFIG_HOME/sh/profile" ] && . "$XDG_CONFIG_HOME/sh/profile" diff --git a/zsh/zshrc b/zsh/zshrc new file mode 100644 index 0000000..fb5b167 --- /dev/null +++ b/zsh/zshrc @@ -0,0 +1,72 @@ +#zmodload zsh/zprof +if [ -d "$HOME/.zplug" ]; then + export ZPLUG_INSTALLED="y" + source "$HOME/.zplug/init.zsh" +fi +HISTFILE="$XDG_CONFIG_HOME/zsh/hist" +SAVEHIST=1000 +HISTSIZE=1000 +setopt APPEND_HISTORY +setopt HIST_FIND_NO_DUPS +setopt HIST_EXPIRE_DUPS_FIRST +setopt HIST_VERIFY +setopt HIST_IGNORE_DUPS +setopt INC_APPEND_HISTORY +setopt HIST_REDUCE_BLANKS +setopt COMPLETE_ALIASES +setopt AUTO_CD + +_SH="zsh" + +if [ -f "$XDG_CONFIG_HOME"/sh/aliases ]; then + source "$XDG_CONFIG_HOME"/sh/aliases +fi +if [ -f "$XDG_CONFIG_HOME"/sh/functions ]; then + source "$XDG_CONFIG_HOME"/sh/functions +fi + +if [ -f "$XDG_CONFIG_HOME/zsh/zshrc" ]; then + alias e='source "$XDG_CONFIG_HOME/zsh/zshrc"' +elif [ -f "$XDG_CONFIG_HOME/zshrc" ]; then + alias e='source "$XDG_CONFIG_HOME/zshrc"' +elif [ -f "$HOME"/.zshrc ]; then + alias e='source ~/.zshrc' +fi + +bindkey -v + +MYPROMPT=$'%B%S%F{002}[%n@%m]%s\UE0B0%F{015}%~%S%F{002}\UE0B0%#%s\UE0B0%f%k%b ' +function zle-line-init zle-keymap-select { + VIM_PROMPT=$'%B%S%F{012}[%n@%m]%s\UE0B0%F{015}%~%S%F{012}\UE0B0%#%s\UE0B0%f%k%b ' + PS1="${${KEYMAP/vicmd/$VIM_PROMPT}/main/$MYPROMPT}" + zle reset-prompt +} + +zle -N zle-line-init +zle -N zle-keymap-select +export KEYTIMEOUT=1 + +fpath+="$XDG_CONFIG_HOME/zsh/zfunc" + +if [ -n "$ZPLUG_INSTALLED" ]; then + # zsh history substring search + zplug "zsh-users/zsh-history-substring-search", as:plugin + + bindkey '^[[A' history-substring-search-up + bindkey '^[[B' history-substring-search-down + bindkey -M vicmd '^[[A' history-substring-search-up + bindkey -M vicmd '^[[B' history-substring-search-down + bindkey -M vicmd 'k' history-substring-search-up + bindkey -M vicmd 'j' history-substring-search-down + + # zsh syntax highlighting + zplug "zsh-users/zsh-syntax-highlighting", defer:2 + + # load zsh plugins + zplug load +fi + +autoload -Uz compinit +compinit + +#zprof -- cgit v1.2.3 From 4a401026461cbf4249925d373d961eb042011ed8 Mon Sep 17 00:00:00 2001 From: ZachIR Date: Wed, 30 Apr 2025 23:42:26 -0500 Subject: Using lazy nvim not vimplug --- Makefile | 10 ---------- installers/vimplug_nvim.sh | 4 ---- 2 files changed, 14 deletions(-) delete mode 100755 installers/vimplug_nvim.sh (limited to 'Makefile') diff --git a/Makefile b/Makefile index 898fe9e..d850e2a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,4 @@ VIM := $(shell command -v vim 2>/dev/null) -NVIM := $(shell command -v nvim 2>/dev/null) ZCONFS := zsh/zshenv zsh/zshrc SCONFS := sh/profile DCONFS := doas.conf @@ -30,15 +29,6 @@ else @echo "vim not installed." endif -vimplug-nvim: installers/vimplug_nvim.sh -ifdef NVIM - @echo "Installing vim-plug for nvim..." - @$(shell installers/vimplug_nvim.sh) - @echo "Done." -else - @echo "nvim not installed." -endif - doas-conf: $(DCONFS) @echo "Installing doas config files..." @echo "doas.conf..." diff --git a/installers/vimplug_nvim.sh b/installers/vimplug_nvim.sh deleted file mode 100755 index feddd03..0000000 --- a/installers/vimplug_nvim.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs \ - https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim -- cgit v1.2.3 From 05866ead2b7ee7adeb0dc208a59724a171fbbd44 Mon Sep 17 00:00:00 2001 From: ZachIR Date: Mon, 30 Jun 2025 00:38:52 -0500 Subject: Remove vimplug-nvim from Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d850e2a..28bc66e 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ DCONFS := doas.conf all: -install: install-zshconfigs install-shconfigs vimplug-vim vimplug-nvim +install: install-zshconfigs install-shconfigs vimplug-vim install-zshconfigs: $(ZCONFS) @echo "Installing zsh conf files..." -- cgit v1.2.3 From 4bd035e99f5ba44d0423d472d70ca9fb7ad72d67 Mon Sep 17 00:00:00 2001 From: zachir Date: Mon, 21 Jul 2025 17:10:26 -0500 Subject: Install hyprland plugins in Makefile --- Makefile | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 28bc66e..e40751b 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,18 @@ DCONFS := doas.conf all: -install: install-zshconfigs install-shconfigs vimplug-vim +install: install-hyprplugins install-zshconfigs install-shconfigs vimplug-vim + +install-hyprplugins: + @echo "Installing hyprsplit..." + @hyprpm add https://github.com/shezdy/hyprsplit + @echo "Installing hyprland-plugins..." + @hyprpm add https://github.com/hyprwm/hyprland-plugins + @echo "Enabling hyprsplit..." + @hyprpm enable hyprsplit + @echo "Enabling hyprscrolling..." + @hyprpm enable hyprscrolling + @echo "Done." install-zshconfigs: $(ZCONFS) @echo "Installing zsh conf files..." -- cgit v1.2.3 From 74d02fc247396206e8a3893b2278af8c49e3e7c1 Mon Sep 17 00:00:00 2001 From: zachir Date: Mon, 21 Jul 2025 17:10:42 -0500 Subject: Set Makefile targets as PHONY --- Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e40751b..3d220be 100644 --- a/Makefile +++ b/Makefile @@ -45,3 +45,5 @@ doas-conf: $(DCONFS) @echo "doas.conf..." @sudo cp -n doas.conf /etc/doas.conf @echo "Done." + +.PHONY: install-hyprplugins install-zshconfigs install-shconfigs vimplug-vim doas-conf install -- cgit v1.2.3 From b12fe55655b081ba56d85ab605fd142dcba69102 Mon Sep 17 00:00:00 2001 From: zachir Date: Mon, 21 Jul 2025 17:53:50 -0500 Subject: Add setting up hyprland with make install --- Makefile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3d220be..12854c4 100644 --- a/Makefile +++ b/Makefile @@ -7,13 +7,18 @@ all: install: install-hyprplugins install-zshconfigs install-shconfigs vimplug-vim -install-hyprplugins: +install-hyprplugins: install-hyprsplit install-hyprland-plugins + +install-hyprsplit: @echo "Installing hyprsplit..." - @hyprpm add https://github.com/shezdy/hyprsplit - @echo "Installing hyprland-plugins..." - @hyprpm add https://github.com/hyprwm/hyprland-plugins + @hyprpm add https://github.com/shezdy/hyprsplit || echo "Already installed!" @echo "Enabling hyprsplit..." @hyprpm enable hyprsplit + @echo "Done." + +install-hyprland-plugins: + @echo "Installing hyprland-plugins..." + @hyprpm add https://github.com/hyprwm/hyprland-plugins || echo "Already installed!" @echo "Enabling hyprscrolling..." @hyprpm enable hyprscrolling @echo "Done." -- cgit v1.2.3 From 373441fde1ddd2b915cc83e5a43c87fef566b101 Mon Sep 17 00:00:00 2001 From: ZachIR Date: Sat, 26 Jul 2025 11:24:47 -0500 Subject: Add initial bash configs --- Makefile | 9 +++++++++ bash/.bash_logout | 2 ++ bash/.bashrc | 24 ++++++++++++++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 bash/.bash_logout create mode 100644 bash/.bashrc (limited to 'Makefile') diff --git a/Makefile b/Makefile index 12854c4..a25e316 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ VIM := $(shell command -v vim 2>/dev/null) +BCONFS := bash/.bash_logout bash/.bashrc ZCONFS := zsh/zshenv zsh/zshrc SCONFS := sh/profile DCONFS := doas.conf @@ -9,6 +10,14 @@ install: install-hyprplugins install-zshconfigs install-shconfigs vimplug-vim install-hyprplugins: install-hyprsplit install-hyprland-plugins +install-bashconfigs: $(BCONFS) install-shconfigs + @echo "Installing bash conf files..." + @echo ".bashrc..." + @ln -sf `pwd`/bash/.bashrc ~/.bashrc + @echo ".bash_logout..." + @ln -sf `pwd`/bash/.bash_logout ~/.bash_logout + @echo "Done." + install-hyprsplit: @echo "Installing hyprsplit..." @hyprpm add https://github.com/shezdy/hyprsplit || echo "Already installed!" diff --git a/bash/.bash_logout b/bash/.bash_logout new file mode 100644 index 0000000..9bccd62 --- /dev/null +++ b/bash/.bash_logout @@ -0,0 +1,2 @@ +clear +reset diff --git a/bash/.bashrc b/bash/.bashrc new file mode 100644 index 0000000..600352a --- /dev/null +++ b/bash/.bashrc @@ -0,0 +1,24 @@ +# Syntax Highlighting +source /usr/share/blesh/ble.sh + +# Incorporate my SH agnostic stuff +[ -f "$XDG_CONFIG_HOME/sh/aliases" ] && source "$XDG_CONFIG_HOME/sh/aliases" +[ -f "$XDG_CONFIG_HOME/sh/functions" ] && source "$XDG_CONFIG_HOME/sh/functions" + +# History Search +bind '"\e[A": history-search-backward' +bind '"\e[B": history-search-forward' + +# History Cleaning +export HISTCONTROL="erasedups:ignorespace" + +# Run-Help Ability +run-help() { help "$READLINE_LINE" 2>/dev/null || man "$READLINE_LINE"; } +bind -m vi-insert -x '"\eh": run-help' +bind -m emacs -x '"\eh": run-help' + +# CD when typing directory name +shopt -s autocd + +# Set my prompt +export PS1='\e[42m[\u@\H]\e[46\w\e[42m\$\e(B\e[m ' -- cgit v1.2.3 From 82506e32c7233cadca8249fb60e28b5e0e13aa2d Mon Sep 17 00:00:00 2001 From: ZachIR Date: Sat, 26 Jul 2025 11:25:02 -0500 Subject: ZSH make install only needs to setup .zprofile --- Makefile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a25e316..ac56da3 100644 --- a/Makefile +++ b/Makefile @@ -32,12 +32,10 @@ install-hyprland-plugins: @hyprpm enable hyprscrolling @echo "Done." -install-zshconfigs: $(ZCONFS) - @echo "Installing zsh conf files..." - @echo ".zshenv..." - @ln -sf `pwd`/zsh/zshenv ~/.zshenv - @echo ".zshrc..." - @ln -sf `pwd`/zsh/zshrc ~/.zshrc +install-zshconfigs: install-shconfigs + @echo "Settings up ZDOTDIR..." + @echo "Installing .zprofile..." + @ln -sf `pwd`/sh/profile ~/.zprofile @echo "Done." install-shconfigs: $(SCONFS) -- cgit v1.2.3 From ac700e2efa3479460b565d1542725da3c2c6c68c Mon Sep 17 00:00:00 2001 From: ZachIR Date: Sat, 26 Jul 2025 12:56:35 -0500 Subject: Add $home variable for scroll --- .gitignore | 1 + Makefile | 14 ++++++++++++-- scroll/config | 2 ++ 3 files changed, 15 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/.gitignore b/.gitignore index 3dcf353..6bd8fea 100644 --- a/.gitignore +++ b/.gitignore @@ -237,6 +237,7 @@ RVXX EXEX.settings RVXX v2/ RVXX v2.settings SchildiChat/ +scroll/user.conf Serenity/ Session/ Shibalba EXEX.settings diff --git a/Makefile b/Makefile index ac56da3..3f6f51c 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ DCONFS := doas.conf all: -install: install-hyprplugins install-zshconfigs install-shconfigs vimplug-vim +install: install-hyprplugins install-zshconfigs install-shconfigs vimplug-vim install-scrollconf install-hyprplugins: install-hyprsplit install-hyprland-plugins @@ -32,6 +32,16 @@ install-hyprland-plugins: @hyprpm enable hyprscrolling @echo "Done." +install-scrollconf: scroll/user.conf + @echo "Installing user.conf..." + @sudo ln -sf `pwd`/scroll/user.conf /etc/scroll/config.d/user.conf + @echo "Done." + +scroll/user.conf: + @echo "Generating user.conf..." + @echo 'set $$home' $(shell echo $(HOME)) > scroll/user.conf + @echo "Done." + install-zshconfigs: install-shconfigs @echo "Settings up ZDOTDIR..." @echo "Installing .zprofile..." @@ -58,4 +68,4 @@ doas-conf: $(DCONFS) @sudo cp -n doas.conf /etc/doas.conf @echo "Done." -.PHONY: install-hyprplugins install-zshconfigs install-shconfigs vimplug-vim doas-conf install +.PHONY: install-hyprplugins install-zshconfigs install-shconfigs vimplug-vim doas-conf install install-scrollconf diff --git a/scroll/config b/scroll/config index c715eed..e1b0f0e 100644 --- a/scroll/config +++ b/scroll/config @@ -6,6 +6,8 @@ # # Read `man 5 scroll` for a complete reference. +include /etc/scroll/config.d/* + ### Variables # # Logo key. Use Mod1 for Alt. -- cgit v1.2.3 From 85559e966fd1e29374c759c697ac9c5757750d3c Mon Sep 17 00:00:00 2001 From: ZachIR Date: Sat, 26 Jul 2025 12:56:55 -0500 Subject: Move bash in Makefile and make it phony --- Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3f6f51c..ce4171e 100644 --- a/Makefile +++ b/Makefile @@ -10,14 +10,6 @@ install: install-hyprplugins install-zshconfigs install-shconfigs vimplug-vim in install-hyprplugins: install-hyprsplit install-hyprland-plugins -install-bashconfigs: $(BCONFS) install-shconfigs - @echo "Installing bash conf files..." - @echo ".bashrc..." - @ln -sf `pwd`/bash/.bashrc ~/.bashrc - @echo ".bash_logout..." - @ln -sf `pwd`/bash/.bash_logout ~/.bash_logout - @echo "Done." - install-hyprsplit: @echo "Installing hyprsplit..." @hyprpm add https://github.com/shezdy/hyprsplit || echo "Already installed!" @@ -42,6 +34,14 @@ scroll/user.conf: @echo 'set $$home' $(shell echo $(HOME)) > scroll/user.conf @echo "Done." +install-bashconfigs: $(BCONFS) install-shconfigs + @echo "Installing bash conf files..." + @echo ".bashrc..." + @ln -sf `pwd`/bash/.bashrc ~/.bashrc + @echo ".bash_logout..." + @ln -sf `pwd`/bash/.bash_logout ~/.bash_logout + @echo "Done." + install-zshconfigs: install-shconfigs @echo "Settings up ZDOTDIR..." @echo "Installing .zprofile..." @@ -68,4 +68,4 @@ doas-conf: $(DCONFS) @sudo cp -n doas.conf /etc/doas.conf @echo "Done." -.PHONY: install-hyprplugins install-zshconfigs install-shconfigs vimplug-vim doas-conf install install-scrollconf +.PHONY: install-hyprplugins install-zshconfigs install-shconfigs vimplug-vim doas-conf install install-scrollconf install-bashconfigs -- cgit v1.2.3 From 304aa0bc4856e5498b64ae95e73e1a7b21924f46 Mon Sep 17 00:00:00 2001 From: ZachIR Date: Sat, 26 Jul 2025 13:07:11 -0500 Subject: Add wc script to install wc stuff as necessary --- Makefile | 7 ++++++- installers/wc | 6 ++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100755 installers/wc (limited to 'Makefile') diff --git a/Makefile b/Makefile index ce4171e..24b5acd 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,12 @@ DCONFS := doas.conf all: -install: install-hyprplugins install-zshconfigs install-shconfigs vimplug-vim install-scrollconf +install: install-zshconfigs install-shconfigs vimplug-vim wc + +wc: + @echo "Installing wayland compositor stuff..." + @./installers/wc + @echo "Done." install-hyprplugins: install-hyprsplit install-hyprland-plugins diff --git a/installers/wc b/installers/wc new file mode 100755 index 0000000..bfdb299 --- /dev/null +++ b/installers/wc @@ -0,0 +1,6 @@ +#!/bin/sh + +pgrep -x Hyprland && make install-hyprplugins +pgrep -x scroll && make install-scrollconf + + -- cgit v1.2.3 From 83f2189e7234cad9054795b77b07d24ca0a7c742 Mon Sep 17 00:00:00 2001 From: zachir Date: Sat, 26 Jul 2025 20:37:37 -0500 Subject: Move scroll user.conf to config.d --- .gitignore | 2 +- Makefile | 9 +++------ scroll/config | 3 ++- 3 files changed, 6 insertions(+), 8 deletions(-) (limited to 'Makefile') diff --git a/.gitignore b/.gitignore index 6bd8fea..cf80b9b 100644 --- a/.gitignore +++ b/.gitignore @@ -237,7 +237,7 @@ RVXX EXEX.settings RVXX v2/ RVXX v2.settings SchildiChat/ -scroll/user.conf +scroll/config.d/user.conf Serenity/ Session/ Shibalba EXEX.settings diff --git a/Makefile b/Makefile index 24b5acd..ab6e0da 100644 --- a/Makefile +++ b/Makefile @@ -29,14 +29,11 @@ install-hyprland-plugins: @hyprpm enable hyprscrolling @echo "Done." -install-scrollconf: scroll/user.conf - @echo "Installing user.conf..." - @sudo ln -sf `pwd`/scroll/user.conf /etc/scroll/config.d/user.conf - @echo "Done." +install-scrollconf: scroll/config.d/user.conf -scroll/user.conf: +scroll/config.d/user.conf: @echo "Generating user.conf..." - @echo 'set $$home' $(shell echo $(HOME)) > scroll/user.conf + @echo 'set $$home' $(shell echo $(HOME)) > scroll/config.d/user.conf @echo "Done." install-bashconfigs: $(BCONFS) install-shconfigs diff --git a/scroll/config b/scroll/config index fae0309..c115cd9 100644 --- a/scroll/config +++ b/scroll/config @@ -6,7 +6,7 @@ # # Read `man 5 scroll` for a complete reference. -include /etc/scroll/config.d/* +include ~/.config/scroll/config.d/* ### Variables # @@ -575,3 +575,4 @@ bar { #} } # +include /etc/scroll/config.d/* -- cgit v1.2.3 From 97cdc7084e6928b9bcb962cd8c82832e70bf1a36 Mon Sep 17 00:00:00 2001 From: ZachIR Date: Sat, 26 Jul 2025 21:06:45 -0500 Subject: Make dir for scroll/config.d in Makefile --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index ab6e0da..1c66195 100644 --- a/Makefile +++ b/Makefile @@ -33,6 +33,7 @@ install-scrollconf: scroll/config.d/user.conf scroll/config.d/user.conf: @echo "Generating user.conf..." + @mkdir -p scroll/config.d @echo 'set $$home' $(shell echo $(HOME)) > scroll/config.d/user.conf @echo "Done." -- cgit v1.2.3