dot

packages and services management
Log | Files | Refs | README

commit 3cc965480d570b7c5bdc5607c10c0a5dba75c23a
parent f24232ffcd3ee0f08c21c012b38a3e3388379d9c
Author: josuah <mail@josuah.net>
Date:   Tue, 27 Sep 2016 13:53:56 -0400

Organizing a few vim and tmux.

Diffstat:
Mcron/.config/cron/tab | 3++-
Memacs/.emacs | 16+++++++++-------
Minstall.sh | 10+++++-----
Mshell/.profile | 2+-
Mtmux/.tmux.conf | 11++++++++---
Avim/.vim/vimrc | 135+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Dvim/.vimrc | 132-------------------------------------------------------------------------------
Mxorg/.xinitrc | 2+-
8 files changed, 161 insertions(+), 150 deletions(-)

diff --git a/cron/.config/cron/tab b/cron/.config/cron/tab @@ -5,4 +5,5 @@ # / / / / ________ Weekday (0-6) 0=sun # / / / / / _ Command run-string #/ / / / / / -*/5 * * * * $HOME/.config/cron/jobs/checkmail +*/1 * * * * $HOME/.config/cron/jobs/checkmail +*/1 * * * * $HOME/.config/cron/jobs/beepnow diff --git a/emacs/.emacs b/emacs/.emacs @@ -56,7 +56,7 @@ (/// "packages") (require 'package) -(setq package-list '(ivy swiper counsel which-key)) +(setq package-list '(ivy swiper counsel which-key undo-tree)) (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/")) (package-initialize) @@ -387,26 +387,28 @@ (add-hook 'gnus-group-mode-hook 'gnus-topic-mode) + (global-set-key (kbd "C-c g") 'gnus) (/// "ivy") (require 'ivy) - +(require 'swiper) +(require 'counsel) (ivy-mode) +(counsel-mode) -(require 'swiper) (global-set-key (kbd "C-s") 'swiper) - -(require 'counsel) (global-set-key (kbd "M-x") 'counsel-M-x) (/// "which-key") (require 'which-key) - (which-key-mode) +(/// "undo-tree") +(require 'undo-tree) +(undo-tree-mode) + (/// "emacs") - (provide 'init) ;;; init.el ends here diff --git a/install.sh b/install.sh @@ -33,10 +33,10 @@ case "$1" in host='mail.gandi.net' mkdir -p "$HOME/Mail" "$HOME/.cache/mail" - read -p 'password: ' pass - printf 'machine %s\nlogin %s\npassword "%s"' "$host" "$mail" "$pass" \ - > "$HOME/.netrc" - chmod 750 "$HOME/.netrc" + read -p 'password: ' p + printf 'machine %s\nlogin %s\npassword "%s"' "$host" "$mail" "$p" > ~/.netrc + chmod 700 "$HOME/.netrc" + printf '\033[A\r\033[K' ;; -s) Sync="$HOME/Sync" @@ -60,7 +60,7 @@ case "$1" in wget -qO ~/.vim/autoload/pathogen.vim https://tpo.pe/pathogen.vim for p in $(sed '/^[ \t-]*$/ d; 1,/^VIM/ d; /^PROJ/,$ d' "$pwd/README") - do wget -qO- "${p##* }/archive/master.tar.gz" | tar -xvz -f- -C "$b" & + do wget -O- "${p##* }/archive/master.tar.gz" | tar -xvz -f- -C "$b" & done wait diff --git a/shell/.profile b/shell/.profile @@ -187,7 +187,7 @@ gitall() git="${git%/*}" printf '\n\n\033[1m%s\033[0m\n' "~${git#$HOME}" cd "$git" - git status + git status --porcelain cd "$HOME" done } diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf @@ -48,9 +48,14 @@ bind -r < swap-window -t - bind -r > swap-window -t + bind -r p previous-window bind -r n next-window -bind C new-window\; send-keys '\ - d="$(find . -type d ! -path "*/.*" | fzy -l 1000)"; \ - cd "$d"; tmux rename-window ${d##*/};'"\n" +bind C new-window\; send-keys ' \ + dir="$(find . -maxdepth 3 -type d ! -path "*/.*" | fzy -l 1000)"; \ + cd "$dir"; \ + dir="${dir##*/}"; \ + name="$( printf %s "$dir" | cut -c 1 | tr [a-z] [A-Z])"; \ + name="$name$(printf %s "$dir" | cut -c 2-)"; \ + tmux rename-window "$name"; \ + '"\n" # Sessions management bind -n C-z detach diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc @@ -0,0 +1,135 @@ +" __ +" __ /\ \/ ________ _____ ____ +" / / / / /\ / __ __ \ / ____\/ ___\ +" \ \/ / / // / / / / // / / /__ +" \_,' \/ \/ \/ \/ \/ \____\ 2016-09-23 +"=============================================================================== +" Config for vim using vim's features rather than a lot of plugins + + +" OPTIONS 2016-09-23 +"------------------------------------------------------------------------------- + +syntax enable | filetype plugin on | set nocompatible + +set omnifunc=syntaxcomplete#Complete " Completion +set autoindent copyindent " Indentation +set laststatus=2 ruler showcmd " Status +set smartcase ignorecase showmatch incsearch " Searching +set list listchars=tab::\ ,trail:.,nbsp:.,extends:>,precedes:< " Listchars +set fillchars=stl:_,stlnc:_,vert:: " Fillchars +set number numberwidth=1 cursorline nowrap " Interface +set scrolloff=3 " Scroll +set backupdir=~/.cache/vim// directory=~/.cache/vim// undodir=~/.cache/vim// +set virtualedit=block formatprg=fmt " Editing +set wildmenu wildmode=longest:full,full " Completion +set hidden " Buffers +set showfulltag " Compilation +let &colorcolumn=join(range(81,120),",") + + +" MAPPINGS 2016-09-23 +"------------------------------------------------------------------------------- + +let mapleader = ' ' + +map Y y$ + +" <leader> menu +nmap <leader><leader> : +\ ec ' <w> write <b> buffers <s> set <c> clist </> search ' \| +\ ec ' <e> edit <T> tabs <h> help <t> tags <"> registers' \| +\ ec ' <m> make '"<'>"'marks' \| +\ <cr>: +nmap <leader>w :w<cr> +nmap <leader>s :set <c-d> +nmap <leader>h :help +nmap <leader>b :pwd \| echo '' \| ls \| echo ''<cr>:b +nmap <leader>T :pwd \| echo '' \| tabs \| echo ''<cr>:tab +nmap <leader>c :pwd \| echo '' \| clist \| echo ''<cr> +nmap <leader>C :cwindow<cr>:set nocursorline<cr> +nmap <leader>t :pwd \| echo '' \| tags \| echo ''<cr>:tag +nmap <leader>" : echo '' \| registers <cr> +nmap <leader>' : echo '' \| marks <cr>:' +nmap <leader>m :silent !make clean<cr>:silent make \| redraw! \| clist<cr> +nmap <leader>/ :exe ':' . system("swiper '" . expand("%:p") . "'") +\ \| redraw!<cr> +nmap <leader>e :pwd \| echo ''<cr>:exe 'e' +\ system("find . -type f ! -path '*/.git/*' \| fzy") +\ \| redraw!<cr> + +" <c>hange <o>ption <...> +nmap col :set list ! \| set list ?<cr> +nmap con :set number ! \| set number ?<cr> +nmap cor :set relativenumber ! \| set number ?<cr> +nmap cop :set paste ! \| set paste ?<cr> +nmap coh :set hlsearch ! \| set hlsearch ?<cr> +nmap coc :set cursorcolumn ! \| set cursorcolumn ?<cr> +nmap cov :set ve=<c-r>=(&ve =~# "all") ? 'block' : 'all'<cr><cr>:set ve ?<cr> +nmap cos :if exists("g:syntax_on") \| sy off \| else \| sy enable \| end<cr> +nmap cot :set tw=<c-r>=(&tw != "0" ) ? '0' : '75' <cr> <cr>:set tw ?<cr> + +" <[> previous <]> next +nmap [c :cprevious<cr> +nmap ]c :cnext<cr> +nmap [C :cfirst<cr> +nmap ]C :clast<cr> + +" Editing +nmap [<leader> mzO<Esc>k`z<C-e> +nmap ]<leader> mzo<Esc>k`z + +" Parentheses +vmap <leader>p myomzr\|`zlhr\`ylhr/ + + +" ABBREVIATIONS 2016-09-14 +"------------------------------------------------------------------------------- + +iabbrev -_ <Esc>a-<Esc>:set ve=all<CR>v080lhr-:set ve=block<CR>A +iabbrev =_ <Esc>a=<Esc>:set ve=all<CR>v080lhr=:set ve=block<CR>A + + +" HIGHLIGHTS 2016-09-23 +"------------------------------------------------------------------------------- + +" Interface +highlight NonText cterm=bold ctermfg=2 +highlight SpecialKey cterm=bold ctermfg=0 +highlight CursorLine cterm=none ctermbg=none +highlight CursorColumn cterm=bold ctermfg=2 ctermbg=none +highlight CursorLineNr cterm=bold ctermfg=2 +highlight ColorColumn cterm=none ctermfg=1 ctermbg=none +highlight LineNr cterm=bold ctermfg=0 +highlight StatusLine cterm=bold ctermfg=7 +highlight StatusLineNC cterm=bold ctermfg=0 +highlight ModeMsg cterm=bold ctermfg=2 ctermbg=0 +highlight WildMenu cterm=none ctermfg=0 ctermbg=2 +highlight VertSplit cterm=none ctermfg=7 ctermbg=none +highlight IncSearch cterm=none ctermfg=0 ctermbg=6 +highlight Visual cterm=none ctermfg=0 ctermbg=7 + +" Code +highlight Comment cterm=bold ctermfg=0 +highlight Statement cterm=bold ctermfg=none +highlight Constant cterm=none ctermfg=grey +highlight Type cterm=none ctermfg=7 +highlight Preproc cterm=none ctermfg=7 +highlight Special cterm=bold ctermfg=0 +highlight Identifier cterm=none ctermfg=7 +highlight Number cterm=bold ctermfg=7 + + +" AUTOCOMMANDS 2016-09-10 +" ------------------------------------------------------------------------------ + +autocmd VimEnter * :silent !mkdir -p ~/.cache/vim/ + + +" PLUGINS 2016-09-06 +"------------------------------------------------------------------------------- + +execute pathogen#infect() + +" UndoTree +nmap <leader>u :UndotreeToggle<cr> diff --git a/vim/.vimrc b/vim/.vimrc @@ -1,132 +0,0 @@ -" __ -" __ /\ \/ ________ _____ ____ -" / / / / /\ / __ __ \ / ____\/ ___\ -" \ \/ / / // / / / / // / / /__ -" \_,' \/ \/ \/ \/ \/ \____\ 2016-09-23 -"=============================================================================== -" Config for vim using vim's features rather than a lot of plugins - - -" OPTIONS 2016-09-23 -"------------------------------------------------------------------------------- - -syntax enable | filetype plugin on - -set omnifunc=syntaxcomplete#Complete " Completion -set autoindent copyindent " Indentation -set laststatus=2 ruler showcmd " Status -set smartcase ignorecase showmatch incsearch " Searching -set list listchars=tab::\ ,trail:.,nbsp:.,extends:>,precedes:< " Listchars -set fillchars=stl:_,stlnc:_,vert:: " Fillchars -set number numberwidth=1 cursorline nowrap " Interface -set scrolloff=3 " Scroll -set backupdir=~/.cache/vim// directory=~/.cache/vim// undodir=~/.cache/vim// -set virtualedit=block formatprg=fmt " Editing -set wildmenu wildmode=longest:full,full " Completion -set hidden " Buffers -set showfulltag " Compilation - - -" MAPPINGS 2016-09-23 -"------------------------------------------------------------------------------- - -let mapleader = ' ' - -map Y y$ - -" <leader> menu -nmap <leader><leader> : -\ ec ' <w> write <b> buffers <s> set <c> clist </> search ' \| -\ ec ' <e> edit <T> tabs <h> help <t> tags <"> registers' \| -\ ec ' <m> make '"<'>"'marks' \| -\ <cr>: -nmap <leader>w :w<cr> -nmap <leader>s :set <c-d> -nmap <leader>h :help -nmap <leader>b :pwd \| echo '' \| ls \| echo ''<cr>:b -nmap <leader>T :pwd \| echo '' \| tabs \| echo ''<cr>:tab -nmap <leader>c :pwd \| echo '' \| clist \| echo ''<cr> -nmap <leader>t :pwd \| echo '' \| tags \| echo ''<cr>:tag -nmap <leader>" : echo '' \| registers <cr> -nmap <leader>' : echo '' \| marks <cr>:' -nmap <leader>m : make <cr> -nmap <leader>/ :exe ':' . system("swiper '" . expand("%:p") . "'") -\ \| redraw!<cr> -nmap <leader>e :pwd \| echo ''<cr>:exe 'e' -\ system("find . -type f ! -path '*/.git/*' \| fzy") -\ \| redraw!<cr> - -" <c>hange <o>ption <...> -nmap col :set list ! \| set list ?<cr> -nmap con :set number ! \| set number ?<cr> -nmap cor :set relativenumber ! \| set number ?<cr> -nmap cop :set paste ! \| set paste ?<cr> -nmap coh :set hlsearch ! \| set hlsearch ?<cr> -nmap coc :set cursorcolumn ! \| set cursorcolumn ?<cr> -nmap cov :set ve=<c-r>=(&ve =~# "all") ? 'block' : 'all'<cr><cr>:set ve ?<cr> -nmap cos :if exists("g:syntax_on") \| sy off \| else \| sy enable \| end<cr> -nmap cot :set tw=<c-r>=(&tw != "0" ) ? '0' : '75' <cr> <cr>:set tw ?<cr> - -" <[> previous <]> next -nmap [c :cprevious<cr> | nmap ]c :cnext<cr> -nmap [C :cfirst<cr> | nmap ]C :clast<cr> - -" Editing -nmap [<leader> mzO<Esc>k`z<C-e> -nmap ]<leader> mzo<Esc>k`z - -" Parentheses -vmap <leader>p myomzr\|`zlhr\`ylhr/ - - -" ABBREVIATIONS 2016-09-14 -"------------------------------------------------------------------------------- - -iabbrev -_ <Esc>a-<Esc>:set ve=all<CR>v080lhr-:set ve=block<CR>A -iabbrev =_ <Esc>a=<Esc>:set ve=all<CR>v080lhr=:set ve=block<CR>A - - -" HIGHLIGHTS 2016-09-23 -"------------------------------------------------------------------------------- - -" Interface -highlight NonText cterm=bold ctermfg=2 -highlight SpecialKey cterm=bold ctermfg=0 -highlight CursorLine cterm=none ctermbg=none -highlight CursorColumn cterm=bold ctermfg=2 ctermbg=none -highlight CursorLineNr cterm=bold ctermfg=2 -highlight LineNr cterm=bold ctermfg=0 -highlight StatusLine cterm=bold ctermfg=7 -highlight StatusLineNC cterm=bold ctermfg=0 -highlight ModeMsg cterm=bold ctermfg=2 ctermbg=0 -highlight WildMenu cterm=none ctermfg=0 ctermbg=2 -highlight VertSplit cterm=none ctermfg=7 ctermbg=none -highlight IncSearch cterm=none ctermfg=0 ctermbg=6 -highlight Visual cterm=none ctermfg=0 ctermbg=7 - -" Code -highlight Comment cterm=bold ctermfg=0 -highlight Statement cterm=bold ctermfg=none -highlight Constant cterm=none ctermfg=grey -highlight Type cterm=none ctermfg=7 -highlight Preproc cterm=none ctermfg=7 -highlight Special cterm=bold ctermfg=0 -highlight Identifier cterm=none ctermfg=7 -highlight Number cterm=bold ctermfg=7 - - -" AUTOCOMMANDS 2016-09-10 -" ------------------------------------------------------------------------------ - -autocmd VimEnter * :silent !mkdir -p ~/.cache/vim/ -autocmd VimEnter * :match ErrorMsg /\%81v.\+/ -autocmd WinEnter * :match ErrorMsg /\%81v.\+/ - - -" PLUGINS 2016-09-06 -"------------------------------------------------------------------------------- - -execute pathogen#infect() - -" UndoTree -nmap <leader>u :UndotreeToggle<cr> diff --git a/xorg/.xinitrc b/xorg/.xinitrc @@ -10,7 +10,7 @@ done & nm-applet & xfce4-power-manager & -#feh --bg-center "/home/josuah/Pictures/wallpaper."* +feh --bg-center ~/Images/Interstellar.png #compton & exec dwm