From 5e500da16b07869e78dcda99c4a0cff0e0e2424f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?= Date: Mon, 25 May 2020 09:05:56 +0200 Subject: [PATCH] Ah --- config/git/gitk | 6 +-- config/i3/config | 4 +- config/mpd/mpd.conf | 2 +- config/qutebrowser/config.py | 2 +- config/scripts/bsh | 47 +++++++++++++++++++++ config/scripts/changeColors | 2 +- config/scripts/hc | 2 + config/scripts/hl | 2 + config/shell/trimmed.bash | 79 ++++++++++++++++++++++++++++++++++++ config/tridactyl/tridactylrc | 2 +- config/vim/paths.vim | 17 ++++++++ config/vim/pluginconfig.vim | 8 ++++ config/vim/pluginlist.vim | 8 +++- config/vim/vimconfig.vim | 29 ++----------- config/vim/vimrc | 3 +- 15 files changed, 177 insertions(+), 36 deletions(-) create mode 100755 config/scripts/bsh create mode 100755 config/scripts/hc create mode 100755 config/scripts/hl create mode 100644 config/shell/trimmed.bash create mode 100644 config/vim/paths.vim diff --git a/config/git/gitk b/config/git/gitk index d0c1309..47260ff 100644 --- a/config/git/gitk +++ b/config/git/gitk @@ -52,12 +52,12 @@ set circlecolors {white blue gray blue blue} set linkfgcolor blue set circleoutlinecolor black set web_browser xdg-open -set geometry(main) 1920x1012+0+18 +set geometry(main) 1280x956+1920+18 set geometry(state) normal -set geometry(topwidth) 1920 +set geometry(topwidth) 1280 set geometry(topheight) 225 set geometry(pwsash0) "931 1" set geometry(pwsash1) "971 1" set geometry(botwidth) 951 -set geometry(botheight) 782 +set geometry(botheight) 726 set permviews {} diff --git a/config/i3/config b/config/i3/config index b7357da..f7069ce 100644 --- a/config/i3/config +++ b/config/i3/config @@ -51,8 +51,8 @@ bindsym $mod+Shift+d exec --no-startup-id rofi -modi drun -show drun bindsym $mod+Return exec urxvtc bindsym $mod+Shift+Return exec urxvt bindsym $mod+p exec thunar -# bindsym $mod+m exec qutebrowser --override-restore --backend=webengine -bindsym $mod+m exec firefox +bindsym $mod+m exec qutebrowser --override-restore --backend=webengine +# bindsym $mod+m exec firefox # Volume control bindsym XF86AudioRaiseVolume exec pactl set-sink-mute @DEFAULT_SINK@ false; exec pactl set-sink-volume @DEFAULT_SINK@ +5% diff --git a/config/mpd/mpd.conf b/config/mpd/mpd.conf index 42f5b38..07db98a 100644 --- a/config/mpd/mpd.conf +++ b/config/mpd/mpd.conf @@ -10,7 +10,7 @@ # be disabled and audio files will only be accepted over ipc socket (using # file:// protocol) or streaming files over an accepted protocol. # -music_directory "~/.MusiqueCompressed" +music_directory "~/Musiques" # # This setting sets the MPD internal playlist directory. The purpose of this # directory is storage for playlists created by MPD. The server will use diff --git a/config/qutebrowser/config.py b/config/qutebrowser/config.py index f2e0515..8bbd623 100644 --- a/config/qutebrowser/config.py +++ b/config/qutebrowser/config.py @@ -78,7 +78,7 @@ config.bind('H', 'tab-prev') config.bind('J', 'back') config.bind('K', 'forward') config.bind('L', 'tab-next') -config.bind('T', None) +config.unbind('T') import os dirname = os.path.dirname(__file__) diff --git a/config/scripts/bsh b/config/scripts/bsh new file mode 100755 index 0000000..2792e61 --- /dev/null +++ b/config/scripts/bsh @@ -0,0 +1,47 @@ +#!/usr/bin/env bash + +# TODO Do not dupplicate trimmed.bash +# TODO Remove comments +# TODO Do not remove unless last one + +CACHE_DIR="${XDG_CACHE_DIR:-$HOME/.cache}/bsh" +FOLDER_NAME="geoffrey" + + +mkdir -p "$CACHE_DIR" +# TODO Update when needed +# if [ ! -f "${CACHE_DIR}/cmd" ] +if true +then + # Preparation + WORK="${CACHE_DIR}/${FOLDER_NAME}" + DEST="/tmp/${FOLDER_NAME}" + rm -rf "$WORK" # DEBUG + mkdir "$WORK" + + # Copying files + cp ~/.config/shell/trimmed.bash "${WORK}/.bashrc" + cp ~/.config/inputrc "${WORK}/.inputrc" + cp ~/.config/vim/vimconfig.vim "${WORK}/.vimrc" + mkdir -p "${WORK}/terminfo/${TERM:0:1}" + cp ~/".config/terminfo/${TERM:0:1}/${TERM}" "${WORK}/terminfo/${TERM:0:1}/${TERM}" + + # Extra configuration + echo "alias s='sudo -s -E bash --rcfile ${DEST}/.bashrc'" >> "${WORK}/.bashrc" + echo "export VIMINIT='source ${DEST}/.vimrc'" >> "${WORK}/.bashrc" + echo "export TERMINFO=${DEST}/terminfo" >> "${WORK}/.bashrc" + echo "export INPUTRC=${DEST}/.inputrc" >> "${WORK}/.bashrc" + # TODO Maybe we should just set HOME there… + + # Crafting command + b64="$(cd "$CACHE_DIR"; tar czf - "$FOLDER_NAME" | base64 -w 0)" + echo "echo '$b64' | base64 -d | tar xzf - -C /tmp" > "${CACHE_DIR}/cmd" + echo "bash --rcfile ${DEST}/.bashrc" >> "${CACHE_DIR}/cmd" + echo "rm -rf ${DEST}" >> "${CACHE_DIR}/cmd" + + # Cleanup + # rm -rf "$WORK" + +fi + +ssh -t "$@" "$(cat "${CACHE_DIR}/cmd")" diff --git a/config/scripts/changeColors b/config/scripts/changeColors index 84a9531..67cc80f 100755 --- a/config/scripts/changeColors +++ b/config/scripts/changeColors @@ -32,7 +32,7 @@ chmod +x ~/.local/bin/colorSchemeApplyFzf # qutebrowser mkdir -p $HOME/.config/qutebrowser -curl "https://raw.githubusercontent.com/theova/base16-qutebrowser/master/themes/base16-${scheme}.config.py" > ~/.config/qutebrowser/theme.py +curl "https://raw.githubusercontent.com/theova/base16-qutebrowser/master/themes/default/base16-${scheme}.config.py" > ~/.config/qutebrowser/theme.py # rofi mkdir -p $HOME/.config/rofi diff --git a/config/scripts/hc b/config/scripts/hc new file mode 100755 index 0000000..1150a33 --- /dev/null +++ b/config/scripts/hc @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +highlight -O ansi "$@" diff --git a/config/scripts/hl b/config/scripts/hl new file mode 100755 index 0000000..b9d9937 --- /dev/null +++ b/config/scripts/hl @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +highlight -O ansi "$@" | less -R diff --git a/config/shell/trimmed.bash b/config/shell/trimmed.bash new file mode 100644 index 0000000..6353ec8 --- /dev/null +++ b/config/shell/trimmed.bash @@ -0,0 +1,79 @@ +#!/usr/bin/env bash + +# Geoffrey's trimmed and condensed shell configuration file, +# with an healthy and safe dose of aliases and config. +# Can be embedded to any server + +# Prefered programs environment variables +export PAGER=less +if [ -x "$(command -v nvim)" ] +then + export EDITOR=nvim + alias vi=nvim +elif [ -x "$(command -v vim)" ] +then + export EDITOR=vim + alias vi=vim +else + export EDITOR=vi +fi + +# Completion for existing commands +alias ls='ls -h --color=auto' +alias mkdir='mkdir -v' +alias cp="cp -i" +alias mv="mv -iv" +alias free='free -h' +alias df='df -h' + +# Advanced completions +# (not busybox compatible) +alias cp="cp -i --reflink=auto" +alias grep="grep --color=auto" +alias dd='dd status=progress' +alias rm='rm -v --one-file-system' +alias free='free -m' +alias diff='diff --color=auto' +alias dmesg='dmesg --ctime' + +# Frequent mistakes +alias sl=ls +alias al=la +alias mdkir=mkdir +alias systemclt=systemctl +alias please=sudo + +# Shortcuts for commonly used commands +alias ll="ls -l" +alias la="ls -la" +alias s='sudo -s -E' + +# Bash options +shopt -s expand_aliases +shopt -s histappend +HISTCONTROL=ignoreboth:erasedups + +# Program configuration +export TIME_STYLE='+%Y-%m-%d %H:%M:%S' +export LESS=-R +export LESS_TERMCAP_mb=$'\E[1;31m' # begin blink +export LESS_TERMCAP_md=$'\E[1;36m' # begin bold +export LESS_TERMCAP_me=$'\E[0m' # reset bold/blink +export LESS_TERMCAP_so=$'\E[01;44;33m' # begin reverse video +export LESS_TERMCAP_se=$'\E[0m' # reset reverse video +export LESS_TERMCAP_us=$'\E[1;32m' # begin underline +export LESS_TERMCAP_ue=$'\E[0m' # reset underline +# from $(dircolors --sh) +LS_COLORS='rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arc=01;31:*.arj=01;31:*.taz=01;31:*.lha=01;31:*.lz4=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.tzo=01;31:*.t7z=01;31:*.zip=01;31:*.z=01;31:*.dz=01;31:*.gz=01;31:*.lrz=01;31:*.lz=01;31:*.lzo=01;31:*.xz=01;31:*.zst=01;31:*.tzst=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.alz=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.cab=01;31:*.wim=01;31:*.swm=01;31:*.dwm=01;31:*.esd=01;31:*.jpg=01;35:*.jpeg=01;35:*.mjpg=01;35:*.mjpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.webp=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.m4a=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.oga=00;36:*.opus=00;36:*.spx=00;36:*.xspf=00;36:'; +export LS_COLORS + +# Prompt +if [[ $USER == 'root' ]]; then + col=31; +elif [[ $USER == 'geoffrey' ]]; then + col=32; +else + col=33; +fi +export PS1="\[\e]2;\u@\h \w\a\]\[\e[0;37m\][\[\e[0;${col}m\]\u\[\e[0;37m\]@\[\e[0;34m\]\h \[\e[0;36m\]\W\[\e[0;37m\]]\$\[\e[0m\] " + diff --git a/config/tridactyl/tridactylrc b/config/tridactyl/tridactylrc index 9ed1de0..e9fd789 100644 --- a/config/tridactyl/tridactylrc +++ b/config/tridactyl/tridactylrc @@ -86,7 +86,7 @@ set searchurls.yt https://www.youtube.com/results?search_query=%s " Firefox GUI " This can still be shown with F6! -guiset_quiet gui none +" guiset_quiet gui none " Never autofocus set allowautofocus false diff --git a/config/vim/paths.vim b/config/vim/paths.vim new file mode 100644 index 0000000..f9b6706 --- /dev/null +++ b/config/vim/paths.vim @@ -0,0 +1,17 @@ +" 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 + diff --git a/config/vim/pluginconfig.vim b/config/vim/pluginconfig.vim index 953456b..632b36c 100644 --- a/config/vim/pluginconfig.vim +++ b/config/vim/pluginconfig.vim @@ -174,3 +174,11 @@ let g:vista#renderer#icons = { \ "variable": "x", \ } +" EasyAlign + +" Align GitHub-flavored Markdown tables +au FileType markdown vmap :EasyAlign* + +" SmoothScroll +noremap :call smooth_scroll#up(20, 5, 1) +noremap :call smooth_scroll#down(20, 5, 1) diff --git a/config/vim/pluginlist.vim b/config/vim/pluginlist.vim index 5746010..97f902c 100644 --- a/config/vim/pluginlist.vim +++ b/config/vim/pluginlist.vim @@ -18,7 +18,7 @@ call plug#begin('~/.cache/vim/plugged') " Plug 'rstacruz/sparkup', {'rtp': 'vim/'} Plug 'chriskempson/base16-vim' Plug 'tpope/vim-surround' -" Plug 'tpope/vim-fugitive' +Plug 'tpope/vim-fugitive' " Plug 'tpope/vim-repeat' " Regex for words, with case in mind @@ -94,5 +94,11 @@ Plug 'liuchengxu/vista.vim' " Semantic highlighting for Python Plug 'numirias/semshi', {'do': ':UpdateRemotePlugins'} +" Aligning lines around a certain character +Plug 'junegunn/vim-easy-align' + +" Various for Ansible +Plug 'pearofducks/ansible-vim', { 'do': './UltiSnips/generate.sh' } + call plug#end() diff --git a/config/vim/vimconfig.vim b/config/vim/vimconfig.vim index 4ebd06b..af2b4f2 100644 --- a/config/vim/vimconfig.vim +++ b/config/vim/vimconfig.vim @@ -64,22 +64,8 @@ set wildmode=longest,list set wildmenu 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 +" Close the file explorer once you select a file +let g:netrw_fastbrowse = 0 " Allow saving of files as sudo when I forgot to start vim using sudo. " From https://stackoverflow.com/a/7078429 @@ -91,15 +77,8 @@ vmap nmap o nmap :bp nmap :bn -if has('nvim') - " nmap 20k - " nmap 20j - noremap :call smooth_scroll#up(20, 5, 1) - noremap :call smooth_scroll#down(20, 5, 1) -else - nmap kkkkkkkkkkkkkkkkkkkkk - nmap jjjjjjjjjjjjjjjjjjjjj -endif +nmap kkkkkkkkkkkkkkkkkkkkk +nmap jjjjjjjjjjjjjjjjjjjjj " \s to replace globally the word under the cursor nnoremap s :%s/\<\>/ diff --git a/config/vim/vimrc b/config/vim/vimrc index ae07883..53aa792 100644 --- a/config/vim/vimrc +++ b/config/vim/vimrc @@ -8,6 +8,7 @@ set runtimepath+=~/.config/vim,~/.cache/vim set viminfo+=n~/.cache/vim/viminfo source ~/.config/vim/pluginlist.vim -source ~/.config/vim/pluginconfig.vim +source ~/.config/vim/paths.vim source ~/.config/vim/vimconfig.vim +source ~/.config/vim/pluginconfig.vim