diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/mutt/muttrc | 2 | ||||
| -rw-r--r-- | config/vim/pluggins.vim | 2 | ||||
| -rw-r--r-- | config/vim/vimrc | 13 | ||||
| -rwxr-xr-x | config/x11/xinitrc (renamed from config/startx/xinitrc) | 3 | ||||
| -rw-r--r-- | config/xmonad/xmonad.hs | 8 | ||||
| -rw-r--r-- | config/zsh/.zshrc | 10 | ||||
| -rw-r--r-- | config/zsh/aliases.zsh | 20 | ||||
| -rwxr-xr-x | config/zsh/zprofile (renamed from config/zsh/.zprofile) | 17 |
8 files changed, 34 insertions, 41 deletions
diff --git a/config/mutt/muttrc b/config/mutt/muttrc index b4b02a8..5bb9961 100644 --- a/config/mutt/muttrc +++ b/config/mutt/muttrc @@ -51,7 +51,7 @@ set message_cachedir = "~/.mutt/cache/bodies" set certificate_file = "~/.mutt/certificates" # solarized color scheme -source "$DOTDIR/mutt-colors-solarized/mutt-colors-solarized-dark-16.muttrc" +source "$XDG_DATA_HOME/mutt/solarized/mutt-colors-solarized-dark-16.muttrc" # password source "gpg -d $HOME/.config/mutt/passwd.muttrc.gpg 2> /dev/null |" diff --git a/config/vim/pluggins.vim b/config/vim/pluggins.vim index c60ab84..7091c5f 100644 --- a/config/vim/pluggins.vim +++ b/config/vim/pluggins.vim @@ -2,7 +2,7 @@ " vim pluggins " """""""""""""""" -call plug#begin() +call plug#begin("$XDG_DATA_HOME/vim/plugged") Plug 'ctrlpvim/ctrlp.vim' " Ctrl-P similar to vsc Plug 'tpope/vim-eunuch' " basic unix command in vim Plug 'tomtom/tcomment_vim' " mininal commenter diff --git a/config/vim/vimrc b/config/vim/vimrc index 6b1bcc2..644032f 100644 --- a/config/vim/vimrc +++ b/config/vim/vimrc @@ -19,7 +19,7 @@ set directory=$XDG_CACHE_HOME/vim/swap | call mkdir(&directory, 'p') set undodir=$XDG_CACHE_HOME/vim/undo | call mkdir(&undodir, 'p') " }}} -source pluggins.vim " load pluggins +source $XDG_CONFIG_HOME/vim/pluggins.vim " load pluggins " common {{{ let mapleader = ' ' " set leader key to space @@ -94,14 +94,14 @@ set nofoldenable " not folded by default " let g:dracula_bold = 1 " let g:dracula_italic = 1 " let g:dracula_colorterm = 0 -" colorscheme dracula +" silent! colorscheme dracula " }}} " solarized {{{ set t_Co=16 let g:solarized_termcolors=16 let g:solarized_visibility='low' " visibility of invisible chars with set list set background=dark -colorscheme solarized +silent! colorscheme solarized " }}} " lightline {{{ let g:lightline = {} @@ -171,10 +171,7 @@ nnoremap <leader><TAB> :b#<CR> nnoremap <leader>bl :ls<CR> " }}} -" vimrc {{{ -nnoremap <leader>rc :vsplit $DOTDIR/.vimrc<cr> -nnoremap <leader>sc :source $MYVIMRC<cr> -" }}} +nnoremap <leader>sc :source $MYVIMRC<cr> " source vimrc " c {{{ " create c function body from prototype @@ -313,3 +310,5 @@ let g:gutentags_ctags_exclude = ['doc/*', 'Makefile'] " let g:gutentags_ctags_exclude_wildignore = 1 let g:goyo_height = 90 + +set viminfo+=n$XDG_CACHE_HOME/vim/viminfo diff --git a/config/startx/xinitrc b/config/x11/xinitrc index 860fed2..2dbe77a 100755 --- a/config/startx/xinitrc +++ b/config/x11/xinitrc @@ -3,10 +3,11 @@ # xinput disable 'ETPS/2 Elantech Touchpad' & echo 'Starting redshift' -redshift -c $HOME/.config/redshift.conf & +redshift -c $XDG_CONFIG_HOME/redshift/redshift.conf & echo 'Starting dunst' dunst & xset r rate 200 50 +pulseaudio --daemonize case "$(cat /etc/hostname)" in cacharle-main) diff --git a/config/xmonad/xmonad.hs b/config/xmonad/xmonad.hs index b61bcea..b1655ef 100644 --- a/config/xmonad/xmonad.hs +++ b/config/xmonad/xmonad.hs @@ -50,12 +50,12 @@ myKeys = [ ("<XF86AudioLowerVolume>", spawn "pulseaudio-ctl down") , ("M-<F11>", spawn "pulseaudio-ctl down") , ("M-<F12>", spawn "pulseaudio-ctl up") - , ("<XF86MonBrightnessUp>", spawn "~/bin/backlight-ctl up") - , ("<XF86MonBrightnessDown>", spawn "~/bin/backlight-ctl down") + , ("<XF86MonBrightnessUp>", spawn "backlight-ctl up") + , ("<XF86MonBrightnessDown>", spawn "backlight-ctl down") , ("<XF86ScreenSaver>", spawn "slock") - , ("<XF86TouchpadToggle>", spawn "~/bin/touchpad-toggle") + , ("<XF86TouchpadToggle>", spawn "touchpad-toggle") - , ("M-o", spawn "~/bin/project-open") + , ("M-o", spawn "project-open") , ("M-m", spawn "st -e mocp") , ("M-S-d", spawn "notify-send -i x-office-calendar \"$(date +\"%H:%M %A %d/%m/%Y %B\")\"") , ("M-S-b", spawn "notify-send \"battery: $(cat /sys/class/power_supply/BAT0/capacity)\"") diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc index 9cd21b5..aef07dd 100644 --- a/config/zsh/.zshrc +++ b/config/zsh/.zshrc @@ -3,10 +3,8 @@ ############### -[ -z $DOTDIR ] && export DOTDIR=$HOME/git/dotfiles # FIXME have to change path manually if install elsewhere - # load aliases -source $DOTDIR/.zsh_aliases +source $XDG_CONFIG_HOME/zsh/aliases.zsh # prompt case `tty` in @@ -19,7 +17,7 @@ case `tty` in ;; *) # pure prompt - export FPATH="$FPATH:$HOME/.zsh/pure" + export FPATH="$FPATH:$XDG_DATA_HOME/zsh/pure" ZSH_THEME="pure" autoload -U promptinit promptinit @@ -64,8 +62,7 @@ function chpwd() { #source /etc/zsh_command_not_found -# ignore filetypes in autocomplete -fignore=(o hi) +fignore=(o hi) # ignore extensions in autocomplete # pluggins source $XDG_DATA_HOME/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh # prompt syntax highlight @@ -76,5 +73,4 @@ source $XDG_DATA_HOME/zsh/zsh-you-should-use/you-should-use.plugin.zsh # alias # set tab to 4 spaces tabs 4 - export GPG_TTY=$(tty) # fixing gpg fatal error about tty diff --git a/config/zsh/aliases.zsh b/config/zsh/aliases.zsh index 790692e..3d2cfa1 100644 --- a/config/zsh/aliases.zsh +++ b/config/zsh/aliases.zsh @@ -20,10 +20,10 @@ alias doas='doas ' # same for doas alias info='info --vi-keys' # ls -alias ls='ls --color=auto -F' -alias ll="ls -lh" -alias la="ls -a" -alias lla="ls -alh" +alias ls='ls --color=auto -Fh' +alias ll="ls -l" +alias la="ls -A" +alias lla="ls -Al" alias lss="ls -Ssh" # tree @@ -88,18 +88,6 @@ alias lpassp='lpass show --password --clip' # put password in clipboard alias dual='xrandr --output LVDS1 --primary --left-of VGA1 --output VGA1 --mode 1280x1024' alias single='xrandr --output VGA1 --off' - -# edit config files -alias zshrc="vim $DOTDIR/.zshrc && source $DOTDIR/.zshrc" -alias zshaliasrc="vim $DOTDIR/.zsh_aliases && source $DOTDIR/.zshrc" -alias vimrc="vim $DOTDIR/.vimrc" -alias vimplugrc="vim $DOTDIR/.pluggins.vim" -alias xmonadrc="vim $DOTDIR/xmonad.hs" -alias muttrc="vim $DOTDIR/.muttrc" - -# other -#alias date="date -R" - # parent directory jump alias ..='cd ..' alias ...='cd ../..' diff --git a/config/zsh/.zprofile b/config/zsh/zprofile index 91b0c0b..bd9c23b 100755 --- a/config/zsh/.zprofile +++ b/config/zsh/zprofile @@ -14,10 +14,19 @@ export BROWSERCLI='w3m' export XDG_CONFIG_HOME="$HOME/.config" export XDG_DATA_HOME="$HOME/.local/share" export XDG_CACHE_HOME="$HOME/.cache" - -export ZDOTDIT="$XDG_CONFIG_HOME/zsh" - -export HISTFILE="$XDG_CACHE_HOME/histfile" +# config +export ZDOTDIR="$XDG_CONFIG_HOME/zsh" +export XINITRC="$XDG_CONFIG_HOME/x11/xinitrc" +export VIMINIT='let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc" | source $MYVIMRC' +# data +export GNUPGHOME="$XDG_DATA_HOME/gnupg" +export GOPATH="$XDG_DATA_HOME/go" +export CARGO_HOME="$XDG_DATA_HOME/cargo" +# cache +export HISTFILE="$XDG_CACHE_HOME/history" +export LESSHISTFILE='-' # no ~/.lesshst +# runtime +export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" # color in man (less pager) export LESS_TERMCAP_mb=$'\e[1;32m' |