Let my HOME alone 2/2
Also I messed up my Vim syntax coloring and probably X with DM. Oh well.
This commit is contained in:
parent
a83e45df5e
commit
62120e4592
17 changed files with 136 additions and 85 deletions
|
@ -1,3 +1,49 @@
|
|||
import rlcompleter
|
||||
import readline
|
||||
readline.parse_and_bind("tab: complete")
|
||||
import sys
|
||||
import os
|
||||
|
||||
print("HELLO")
|
||||
|
||||
# From https://github.com/python/cpython/blob/v3.7.0b5/Lib/site.py#L436
|
||||
# Changing the history file
|
||||
def register_readline():
|
||||
import atexit
|
||||
try:
|
||||
import readline
|
||||
import rlcompleter
|
||||
except ImportError:
|
||||
return
|
||||
|
||||
# Reading the initialization (config) file may not be enough to set a
|
||||
# completion key, so we set one first and then read the file.
|
||||
readline_doc = getattr(readline, '__doc__', '')
|
||||
if readline_doc is not None and 'libedit' in readline_doc:
|
||||
readline.parse_and_bind('bind ^I rl_complete')
|
||||
else:
|
||||
readline.parse_and_bind('tab: complete')
|
||||
|
||||
try:
|
||||
readline.read_init_file()
|
||||
except OSError:
|
||||
# An OSError here could have many causes, but the most likely one
|
||||
# is that there's no .inputrc file (or .editrc file in the case of
|
||||
# Mac OS X + libedit) in the expected location. In that case, we
|
||||
# want to ignore the exception.
|
||||
pass
|
||||
|
||||
if readline.get_current_history_length() == 0:
|
||||
# If no history was loaded, default to .python_history.
|
||||
# The guard is necessary to avoid doubling history size at
|
||||
# each interpreter exit when readline was already configured
|
||||
# through a PYTHONSTARTUP hook, see:
|
||||
# http://bugs.python.org/issue5845#msg198636
|
||||
history = os.path.join(os.path.expanduser('~'),
|
||||
'.cache/python_history')
|
||||
try:
|
||||
readline.read_history_file(history)
|
||||
except OSError:
|
||||
pass
|
||||
atexit.register(readline.write_history_file, history)
|
||||
|
||||
sys.__interactivehook__ = register_readline
|
||||
|
|
9
config/screenrc
Normal file
9
config/screenrc
Normal file
|
@ -0,0 +1,9 @@
|
|||
term xterm-256color
|
||||
hardstatus off
|
||||
hardstatus alwayslastline
|
||||
hardstatus alwayslastline '%{= G}[ %{G}%H %{g}][%= %{= w}%?%-Lw%?%{= R}%n*%f %t%?%{= R}(%u)%?%{= w}%+Lw%?%= %{= g}][ %{y}Load: %l %{g}][%{B}%Y-%m-%d %{W}%c:%s %{g}]'
|
||||
startup_message off
|
||||
termcapinfo xterm* ti@:te@
|
||||
vbell off
|
||||
altscreen on
|
||||
windowlist string "%4n %h%=%f"
|
|
@ -17,10 +17,10 @@ curl "https://raw.githubusercontent.com/chriskempson/base16-shell/master/scripts
|
|||
chmod +x ~/.local/bin/colorSchemeApply
|
||||
|
||||
# Xressources (I'm not sure if this is really needed with shell overriding these but i3 load those resources)
|
||||
curl "https://raw.githubusercontent.com/chriskempson/base16-xresources/master/xresources/base16-${scheme}-256.Xresources" > ~/.Xresources.d/theme
|
||||
curl "https://raw.githubusercontent.com/chriskempson/base16-xresources/master/xresources/base16-${scheme}-256.Xresources" > ~/.config/Xresources/theme
|
||||
|
||||
# Vim
|
||||
echo -e "let base16colorspace=256\n\"set termguicolors\ncolorscheme base16-${scheme}" > ~/.vim/colorscheme.vim
|
||||
echo -e "let base16colorspace=256\n\"set termguicolors\ncolorscheme base16-${scheme}" > ~/.cache/vim/colorscheme.vim
|
||||
|
||||
# FZF
|
||||
curl "https://raw.githubusercontent.com/nicodebo/base16-fzf/master/bash/base16-${scheme}.config" > ~/.local/bin/colorSchemeApplyFzf
|
||||
|
@ -44,6 +44,6 @@ curl "https://raw.githubusercontent.com/theova/base16-qutebrowser/master/themes/
|
|||
~/.local/bin/colorSchemeApply
|
||||
~/.local/bin/colorSchemeApplyFzf
|
||||
# Error masking in case X not running
|
||||
xrdb -load ~/.Xresources 2> /dev/null
|
||||
xrdb -load ~/.config/Xresources/main 2> /dev/null
|
||||
i3-msg reload 2> /dev/null
|
||||
|
||||
|
|
|
@ -19,6 +19,7 @@ alias dd='dd status=progress'
|
|||
alias rm='rm -Iv --one-file-system'
|
||||
alias free='free -m'
|
||||
alias dmesg='dmesg --ctime'
|
||||
alias wget='wget --hsts-file $HOME/.cache/wget-hsts'
|
||||
|
||||
# [ -f ~/.local/bin/colorSchemeApplyFzf ] && . ~/.local/bin/colorSchemeApplyFzf # Only applies RGB colors...
|
||||
POWERLINE_GO_DEFAULT_OPTS=(-colorize-hostname -max-width 25 -cwd-max-dir-size 10 -modules 'user,host,venv,cwd,perms,git' -modules-right 'jobs,exit,duration,load') # For reading by shell profiles
|
||||
|
|
|
@ -25,20 +25,35 @@ export JAVA_FONTS=/usr/share/fonts/TTF # 2019-04-25 Attempt to remove .java/font
|
|||
# export ARDUINO_DIR=$ARDUINO
|
||||
# export ARDMK_VENDOR=archlinux-arduino
|
||||
|
||||
# Get out of my $HOME!
|
||||
direnv GOPATH "$HOME/.cache/go"
|
||||
direnv CARGOHOME "$HOME/.cache/cargo" # There are config in there that we can version if one want
|
||||
direnv CCACHE_BASEDIR "$HOME/.cache/ccache"
|
||||
export CCACHE_CONFIGPATH="$HOME/.config/ccache.conf"
|
||||
direnv GNUPGHOME "$HOME/.config/gnupg"
|
||||
direnv GRADLE_USER_HOME "$HOME/.cache/gradle"
|
||||
export INPUTRC="$HOME/.config/inputrc"
|
||||
export LESSHISTFILE="$HOME/.cache/lesshst"
|
||||
direnv MONO_GAC_PREFIX "$HOME/.cache/mono"
|
||||
export NODE_REPL_HISTORY="$HOME/.cache/node_repl_history"
|
||||
direnv npm_config_cache "$HOME/.cache/npm"
|
||||
direnv PARALLEL_HOME "$HOME/.cache/parallel"
|
||||
export PYTHONSTARTUP="$HOME/.config/pythonstartup.py"
|
||||
export SCREENRC="$HOME/.config/screenrc"
|
||||
export SQLITE_HISTFILE="$HOME/.cache/sqlite_history"
|
||||
export TASKRC="$HOME/.config/taskrc"
|
||||
direnv TASKDATA "$HOME/.config/task"
|
||||
direnv TERMINFO "$HOME/.config/terminfo"
|
||||
direnv TIMEWARRIORDB "$HOME/.config/timewarrior"
|
||||
export RXVT_SOCKET="$HOME/.cache/urxvtd-$HOST"
|
||||
export MYVIMRC="$HOME/.config/vim/vimrc"
|
||||
export VIMINIT="source $MYVIMRC"
|
||||
direnv WINEPREFIX "$HOME/.cache/wineprefix/default"
|
||||
direnv YARN_CACHE_FOLDER "$HOME/.cache/yarn"
|
||||
export YARN_DISABLE_SELF_UPDATE_CHECK=true # This also disable the creation of a ~/.yarnrc file
|
||||
export XAUTHORITY="$HOME/.config/Xauthority"
|
||||
|
||||
|
||||
# For programs that think $HOME is a reasonable place to put their junk
|
||||
# And for the rest, see aliases
|
||||
direnv JUNKHOME "$HOME/.cache/junkhome"
|
||||
|
||||
# Path
|
||||
|
|
|
@ -36,6 +36,7 @@ alias x='startx; logout'
|
|||
alias nx='nvidia-xrun; logout'
|
||||
|
||||
# For programs that think $HOME is a reasonable place to put their junk
|
||||
# and don't allow the user to change those questionable choices
|
||||
alias adb='HOME=$JUNKHOME adb'
|
||||
alias audacity='HOME=$JUNKHOME audacity'
|
||||
alias binwalk='HOME=$JUNKHOME binwalk' # Should use .config according to the GitHub code though
|
||||
|
@ -44,12 +45,16 @@ alias cmake='HOME=$JUNKHOME cmake'
|
|||
alias ddd='HOME=$JUNKHOME ddd'
|
||||
alias ghidra='HOME=$JUNKHOME ghidra'
|
||||
alias itch='HOME=$JUNKHOME itch'
|
||||
alias simplescreenrecorder='HOME=$JUNKHOME simplescreenrecorder' # Easy fix https://github.com/MaartenBaert/ssr/blob/1556ae456e833992fb6d39d40f7c7d7c337a4160/src/Main.cpp#L252
|
||||
alias vd='HOME=$JUNKHOME vd'
|
||||
alias wpa_cli='HOME=$JUNKHOME wpa_cli'
|
||||
# TODO Maybe we can do something about node-gyp
|
||||
|
||||
alias bower='bower --config.storage.packages=~/.cache/bower/packages --config.storage.registry=~/.cache/bower/registry --config.storage.links=~/.cache/bower/links'
|
||||
alias gdb='gdb -x $HOME/.config/gdbinit'
|
||||
alias iftop='iftop -c $HOME/.config/iftoprc'
|
||||
alias lmms='lmms --config $HOME/.config/lmmsrc.xml'
|
||||
alias tmux='tmux -f $HOME/.config/tmux.conf'
|
||||
|
||||
# TODO ruby's gem when I find a use for it
|
||||
|
||||
|
|
BIN
config/terminfo/a/alacritty
Normal file
BIN
config/terminfo/a/alacritty
Normal file
Binary file not shown.
BIN
config/terminfo/a/alacritty-256color
Normal file
BIN
config/terminfo/a/alacritty-256color
Normal file
Binary file not shown.
BIN
config/terminfo/r/rxvt-unicode
Normal file
BIN
config/terminfo/r/rxvt-unicode
Normal file
Binary file not shown.
BIN
config/terminfo/r/rxvt-unicode-256color
Normal file
BIN
config/terminfo/r/rxvt-unicode-256color
Normal file
Binary file not shown.
22
config/tmux.conf
Normal file
22
config/tmux.conf
Normal file
|
@ -0,0 +1,22 @@
|
|||
# switch windows alt+number
|
||||
bind-key -n M-1 select-window -t 1
|
||||
bind-key -n M-2 select-window -t 2
|
||||
bind-key -n M-3 select-window -t 3
|
||||
bind-key -n M-4 select-window -t 4
|
||||
bind-key -n M-5 select-window -t 5
|
||||
bind-key -n M-6 select-window -t 6
|
||||
bind-key -n M-7 select-window -t 7
|
||||
bind-key -n M-8 select-window -t 8
|
||||
bind-key -n M-9 select-window -t 9
|
||||
|
||||
# List of plugins
|
||||
set -g @plugin 'tmux-plugins/tpm'
|
||||
set -g @plugin 'tmux-plugins/tmux-sensible'
|
||||
|
||||
set -g @plugin 'jimeh/tmux-themepack'
|
||||
set -g @themepack 'powerline/block/green'
|
||||
|
||||
set-environment -g TMUX_PLUGIN_MANAGER_PATH '~/.cache/tmuxplugins/'
|
||||
|
||||
# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
|
||||
run -b '~/.cache/tmuxplugins/tpm/tpm'
|
242
config/vim/vimrc
Normal file
242
config/vim/vimrc
Normal file
|
@ -0,0 +1,242 @@
|
|||
" VIM Configuration - Geoffrey FROGEYE
|
||||
"
|
||||
|
||||
set nocompatible
|
||||
filetype off
|
||||
|
||||
set runtimepath=~/.config/vim,~/.cache/vim
|
||||
set viminfo+=n~/.cache/vim/viminfo
|
||||
|
||||
""" PLUGINS MANAGEMENT """
|
||||
|
||||
" NOTE 18-06-24 Got rid of Vundle in favor of vim-plug (why: more recent, supports
|
||||
" Neovim, simpler). Commented out plugins that seemed useless, feel free to
|
||||
" uncomment them again if you need to
|
||||
|
||||
" Auto-install vim-plug
|
||||
if empty(glob('~/.cache/vim/autoload/plug.vim'))
|
||||
silent !curl -fLo ~/.cache/vim/autoload/plug.vim --create-dirs
|
||||
\ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
|
||||
autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
|
||||
endif
|
||||
|
||||
" Plugin definition
|
||||
call plug#begin('~/.cache/vim/plugged')
|
||||
|
||||
" Plug 'L9'
|
||||
" Plug 'rstacruz/sparkup', {'rtp': 'vim/'}
|
||||
Plug 'chriskempson/base16-vim'
|
||||
Plug 'tpope/vim-surround'
|
||||
" Plug 'tpope/vim-fugitive'
|
||||
" Plug 'tpope/vim-repeat'
|
||||
Plug 'tpope/tpope-vim-abolish'
|
||||
Plug 'vim-airline/vim-airline'
|
||||
Plug 'vim-airline/vim-airline-themes'
|
||||
Plug 'airblade/vim-gitgutter'
|
||||
Plug 'mbbill/undotree'
|
||||
Plug 'ludovicchabant/vim-gutentags'
|
||||
Plug 'majutsushi/tagbar'
|
||||
Plug 'wellle/targets.vim'
|
||||
" Plug 'Chiel92/vim-autoformat'
|
||||
Plug 'tomtom/tcomment_vim'
|
||||
" Plug 'Shougo/denite.nvim'
|
||||
" Plug 'tomlion/vim-solidity'
|
||||
" Plug 'godlygeek/tabular'
|
||||
" Plug 'jrozner/vim-antlr'
|
||||
"
|
||||
" Plug 'maralla/completor.vim'
|
||||
" if has('nvim')
|
||||
" Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
|
||||
" else
|
||||
" Plug 'Shougo/deoplete.nvim'
|
||||
" Plug 'roxma/nvim-yarp'
|
||||
" Plug 'roxma/vim-hug-neovim-rpc'
|
||||
" endif
|
||||
" Plug 'zchee/deoplete-jedi'
|
||||
|
||||
" Plug 'python-mode/python-mode', { 'branch': 'develop' }
|
||||
Plug 'junegunn/fzf', {'do': './install --bin'}
|
||||
Plug 'junegunn/fzf.vim'
|
||||
Plug 'ervandew/supertab'
|
||||
Plug 'dpelle/vim-LanguageTool'
|
||||
Plug 'terryma/vim-smooth-scroll'
|
||||
Plug 'vim-pandoc/vim-pandoc'
|
||||
Plug 'vim-pandoc/vim-pandoc-syntax'
|
||||
Plug 'idanarye/vim-vebugger'
|
||||
Plug 'w0rp/ale'
|
||||
|
||||
call plug#end()
|
||||
|
||||
""" ALE """
|
||||
|
||||
nmap <F3> :ALEFix<CR>
|
||||
|
||||
let g:ale_sign_error = '×'
|
||||
let g:ale_sign_warning = '!'
|
||||
let g:ale_completion_enabled = 1
|
||||
let g:ale_fixers = ['shfmt', 'uncrustify', 'remove_trailing_lines', 'trim_whitespace', 'phpcbf']
|
||||
let g:ale_php_phpcs_standard = '/srv/http/machines/ruleset.xml'
|
||||
|
||||
" For PHP, install https://pear.php.net/package/PHP_CodeSniffer
|
||||
|
||||
|
||||
""" UNDOTREE """
|
||||
|
||||
nmap <F7> :UndotreeToggle<CR>
|
||||
|
||||
""" TAGBAR """
|
||||
|
||||
nmap <F8> :TagbarToggle<CR>
|
||||
|
||||
""" VIM-AIRLINE """
|
||||
|
||||
set noshowmode
|
||||
set laststatus=2
|
||||
let g:airline_powerline_fonts = 1
|
||||
" let g:airline#extensions#syntastic#enabled = 1
|
||||
let g:airline#extensions#tabline#enabled = 1
|
||||
|
||||
let g:airline_section_a = airline#section#create(['mode'])
|
||||
let g:airline_section_b = airline#section#create(['branch', 'hunks'])
|
||||
" let g:airline_section_z = airline#section#create(['%B', '@', '%l', ':', '%c'])
|
||||
let g:airline_theme = 'base16_monokai'
|
||||
let g:airline#extensions#ale#enabled = 1
|
||||
|
||||
""" FZF """
|
||||
|
||||
let g:fzf_layout = { 'down': '~40%' }
|
||||
let g:fzf_colors =
|
||||
\ { 'fg': ['fg', 'Normal'],
|
||||
\ 'bg': ['bg', 'Normal'],
|
||||
\ 'hl': ['fg', 'Comment'],
|
||||
\ 'fg+': ['fg', 'CursorLine', 'CursorColumn', 'Normal'],
|
||||
\ 'bg+': ['bg', 'CursorLine', 'CursorColumn'],
|
||||
\ 'hl+': ['fg', 'Statement'],
|
||||
\ 'info': ['fg', 'PreProc'],
|
||||
\ 'border': ['fg', 'Ignore'],
|
||||
\ 'prompt': ['fg', 'Conditional'],
|
||||
\ 'pointer': ['fg', 'Exception'],
|
||||
\ 'marker': ['fg', 'Keyword'],
|
||||
\ 'spinner': ['fg', 'Label'],
|
||||
\ 'header': ['fg', 'Comment'] }
|
||||
|
||||
nmap gF :Files<CR>
|
||||
nmap gf :GFiles<CR>
|
||||
nmap gb :Buffers<CR>
|
||||
nmap gL :Lines<CR>
|
||||
nmap gl :BLines<CR>
|
||||
nmap gT :Tags<CR>
|
||||
nmap gt :BTags<CR>
|
||||
nmap gm :Marks<CR>
|
||||
nmap gw :Windows<CR>
|
||||
nmap gh :History<CR>
|
||||
nmap gH :History:<CR>
|
||||
nmap gS :History/<CR>
|
||||
nmap gs :Snippets<CR>
|
||||
|
||||
" TODO `gd` → go to tag matching selected word, or show a list with that
|
||||
" of tags pre-filtered with that word
|
||||
|
||||
""" SUPERTAB """
|
||||
|
||||
let g:SuperTabDefaultCompletionType = "<c-n>" " Go down when completing
|
||||
let g:SuperTabContextDefaultCompletionType = "<c-n>"
|
||||
|
||||
""" LanguageTool """
|
||||
|
||||
let g:languagetool_jar = "/usr/share/java/languagetool/languagetool-commandline.jar"
|
||||
|
||||
""" vim-pandoc """
|
||||
let g:pandoc#modules#disabled = ["folding"]
|
||||
let g:pandoc#spell#enabled = 0
|
||||
let g:pandoc#syntax#conceal#use = 0
|
||||
|
||||
|
||||
""" VIM SETTINGS """
|
||||
|
||||
set encoding=utf-8
|
||||
set title
|
||||
|
||||
set number
|
||||
set ruler
|
||||
set wrap
|
||||
|
||||
set scrolloff=10
|
||||
|
||||
set ignorecase
|
||||
set smartcase
|
||||
|
||||
set incsearch
|
||||
|
||||
set hlsearch
|
||||
|
||||
set tabstop=4
|
||||
set shiftwidth=4
|
||||
set expandtab
|
||||
|
||||
set visualbell
|
||||
set noerrorbells
|
||||
|
||||
set backspace=indent,eol,start
|
||||
|
||||
set hidden
|
||||
set updatetime=250
|
||||
|
||||
set cursorcolumn
|
||||
|
||||
set splitbelow
|
||||
|
||||
set number relativenumber
|
||||
|
||||
syntax enable
|
||||
|
||||
" From http://stackoverflow.com/a/5004785/2766106
|
||||
set list
|
||||
set listchars=tab:╾╌,trail:·,extends:↦,precedes:↤,nbsp:_
|
||||
set showbreak=↪
|
||||
|
||||
filetype on
|
||||
filetype plugin on
|
||||
filetype indent on
|
||||
|
||||
set wildmode=longest,list
|
||||
set showcmd
|
||||
|
||||
" Put plugins and dictionaries in this dir (also on Windows)
|
||||
let vimDir = '$HOME/.cache/vim'
|
||||
let &runtimepath.=','.vimDir
|
||||
|
||||
" theme
|
||||
source $HOME/.cache/vim/colorscheme.vim
|
||||
|
||||
" Keep undo history across sessions by storing it in a file
|
||||
if has('persistent_undo')
|
||||
let myUndoDir = expand(vimDir . '/undodir')
|
||||
" Create dirs
|
||||
call system('mkdir ' . vimDir)
|
||||
call system('mkdir ' . myUndoDir)
|
||||
let &undodir = myUndoDir
|
||||
set undofile
|
||||
endif
|
||||
|
||||
" Allow saving of files as sudo when I forgot to start vim using sudo.
|
||||
" From https://stackoverflow.com/a/7078429
|
||||
cmap w!! w !sudo tee > /dev/null %
|
||||
|
||||
imap jk <Esc>
|
||||
vmap <Enter> <Esc>
|
||||
|
||||
nmap <Enter> o<Esc>
|
||||
nmap <C-H> :bp<CR>
|
||||
nmap <C-L> :bn<CR>
|
||||
if has('nvim')
|
||||
" nmap <C-K> 20k
|
||||
" nmap <C-J> 20j
|
||||
noremap <silent> <C-K> :call smooth_scroll#up(20, 5, 1)<CR>
|
||||
noremap <silent> <C-J> :call smooth_scroll#down(20, 5, 1)<CR>
|
||||
else
|
||||
nmap <C-K> kkkkkkkkkkkkkkkkkkkkk
|
||||
nmap <C-J> jjjjjjjjjjjjjjjjjjjjj
|
||||
endif
|
||||
|
||||
|
Loading…
Add table
Add a link
Reference in a new issue