diff options
| -rwxr-xr-x | bin/common/ask | 2 | ||||
| -rwxr-xr-x | bin/guiscripts/dmapimg | 7 | ||||
| -rw-r--r-- | config/essentials/zsh/aliases.zsh | 2 | ||||
| -rw-r--r-- | config/essentials/zsh/zshrc (renamed from config/zshrc/.zshrc) | 39 | ||||
| -rw-r--r-- | config/home/.zshenv | 50 | ||||
| -rwxr-xr-x | stowcmds.sh | 6 |
6 files changed, 63 insertions, 43 deletions
diff --git a/bin/common/ask b/bin/common/ask index 140d9f6..a06e3c7 100755 --- a/bin/common/ask +++ b/bin/common/ask @@ -12,7 +12,7 @@ test -z "${inp:=$@}" && prompt="$(echo "$inp" | tr "\n\t\"" " '")" API_KEY="$(pass tokens/openai-api)" -model="text-ada-001" +model="text-curie-001" tokens="1024" temperature=0 diff --git a/bin/guiscripts/dmapimg b/bin/guiscripts/dmapimg index 25c414b..3677ed3 100755 --- a/bin/guiscripts/dmapimg +++ b/bin/guiscripts/dmapimg @@ -1,6 +1,7 @@ -#!/bin/bash +#!/bin/sh +dest="$XDG_DATA_HOME"/appimages/ appimage="$(\ - find ~/.local/share/appimages -type f -printf "%f\n" \ + find "$dest" -type f -printf "%f\n" \ | sed 's/\.[Aa]pp[Ii]mage$//g' \ | dmenu -x -l 10 -g 1 -p "AppImage:")" -setsid ~/AppImages/"${appimage:-NOSEL}"* +setsid "${dest}/${appimage:-NOSEL}"* diff --git a/config/essentials/zsh/aliases.zsh b/config/essentials/zsh/aliases.zsh index c981223..f532a5f 100644 --- a/config/essentials/zsh/aliases.zsh +++ b/config/essentials/zsh/aliases.zsh @@ -7,6 +7,8 @@ alias -g nb='newsboat' alias -g sr='surfraw' alias -g ccu='calcurse' +alias arduino-cli='arduino-cli --config-file $XDG_CONFIG_HOME/arduino15/arduino-cli.yaml' + if [ -x /usr/bin/dircolors ]; then test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" # alias ls='ls -h --color --group-directories-first' diff --git a/config/zshrc/.zshrc b/config/essentials/zsh/zshrc index 30f6b46..dd52e5e 100644 --- a/config/zshrc/.zshrc +++ b/config/essentials/zsh/zshrc @@ -1,29 +1,10 @@ #!/bin/zsh -export PATH="$HOME/.local/bin:$PATH" -export PATH="$HOME/bin:$PATH" -export PATH="$HOME/go/bin:$PATH" - -export XINITRC="$HOME/.config/x11/xinitrc" -export EDITOR="nvim" -export VISUAL="nvim" -export TERMINAL="st" -export BROWSER="firefox" - -export CARGO_HOME=~/.config/cargo -export GNUPGHOME="$HOME/.config/gnupg" -export GTK2_RC_FILES="$HOME/.config/gtk-2.0/gtkrc-2.0" -export QT_QPA_PLATFORMTHEME="qt5ct" - -export _JAVA_AWT_WM_NONREPARENTING=1 - -export PASSWORD_STORE_CLIP_TIME=5 - if [ ! $(pgrep Xorg) ] && [ "tty1" = "$(basename $(tty))" ] then clear - eval "$(keychain --dir "$HOME/.config/keychain" --eval --quiet --agents gpg 3A626DD20A32EB2E5DD9CE71CFD9ABC97158CD5D 2> /dev/null)" - eval "$(keychain --dir "$HOME/.config/keychain" --noask --eval --quiet --agents ssh 2> /dev/null)" + eval "$(keychain --dir "$XDG_CONFIG_HOME/keychain" --eval --quiet --agents gpg 3A626DD20A32EB2E5DD9CE71CFD9ABC97158CD5D 2> /dev/null)" + eval "$(keychain --dir "$XDG_CONFIG_HOME/keychain" --noask --eval --quiet --agents ssh 2> /dev/null)" clear startx 2&> /dev/null exit @@ -35,6 +16,7 @@ zle -N edit-command-line zstyle ':compinstall' filename '/home/aluc/.zshrc' zstyle ':completion:*' menu select autoload -Uz compinit +compinit -d $XDG_CACHE_HOME/zsh/zcompdump-$ZSH_VERSION autoload -Uz surround zle -N delete-surround surround zle -N add-surround surround @@ -115,18 +97,3 @@ setopt histreduceblanks setopt interactivecomments setopt notify setopt cdablevars - -# Variables -HISTFILE=~/.config/zsh/histfile -HISTSIZE=100000 -SAVEHIST=100000 - -ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=10' -GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' -ZOT="${HOME}/zot" - -# old -# export RANGER_LOAD_DEFAULT_RC=FALSE -# export VIMINIT="source ~/.config/vim/vimrc" -# export NVM_DIR="$HOME/.config/nvm" -# export fpath=($HOME/.config/zsh/completion/ $fpath) diff --git a/config/home/.zshenv b/config/home/.zshenv new file mode 100644 index 0000000..00aab62 --- /dev/null +++ b/config/home/.zshenv @@ -0,0 +1,50 @@ +#!/bin/zsh +export PATH="$HOME/.local/bin:$PATH" +export PATH="$HOME/bin:$PATH" +export PATH="$HOME/go/bin:$PATH" + +export EDITOR="nvim" +export VISUAL="nvim" +export TERMINAL="st" +export BROWSER="firefox" + +export XDG_CONFIG_HOME="$HOME"/.config +export XDG_CACHE_HOME="$HOME"/.cache +export XDG_DATA_HOME="$HOME"/.local/share +export XDG_STATE_HOME="$HOME"/.local/state + +test ! -d "$XDG_CONFIG_HOME"/x11 && + mkdir "$XDG_CONFIG_HOME"/x11 +export XINITRC="$XDG_CONFIG_HOME/x11"/xinitrc +# export XAUTHORITY="$XDG_RUNTIME_DIR/x11"/Xauthority +export CARGO_HOME="$XDG_CONFIG_HOME"/cargo +export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc +export GNUPGHOME="$XDG_CONFIG_HOME"/gnupg +export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc-2.0 +export CUDA_CACHE_PATH="$XDG_CONFIG_HOME"/nv +export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME"/npm/npmrc +export NVM_DIR="$XDG_DATA_HOME/nvm" +export W3M_DIR="$XDG_STATE_HOME"/w3m + +export ZDOTDIR="$XDG_CONFIG_HOME"/zsh +export HISTFILE="$ZDOTDIR"/histfile +export HISTSIZE=100000 +export SAVEHIST=100000 +export ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=10' + +export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' + +export QT_QPA_PLATFORMTHEME="qt5ct" + +export _JAVA_AWT_WM_NONREPARENTING=1 +export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java + +export PASSWORD_STORE_CLIP_TIME=5 + + +source "$ZDOTDIR"/zshrc + +# old +# export RANGER_LOAD_DEFAULT_RC=FALSE +# export VIMINIT="source ~/.config/vim/vimrc" +# export fpath=($XDG_CONFIG_HOME/zsh/completion/ $fpath) diff --git a/stowcmds.sh b/stowcmds.sh index 9e9d26e..05d163c 100755 --- a/stowcmds.sh +++ b/stowcmds.sh @@ -26,21 +26,21 @@ case "$MACH" in stow -d bin/ -t "$HOME/bin" -R common guiscripts extra mkdir -p "$HOME/.config" stow -d config/ -t "$HOME/.config" -R essentials common extra X theme xdg - stow -d config/ -t "$HOME/" -R zshrc + stow -d config/ -t "$HOME/" -R home ;; "server" | "s") mkdir -p "$HOME/bin" stow -d bin/ -t "$HOME/bin" -R common mkdir -p "$HOME/.config" stow -d config/ -t "$HOME/.config" -R essentials common - stow -d config/ -t "$HOME/" -R zshrc + stow -d config/ -t "$HOME/" -R home ;; "laptop" | "l") mkdir -p "$HOME/bin" stow -d bin/ -t "$HOME/bin" -R common guiscripts extra mkdir -p "$HOME/.config" stow -d config/ -t "$HOME/.config" -R essentials common extra theme xdg hyprland X - stow -d config/ -t "$HOME/" -R zshrc + stow -d config/ -t "$HOME/" -R home ;; *) echo "E: invalid value for 'MACH'" 1>&2 |