diff --git a/i3/.Xresources b/i3/.Xresources index b0edf23..f7ddfa1 100644 --- a/i3/.Xresources +++ b/i3/.Xresources @@ -1,15 +1,17 @@ !URxvt.boldFont: -misc-fixed-medium-r-semicondensed--13-100-100-100-c-60-iso8859-1 -URxvt.font: -*-*-*-*-*-*-*-*-*-*-*-*-*-* -!URxvt.font: xft:Misc Fixed:size=10 +!URxvt.font: -*-*-*-*-*-*-*-*-*-*-*-*-*-* +URxvt.font: xft:Misc Fixed:size=14 !URxvt.boldFont: -*-*-*-*-*-*-*-*-*-*-*-*-*-* !URxvt.font: xft:Fixed:style=SemiCondensed:size=10 !URxvt.font: xft:Inconsolata:size=12 !URxvt.font: xft:Terminus:size=12 -!URxvt.font: xft:Neep:size=13 +!URxvt.font: xft:jmk Neep !URxvt.font: xft:Courier New:size=12 !URxvt.font: xft:Gohu GohuFont:size=12 !URxvt.font: xft:Misc Termsynu:size=13 !URxvt.font: xft:Unifont:size=13 +!URxvt.font: xft:Monospace:size=11 +!URxvt.font: xft:FixedsysTTF Semi-Bold:size=11 !URxvt.faceName: -*-*-*-*-*-*-10-*-*-*-*-*-*-* !URxvt.font: xft:Fixed:style=SemiCondensed:size=16 diff --git a/i3/.config/i3/run.sh b/i3/.config/i3/run.sh index 3f07266..c4b2711 100755 --- a/i3/.config/i3/run.sh +++ b/i3/.config/i3/run.sh @@ -73,7 +73,11 @@ if [ "$ARG" = "boot" ];then #fi #feh --bg-scale "$(shuf -n1 <(realpath /home/stonewareslord/owncloud/wallpaper/$(hostname)))" #xinput --set-prop 'Logitech USB Optical Mouse' 'Device Accel Constant Deceleration' 3 - $(which ck-launch-session 2>/dev/null) $(which i3) + if command -v ck-launch-session >/dev/null; then + ck-launch-session i3 + else + i3 + fi fi if [ "$ARG" = "screen-lock" ];then revert(){ diff --git a/i3/.xsession b/i3/.xsession old mode 100644 new mode 100755 index a8afe72..6679608 --- a/i3/.xsession +++ b/i3/.xsession @@ -1,3 +1,4 @@ +#!/bin/sh exec ~/.config/i3/run.sh boot #exec /usr/bin/ck-launch-session /usr/local/bin/i3 #exec numlockx& diff --git a/shell/.bashrc b/shell/.bashrc index 5e7fee7..413f7cb 100644 --- a/shell/.bashrc +++ b/shell/.bashrc @@ -1,4 +1,4 @@ -export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games +export PATH="$HOME/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games" #prompt_cmd() { # PS1="$(~/git/cesium/cesium --mode ps1 --rc "$?" --shell bash)" # unset CESIUM_LAST_COMMAND_TIME diff --git a/shell/.zshrc b/shell/.zshrc index 4b9cc16..18d97ee 100644 --- a/shell/.zshrc +++ b/shell/.zshrc @@ -335,16 +335,30 @@ echo -ne '[# ]\r' if [[ -f ~/.zsh-git/custom-config/zshrc ]]; then source ~/.zsh-git/custom-config/zshrc fi + function prompt_pre() { - CESIUM_LAST_COMMAND_TIME="$(date +%s)" + export CESIUM_LAST_COMMAND_TIME="$(date +%s)" } function prompt_cmd() { - PS1="$(CESIUM_LAST_COMMAND_TIME="$CESIUM_LAST_COMMAND_TIME" RC="$?" ~/git/cesium/cesium --mode ps1 --shell zsh)" - RPS1="$(CESIUM_LAST_COMMAND_TIME="$CESIUM_LAST_COMMAND_TIME" RC="$?" ~/git/cesium/cesium --mode rps1 --shell zsh)" + PS1="$(cesium --mode ps1 --rc "$?" --shell zsh)" + RPS1="$(cesium --mode rps1 --rc "$?" --shell zsh)" unset CESIUM_LAST_COMMAND_TIME } autoload -Uz add-zsh-hook precmd_functions+=(prompt_cmd) add-zsh-hook preexec prompt_pre + + +#function prompt_pre() { +# CESIUM_LAST_COMMAND_TIME="$(date +%s)" +#} +#function prompt_cmd() { +# PS1="$(CESIUM_LAST_COMMAND_TIME="$CESIUM_LAST_COMMAND_TIME" RC="$?" ~/git/cesium/cesium --mode ps1 --shell zsh)" +# RPS1="$(CESIUM_LAST_COMMAND_TIME="$CESIUM_LAST_COMMAND_TIME" RC="$?" ~/git/cesium/cesium --mode rps1 --shell zsh)" +# unset CESIUM_LAST_COMMAND_TIME +#} +#autoload -Uz add-zsh-hook +#precmd_functions+=(prompt_cmd) +#add-zsh-hook preexec prompt_pre echo -e '[##]' #zprof diff --git a/vim/.vimrc b/vim/.vimrc index c1cf1da..b8d265d 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -13,6 +13,8 @@ command! WW %!sudo tee > /dev/null % autocmd VimEnter,Colorscheme * :hi IndentGuidesOdd guibg=darkgrey ctermbg=darkgrey autocmd VimEnter,Colorscheme * :hi IndentGuidesEven guibg=grey ctermbg=grey autocmd FileType yaml.ansible setlocal ts=2 sts=2 sw=2 expandtab noautoindent +autocmd FileType php let b:AutoPairs = AutoPairsDefine({'', ''}) +autocmd FileType html.twig let b:AutoPairs = AutoPairsDefine({'{{' : '}}', '{%': '%}'}) filetype plugin on set grepprg=grep\ -nH\ $* "let g:tex_flavor='latex' @@ -246,7 +248,7 @@ endif "Exchange two selections of text | https://github.com/tommcdo/vim-exchange "Plug 'https://gitea.austenwares.com/vim/vim-repeat' "Repeat last tpope command with . | https://github.com/tpope/vim-repeat - "Plug 'https://gitea.austenwares.com/vim/vim-fugitive' + Plug 'https://gitea.austenwares.com/vim/vim-fugitive' "Great Vim-Git compatibility | https://github.com/tpope/vim-fugitive Plug 'https://gitea.austenwares.com/vim/ctrlp.vim' "Fuzzy file search | https://github.com/kien/ctrlp.vim @@ -365,7 +367,8 @@ function! Initialize() silent !vim +"PlugClean" +"PlugInstall" +"PlugUpdate" +"qa" q endfunction -set guifont=jmk\ Neep\ 10 +"set guifont=jmk\ Neep\ 10 +set guifont="Monospace 10" "inoremap =g:UltiSnips_Complete() "map b JavagetsetInsertBothGetterSetter "map a O:Autoformat:v/\S/d:nohlsearch