Merge beaner:.dotfiles

bashrc

@@ -23,6 +23,7 @@ fi
 export JAVA_FONTS=/usr/share/fonts/TTF
 export ANDROID_HOME=/opt/android-sdk
 export GOPATH=$HOME/.go
+export PATH=$GOPATH/bin:$PATH
 export XDG_CONFIG_HOME=$HOME/.config
 export ARDUINO=/usr/share/arduino
 export ARDUINO_DIR=$ARDUINO
@@ -105,7 +106,7 @@ export PS4="- "
 
 # CUSTOM SCRIPTS
 
-export PATH="$HOME/.scripts/:$PATH"
+export PATH="$HOME/.bin/:$HOME/.scripts/:$PATH"
 [ -f ~/.gscripts/gprofile ] && source ~/.gscripts/gprofile
 
 # UTILITIES
@@ -118,7 +119,7 @@ function fuck {
     if which thefuck &> /dev/null
     then
         eval $(thefuck --alias)
-        fuck
+        fuck $@
     else
         echo "thefuck is not installed on this system."
     fi
@@ -127,12 +128,12 @@ alias FUCK='fuck'
 
 # Node Version Manager
 function nvm {
+    export NVM_DIR="$HOME/.nvm"
     if [ -s "$NVM_DIR/nvm.sh" ]
     then
         . "$NVM_DIR/nvm.sh"
         [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
-        export NVM_DIR="$HOME/.nvm"
+        nvm $@
-        nvm
     else
         echo "NVM is not installed on this system."
     fi

bin/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

config/htop/htoprc

@@ -9,7 +9,7 @@ hide_userland_threads=1
 shadow_other_users=0
 show_thread_names=0
 show_program_path=0
-highlight_base_name=0
+highlight_base_name=1
 highlight_megabytes=0
 highlight_threads=1
 tree_view=0

config/i3/config

@@ -146,16 +146,16 @@ set $WS9 9
 set $WS10 10
 
 # Workspace output
-workspace "$WS1"  output LVDS1
+workspace "$WS1"  output DP-5
-workspace "$WS2"  output VGA1
+workspace "$WS2"  output DP-3
-workspace "$WS3"  output LVDS1
+workspace "$WS3"  output VGA-0
-workspace "$WS4"  output VGA1
+workspace "$WS4"  output DP-5
-workspace "$WS5"  output LVDS1
+workspace "$WS5"  output DP-3
-workspace "$WS6"  output VGA1
+workspace "$WS6"  output VGA-0
-workspace "$WS7"  output LVDS1
+workspace "$WS7"  output DP-5
-workspace "$WS8"  output VGA1
+workspace "$WS8"  output DP-3
-workspace "$WS9"  output LVDS1
+workspace "$WS9"  output VGA-0
-workspace "$WS10" output VGA1
+workspace "$WS10" output DP-5
 
 # switch to workspace
 bindsym $mod+1 workspace $WS1
@@ -353,6 +353,7 @@ set $14 #66efd5
 set $15 #cfd0c2
 
 # Inactivity settings
+exec "$screen_config"
 exec --no-startup-id xautolock -time 10 -locker 'xset dpms force standby' -killtime 1 -killer '$locker'
 bindsym $mod+F4 exec --no-startup-id xautolock -disable
 bindsym $mod+F5 exec --no-startup-id xautolock -enable
@@ -367,6 +368,7 @@ exec --no-startup-id numlockx on # Activate Num lock
 #exec --no-startup-id compton -b # Compositing manager
 exec --no-startup-id unclutter # Hide mouse cursor after some time
 exec --no-startup-id dunst # Notifications
+exec --no-startup-id keynav # Keyboard cursor controller
 #exec --no-startup-id $HOME/.config/i3/clipmenud # Clipboard manager
 exec --no-startup-id mpd # Music Player Daemon
 

config/qutebrowser/keys.conf

@@ -135,20 +135,20 @@ back
     <back>
 
 back -t
-    th
+    tj
 
 back -w
-    wh
+    wj
 
 forward
     K
     <forward>
 
 forward -t
-    tl
+    tk
 
 forward -w
-    wl
+    wk
 
 fullscreen
     <f11>

config/qutebrowser/qutebrowser.conf

@@ -831,7 +831,7 @@ geolocation = ask
 #     Allow websites to show notifications.
 #     Valid values: true, false, ask
 #     Default: ask
-notifications = true
+notifications = ask
 
 # media-capture (BoolAsk):
 #     Allow websites to record audio/video.

inputrc

@@ -6,7 +6,7 @@ set completion-query-items 200
 set editing-mode vi
 set history-preserve-point on
 set history-size 10000
-set horizontal-scroll-mode on
+set horizontal-scroll-mode off
 set mark-directories on
 set mark-modified-lines off
 set mark-symlinked-directories on
@@ -28,7 +28,6 @@ $if mode=vi
     set keymap vi-insert
         # these are for vi-insert mode
         "jk": vi-movement-mode
-        "mù": vi-movement-mode
         "\e[A": history-search-backward
         "\e[B": history-search-forward
         Control-l: clear-screen

scripts/docker-image-childs

@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+# Find the dependent child image from an image
+
+parent="$1"
+
+# From https://stackoverflow.com/a/41634462
+for i in $(docker images -q)
+do
+    docker history "$i" | grep -q "$parent" && echo "$i"
+done | grep -v "$parent" | sort -u

scripts/docker-rm

@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+docker unpause $(docker ps -q)
+docker kill $(docker ps -q)
+docker container prune -f
+docker network prune -f

scripts/install-prefs

@@ -164,6 +164,8 @@ function altInst {
 
 # Common CLI
 
+.Xresources.d/configure
+
 # Utils
 inst coreutils man openssl-tool grep sed sh tar
 if [ $TERMUX == 1 ]; then
@@ -235,14 +237,14 @@ fi
 
 if [ $GUI == 1 ]; then
     # Desktop manager
-    inst i3 i3lock i3status dunst unclutter xautolock feh numlockx scrot
+    inst i3 i3lock dunst unclutter xautolock feh numlockx scrot xterm xclip
     if [ $ARCH == 1 ]; then
-        altInst polybar-git ttf-font-awesome autorandr-git
+        altInst polybar-git ttf-font-awesome autorandr-git keynav-enhanced
     else
         echo "TODO compile polybar-git autorandr-git"
     fi
     if [ $DEBIAN == 1 ]; then
-        inst suckless-tools
+        inst suckless-tools keynav
         if [ $ADMIN == 0 ]; then
             debloc altern dmenu xft
         fi
@@ -263,17 +265,18 @@ if [ $GUI == 1 ]; then
         rm -rf $TMP_DIR
 
     elif [ $ARCH == 1 ]; then
-        inst qutebrowser qt5-webengine
+        inst qutebrowser qt5-webengine python-opengl
     fi
 
     # Screen filter
     if [ $ARCH == 1 ]; then
         altInst sct
     elif [ $TERMUX != 1 ]; then
-        if [ ! -f $HOME/.gscripts/sct ]; then
+        if [ ! -f $HOME/.bin/sct ]; then
             TMP=$(mktemp)
             wget http://www.tedunangst.com/flak/files/sct.c -O $TMP
-            cc -std=c99 -O2 -I /usr/X11R6/include -o $HOME/.gscripts/sct $TMP -L /usr/X11R6/lib -lm -lX11 -lXrandr
+            cc -std=c99 -O2 -I /usr/X11R6/include -o $HOME/.bin/sct $TMP -L /usr/X11R6/lib -lm -lX11 -lXrandr
+            rm $TMP
         fi
     fi
 
@@ -293,12 +296,13 @@ if [ $EXTRA == 1 ]; then
     inst sl ffmpeg youtube-dl optipng
 
     if [ $ARCH == 1 ]; then
+        inst jq
         altInst pdftk translate-shell git-lfs js-beautify insect visidata-git
     fi
 
     # Extra GUI
     if [ $GUI == 1 ]; then
-        inst vlc gimp mpd vimpc
+        inst vlc gimp mpd vimpc alsa-utils
 
         if [ $ARCH == 1 ]; then
             inst simplescreenrecorder

scripts/lorem

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+# Generates Lorem Ipsum
+
+original="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non risus. Suspendisse lectus tortor, dignissim sit amet, adipiscing nec, ultricies sed, dolor. Cras elementum ultrices diam. Maecenas ligula massa, varius a, semper congue, euismod non, mi. Proin porttitor, orci nec nonummy molestie, enim est eleifend mi, non fermentum diam nisl sit amet erat. Duis semper. Duis arcu massa, scelerisque vitae, consequat in, pretium a, enim. Pellentesque congue. Ut in risus volutpat libero pharetra tempor. Cras vestibulum bibendum augue. Praesent egestas leo in pede. Praesent blandit odio eu enim. Pellentesque sed dui ut augue blandit sodales. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Aliquam nibh. Mauris ac mauris sed pede pellentesque fermentum. Maecenas adipiscing ante non diam sodales hendrerit.
+
+Ut velit mauris, egestas sed, gravida nec, ornare ut, mi. Aenean ut orci vel massa suscipit pulvinar. Nulla sollicitudin. Fusce varius, ligula non tempus aliquam, nunc turpis ullamcorper nibh, in tempus sapien eros vitae ligula. Pellentesque rhoncus nunc et augue. Integer id felis. Curabitur aliquet pellentesque diam. Integer quis metus vitae elit lobortis egestas. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi vel erat non mauris convallis vehicula. Nulla et sapien. Integer tortor tellus, aliquam faucibus, convallis id, congue eu, quam. Mauris ullamcorper felis vitae erat. Proin feugiat, augue non elementum posuere, metus purus iaculis lectus, et tristique ligula justo vitae magna.
+
+Aliquam convallis sollicitudin purus. Praesent aliquam, enim at fermentum mollis, ligula massa adipiscing nisl, ac euismod nibh nisl eu lectus. Fusce vulputate sem at sapien. Vivamus leo. Aliquam euismod libero eu enim. Nulla nec felis sed leo placerat imperdiet. Aenean suscipit nulla in justo. Suspendisse cursus rutrum augue. Nulla tincidunt tincidunt mi. Curabitur iaculis, lorem vel rhoncus faucibus, felis magna fermentum augue, et ultricies lacus lorem varius purus. Curabitur eu amet.
+"
+
+repet=$1
+
+if [ -z $repet ]; then
+    repet=1
+fi
+
+for i in $(seq 1 $repet)
+do
+    echo -e "$original"
+done
+

scripts/machines

@@ -78,6 +78,7 @@ function _machines-pubFromCrt {
 }
 
 function _machines-verifyCertificate {
+    return
     if openssl verify $MACHINES_CONFIG/machines.crt | grep -v 'error 18' | grep 'error' --quiet; then
         echo "[ERROR] Invalid certificate"
         exit 1
@@ -426,7 +427,7 @@ function machines_setup {
     _machines-apiToken machine --post-data "$data"
 
     echo $name > $MACHINES_CONFIG/this.name
-    machines-update
+    machines_update
 }
 
 function machines_update {

vimrc

@@ -19,6 +19,7 @@ Plugin 'tomasr/molokai'
 Plugin 'tpope/vim-surround'
 Plugin 'tpope/vim-fugitive'
 Plugin 'tpope/vim-repeat'
+Plugin 'tpope/tpope-vim-abolish'
 Plugin 'vim-airline/vim-airline'
 Plugin 'vim-airline/vim-airline-themes'
 Plugin 'airblade/vim-gitgutter'
@@ -29,10 +30,12 @@ Plugin 'xolox/vim-easytags'
 Plugin 'majutsushi/tagbar'
 Plugin 'wellle/targets.vim'
 Plugin 'Chiel92/vim-autoformat'
-Plugin 'Valloric/YouCompleteMe'
+" Plugin 'Valloric/YouCompleteMe'
 Plugin 'artur-shaik/vim-javacomplete2'
 Plugin 'tomtom/tcomment_vim'
 Plugin 'Shougo/denite.nvim'
+Plugin 'tomlion/vim-solidity'
+Plugin 'godlygeek/tabular'
 
 call vundle#end()            " required
 filetype plugin indent on    " required
@@ -44,11 +47,15 @@ nmap <F7> :UndotreeToggle<CR>:UndotreeFocus<CR>
 """ CTRLP """
 
 let g:ctrlp_custom_ignore = {
-    \ 'dir':  '\v([\/]\.(git|hg|svn)|node_modules|bower_components|__pycache__|vendor|output|buildroot)$',
+    \ 'dir':  '\v([\/]\.(git|hg|svn)|log|node_modules|bower_components|__pycache__|vendor|output|buildroot|doc)$',
-    \ 'file': '\v\.(exe|so|dll)$',
+    \ 'file': '\v\.(exe|so|dll|o|pyc)$',
     \ 'link': 'SOME_BAD_SYMBOLIC_LINKS',
     \ }
 
+let g:ctrlp_map = '<c-p>'
+let g:ctrlp_cmd = 'CtrlPMixed'
+map <a-p> :CtrlPMRUFiles<CR>
+
 """ TAGBAR """
 
 nmap <F8> :TagbarToggle<CR>
@@ -68,7 +75,19 @@ let g:airline_theme = 'wombat'
 
 """ YOUCOMPLETEME """
 
-let g:ycm_global_ycm_extra_conf = '~/.config/ycm_extra_conf.py'
+" let g:ycm_global_ycm_extra_conf = '~/.config/ycm_extra_conf.py'
+let g:ycm_global_ycm_extra_conf = '/usr/share/vim/vimfiles/third_party/ycmd/cpp/ycm/.ycm_extra_conf.py'
+let g:ycm_server_python_interpreter = '/usr/bin/python2'
+
+nmap gTi :YcmCompleter GoToInclude<CR>
+nmap gTc :YcmCompleter GoToDeclaration<CR>
+nmap gTf :YcmCompleter GoToDefinition<CR>
+nmap gt :YcmCompleter GoTo<CR>
+nmap gT :YcmCompleter GoToImprecise<CR>
+nmap gTr :YcmCompleter GoToReference<CR>
+
+""" AUTOFORMAT """
+nmap <F3> :Autoformat<CR>
 
 """ JAVACOMPLETE """
 
@@ -135,7 +154,16 @@ if has('persistent_undo')
     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>
 imap mù <Esc>
 map <Enter> o<Esc>
+nmap <C-H> :bp<CR>
+nmap <C-L> :bn<CR>
+nmap <C-K> kkkkkkkkkkkkkkkkkkkkk
+nmap <C-J> jjjjjjjjjjjjjjjjjjjjj
+