From e3eea3bc818524bbeca8fbf70209bf3ceeebd34c Mon Sep 17 00:00:00 2001 From: DustVoice Date: Thu, 23 Jan 2020 19:45:46 +0100 Subject: [PATCH] Move PATH, aliases, etc. to .zshenv and modify rofi execution --- .Xresources | 4 ++-- .bashrc | 21 ---------------- .gitignore | 1 + .zshenv | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++ .zshrc | 53 +--------------------------------------- 5 files changed, 73 insertions(+), 75 deletions(-) create mode 100644 .zshenv diff --git a/.Xresources b/.Xresources index dd57b32..56ae1ab 100644 --- a/.Xresources +++ b/.Xresources @@ -1,2 +1,2 @@ -rofi.run-command: fish -c '{cmd}' -rofi.run-list-command: 'fish -c functions' +rofi.run-command: zsh -c '{cmd}' +rofi.run-list-command: 'zsh -c rofi-scripts' diff --git a/.bashrc b/.bashrc index 45a795e..7bf77b0 100644 --- a/.bashrc +++ b/.bashrc @@ -87,11 +87,6 @@ fi # colored GCC warnings and errors #export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' -# some more ls aliases -alias ll='ls -alF' -alias la='ls -A' -alias l='ls -CF' - # Add an "alert" alias for long running commands. Use like so: # sleep 10; alert alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"' @@ -115,19 +110,3 @@ if ! shopt -oq posix; then . /etc/bash_completion fi fi - -export SSH_AUTH_SOCK="$(gpgconf --list-dir socketdir)/S.gpg-agent.ssh" -export GPG_TTY=$(tty) -gpg-connect-agent updatestartuptty /bye - -export EDITOR=nvim -export TERMINAL=gnome-terminal - -export PATH=$HOME/bin:$HOME/.local/bin:$PATH:~/JUCE -export JUCE_PATH=~/JUCE -export FRUT_PATH=~/FRUT - -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH -export CXXFLAGS='-std=c++14' - -export LIBGL_ALWAYS_INDIRECT=1 diff --git a/.gitignore b/.gitignore index b614c9e..0a0496b 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ !/.xinitrc !/.Xmodmap.example !/.Xresources +!/.zshenv !/.zshrc !/README.md diff --git a/.zshenv b/.zshenv new file mode 100644 index 0000000..0d1dc87 --- /dev/null +++ b/.zshenv @@ -0,0 +1,69 @@ +typeset -U PATH path MANPATH LD_LIBRARY_PATH + +MANPATH="/usr/local/man:$MANPATH" +export MANPATH + +# You may need to manually set your language environment +LANG=en_US.UTF-8 +export LANG + +# Preferred editor for local and remote sessions +# if [[ -n $SSH_CONNECTION ]]; then +# export EDITOR='vim' +# else +# export EDITOR='mvim' +# fi + +EDITOR='nvim' +export EDITOR + +# Compilation flags +# export ARCHFLAGS="-arch x86_64" + +# Set personal aliases, overriding those provided by oh-my-zsh libs, +# plugins, and themes. Aliases can be placed here, though oh-my-zsh +# users are encouraged to define aliases within the ZSH_CUSTOM folder. +# For a full list of active aliases, run `alias`. +# +# Example aliases +# alias zshconfig="mate ~/.zshrc" +# alias ohmyzsh="mate ~/.oh-my-zsh" + +SSH_AUTH_SOCK="$(gpgconf --list-dir socketdir)/S.gpg-agent.ssh" +export SSH_AUTH_SOCK + +GPG_TTY=$(tty) +export GPG_TTY + +TERMINAL='xfce4-terminal' +export TERMINAL + +path=("$HOME/bin" "$HOME/.local/bin" "/usr/local/bin" "$path[@]" "$HOME/JUCE") +export PATH + +JUCE_PATH='~/JUCE' +export JUCE_PATH + +FRUT_PATH='~/FRUT' +export FRUT_PATH + +LD_LIBRARY_PATH=$LD_LIBRARY_PATH +export LD_LIBRARY_PATH + +CXXFLAGS='-std=c++14' +export CXXFLAGS + +LIBGL_ALWAYS_INDIRECT=1 +export LIBGL_ALWAYS_INDIRECT + +alias la='ls -lahF' +alias ll='ls -lhF' +alias ls='ls -F --color=tty' +alias lsa='ls -aF' +alias layout='xkblayout-state print "%s %v"' +alias picom-default='picom -bGC --backend glx --unredir-if-possible-delay 1000 --vsync' +alias screenkey-obs='screenkey --no-systray -t 2 -p fixed -s small -g 960x36+960+4 --key-mode composed --bak-mode full --mods-mode normal --scr 0 -f Hack' +alias tmate-obs='tmate -k tmk-ET35fx5m9cA7cxOt4jjWkSmaOy -r DustVoice' +alias xfce-polkit='/usr/lib/xfce-polkit/xfce-polkit' + +alias rofi-scripts='alias | sed -e "s/=.*//"' diff --git a/.zshrc b/.zshrc index a21ff72..e2362a5 100644 --- a/.zshrc +++ b/.zshrc @@ -66,6 +66,7 @@ SAVEHIST=$HISTSIZE setopt HIST_EXPIRE_DUPS_FIRST setopt HIST_IGNORE_DUPS setopt HIST_IGNORE_ALL_DUPS +setopt COMPLETE_ALIASES ZSH_AUTOSUGGEST_USE_ASYNC="true" ZSH_AUTOSUGGEST_STRATEGY=(history) @@ -95,56 +96,4 @@ bindkey -M vicmd 'H' autosuggest-clear bindkey -M vicmd '$' autosuggest-accept bindkey -M vicmd '0' autosuggest-clear -# User configuration - -export MANPATH="/usr/local/man:$MANPATH" - -# You may need to manually set your language environment -export LANG=en_US.UTF-8 - -# Preferred editor for local and remote sessions -# if [[ -n $SSH_CONNECTION ]]; then -# export EDITOR='vim' -# else -# export EDITOR='mvim' -# fi - -export EDITOR='nvim' - -# Compilation flags -# export ARCHFLAGS="-arch x86_64" - -# Set personal aliases, overriding those provided by oh-my-zsh libs, -# plugins, and themes. Aliases can be placed here, though oh-my-zsh -# users are encouraged to define aliases within the ZSH_CUSTOM folder. -# For a full list of active aliases, run `alias`. -# -# Example aliases -# alias zshconfig="mate ~/.zshrc" -# alias ohmyzsh="mate ~/.oh-my-zsh" - -export SSH_AUTH_SOCK="$(gpgconf --list-dir socketdir)/S.gpg-agent.ssh" -export GPG_TTY=$(tty) gpg-connect-agent updatestartuptty /bye - -export EDITOR=nvim -export TERMINAL=gnome-terminal - -export PATH=$HOME/bin:$HOME/.local/bin:/usr/local/bin:$PATH:~/JUCE -export JUCE_PATH=~/JUCE -export FRUT_PATH=~/FRUT - -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH -export CXXFLAGS='-std=c++14' - -export LIBGL_ALWAYS_INDIRECT=1 - -alias la='ls -lahF' -alias ll='ls -lhF' -alias ls='ls -F --color=tty' -alias lsa='ls -aF' -alias layout='xkblayout-state print "%s %v"' -alias picom-default='picom -bGC --backend glx --unredir-if-possible-delay 1000 --vsync' -alias screenkey-obs='screenkey --no-systray -t 2 -p fixed -s small -g 960x36+960+4 --key-mode composed --bak-mode full --mods-mode normal --scr 0 -f Hack' -alias tmate-obs='tmate -k tmk-ET35fx5m9cA7cxOt4jjWkSmaOy -r DustVoice' -alias xfce-polkit='/usr/lib/xfce-polkit/xfce-polkit'