diff options
| -rw-r--r-- | Xresources/.Xresources/solarized.light | 2 | ||||
| -rwxr-xr-x | i3/.config/i3blocks/bin/battery | 12 | ||||
| -rw-r--r-- | mutt/.mutt/colors/nord.muttrc | 10 | ||||
| -rw-r--r-- | vifm/.vifm/colors/default.vifm | 52 | ||||
| -rw-r--r-- | vifm/.vifm/colors/matrix.vifm | 21 | ||||
| -rw-r--r-- | vifm/.vifm/colors/solarized.vifm | 45 | ||||
| -rw-r--r-- | vifm/.vifm/vifmrc | 180 | ||||
| -rw-r--r-- | vim/.vimrc | 3 |
8 files changed, 38 insertions, 287 deletions
diff --git a/Xresources/.Xresources/solarized.light b/Xresources/.Xresources/solarized.light index 4211ab2..eb0ee6b 100644 --- a/Xresources/.Xresources/solarized.light +++ b/Xresources/.Xresources/solarized.light @@ -1,6 +1,6 @@ #include "/home/urbain/.Xresources/base" -URxvt.borderColor: #fdf6e3 +URxvt.borderColor: #000000 *background: #fdf6e3 *foreground: #657b83 diff --git a/i3/.config/i3blocks/bin/battery b/i3/.config/i3blocks/bin/battery index b345f16..d475741 100755 --- a/i3/.config/i3blocks/bin/battery +++ b/i3/.config/i3blocks/bin/battery @@ -7,22 +7,10 @@ fi output="$(acpi -b)" remaining_time=$(echo "$output" | grep -o "[0-9][0-9]:[0-9][0-9]") -<<<<<<< HEAD - -if [ -d /sys/class/power_supply/BAT0 ]; then - now_charge=$(cat /sys/class/power_supply/BAT0/now_charge) - full_charge=$(cat /sys/class/power_supply/BAT0/full_charge) - charge=$(( (100*now_charge) / full_charge )) -else - echo "" - exit -fi -======= now_charge=$(cat /sys/class/power_supply/BAT0/now_charge) full_charge=$(cat /sys/class/power_supply/BAT0/full_charge) charge=$(( (100*now_charge) / full_charge )) # charge=$(echo "$output" | grep -oP "..(?=%)") ->>>>>>> de29d3a... Add minor updates if grep -q "Discharging" <(echo "$output"); then remaining_time=$(echo "$output" | grep -oP "..:..(?=:.. remaining)") diff --git a/mutt/.mutt/colors/nord.muttrc b/mutt/.mutt/colors/nord.muttrc index 977750d..6b70745 100644 --- a/mutt/.mutt/colors/nord.muttrc +++ b/mutt/.mutt/colors/nord.muttrc @@ -1,6 +1,8 @@ -color status green black -color index color14 default "~F" -color index color13 default "~O" -color index color13 default "~N" +color normal color253 default +color status green black +color index color253 default "~R" +color index color14 default "~F" +color index color13 default "~O" +color index color13 default "~N" # vim: ft=muttrc diff --git a/vifm/.vifm/colors/default.vifm b/vifm/.vifm/colors/default.vifm deleted file mode 100644 index 9c4c70e..0000000 --- a/vifm/.vifm/colors/default.vifm +++ /dev/null @@ -1,52 +0,0 @@ -" You can edit this file by hand. -" The " character at the beginning of a line comments out the line. -" Blank lines are ignored. - -" The Default color scheme is used for any directory that does not have -" a specified scheme and for parts of user interface like menus. A -" color scheme set for a base directory will also -" be used for the sub directories. - -" The standard ncurses colors are: -" Default = -1 = None, can be used for transparency or default color -" Black = 0 -" Red = 1 -" Green = 2 -" Yellow = 3 -" Blue = 4 -" Magenta = 5 -" Cyan = 6 -" White = 7 - -" Available style values (some of them can be combined): -" bold -" underline -" reverse or inverse -" standout -" none - -" Vifm supports 256 colors you can use color numbers 0-255 -" (requires properly set up terminal: set your TERM environment variable -" (directly or using resources) to some color terminal name (e.g. -" xterm-256color) from /usr/lib/terminfo/; you can check current number -" of colors in your terminal with tput colors command) - -" highlight group cterm=style ctermfg=foreground_color ctermbg=background_color - -highlight Win cterm=none ctermfg=default ctermbg=default -highlight Directory cterm=bold ctermfg=cyan ctermbg=default -highlight Link cterm=bold ctermfg=yellow ctermbg=default -highlight BrokenLink cterm=bold ctermfg=123 ctermbg=default -highlight Socket cterm=bold ctermfg=magenta ctermbg=default -highlight Device cterm=bold ctermfg=123 ctermbg=default -highlight Fifo cterm=bold ctermfg=cyan ctermbg=default -highlight Executable cterm=bold ctermfg=green ctermbg=default -highlight Selected cterm=bold ctermfg=magenta ctermbg=default -highlight CurrLine cterm=bold ctermfg=default ctermbg=147 -highlight TopLine cterm=none ctermfg=default ctermbg=123 -highlight TopLineSel cterm=bold ctermfg=black ctermbg=default -highlight StatusLine cterm=bold ctermfg=black ctermbg=123 -highlight WildMenu cterm=underline,reverse ctermfg=white ctermbg=black -highlight CmdLine cterm=none ctermfg=green ctermbg=default -highlight ErrorMsg cterm=none ctermfg=123 ctermbg=black -highlight Border cterm=none ctermfg=black ctermbg=123 diff --git a/vifm/.vifm/colors/matrix.vifm b/vifm/.vifm/colors/matrix.vifm deleted file mode 100644 index 70a9f76..0000000 --- a/vifm/.vifm/colors/matrix.vifm +++ /dev/null @@ -1,21 +0,0 @@ -highlight Win cterm=none ctermfg=green ctermbg=black - -highlight TopLine cterm=none ctermfg=green ctermbg=none -highlight TopLineSel cterm=none ctermfg=green ctermbg=none -highlight StatusLine cterm=none ctermfg=green ctermbg=none -highlight Border cterm=none ctermfg=green ctermbg=none - -highlight Selected cterm=bold ctermfg=red ctermbg=default -highlight CurrLine cterm=bold ctermfg=black ctermbg=green - -highlight WildMenu cterm=underline,reverse ctermfg=white ctermbg=black -highlight CmdLine cterm=none ctermfg=white ctermbg=black -highlight ErrorMsg cterm=none ctermfg=red ctermbg=black - -highlight Directory cterm=none ctermfg=blue ctermbg=default -highlight Link cterm=none ctermfg=yellow ctermbg=default -highlight BrokenLink cterm=none ctermfg=red ctermbg=default -highlight Socket cterm=none ctermfg=yellow ctermbg=default -highlight Device cterm=none ctermfg=yellow ctermbg=default -highlight Fifo cterm=none ctermfg=yellow ctermbg=default -highlight Executable cterm=none ctermfg=green ctermbg=default diff --git a/vifm/.vifm/colors/solarized.vifm b/vifm/.vifm/colors/solarized.vifm deleted file mode 100644 index 2c710f4..0000000 --- a/vifm/.vifm/colors/solarized.vifm +++ /dev/null @@ -1,45 +0,0 @@ -" VIFM COLORS -" solarized dark -" based on: https://github.com/istib/dotfiles/blob/master/vifm/vifm-colors - -" Default = -1 = None, can be used for transparency or default color -" Black = 0 -" Red = 1 -" Green = 2 -" Yellow = 3 -" Blue = 4 -" Magenta = 5 -" Cyan = 6 -" White = 7 - -" STYLES -" bold -" underline -" reverse or inverse -" standout -" none - - -highlight clear - -highlight Win cterm=none ctermfg=default ctermbg=none - -highlight TopLine cterm=none ctermfg=blue ctermbg=none -highlight TopLineSel cterm=none ctermfg=blue ctermbg=none -highlight StatusLine cterm=none ctermfg=blue ctermbg=none -highlight Border cterm=none ctermfg=blue ctermbg=none - -highlight Selected cterm=bold ctermfg=magenta ctermbg=default -highlight CurrLine cterm=bold ctermfg=default ctermbg=blue - -highlight WildMenu cterm=underline,reverse ctermfg=white ctermbg=black -highlight CmdLine cterm=none ctermfg=white ctermbg=white -highlight ErrorMsg cterm=none ctermfg=red ctermbg=black - -highlight Directory cterm=none ctermfg=cyan ctermbg=default -highlight Link cterm=none ctermfg=yellow ctermbg=default -highlight BrokenLink cterm=none ctermfg=red ctermbg=default -highlight Socket cterm=none ctermfg=magenta ctermbg=default -highlight Device cterm=none ctermfg=red ctermbg=default -highlight Fifo cterm=none ctermfg=cyan ctermbg=default -highlight Executable cterm=none ctermfg=green ctermbg=default diff --git a/vifm/.vifm/vifmrc b/vifm/.vifm/vifmrc index 3a39b52..f4ff8ae 100644 --- a/vifm/.vifm/vifmrc +++ b/vifm/.vifm/vifmrc @@ -1,161 +1,39 @@ +" Command to open files +filetype * xdg-open + +" Options set fastrun -set fusehome=/tmp/vifm_FUSE set history=100 -set ignorecase set incsearch -set nofollowlinks -set nohlsearch -set noiec -set norunexec -set novimhelp -set relativenumber -set scrolloff=4 -set smartcase +set runexec set sortnumbers -set timefmt=%m/%d\ %H:%M -set trash -set undolevels=100 +set scrolloff=2 +set smartcase set vicmd=$EDITOR +set relativenumber +set vimhelp set wildmenu -set statusline=" %t%= %A %10u:%-7g %15s %20d " -command! df df -h %m 2> /dev/null -command! diff vim -d %f %F -command! zip zip -r %f.zip %f -command! run !! ./%f -command! make !!make %a -command! mkcd :mkdir %a | cd %a -command! vgrep vim "+grep %a" -command! reload :write | restart -command link ln -s -r %d/%f %D -filextype *.pdf zathura %c %i &, apvlv %c, xpdf %c -fileviewer *.pdf pdftotext -nopgbrk %c - -filextype *.ps,*.eps,*.ps.gz - \ {View in zathura} - \ zathura %f, - \ {View in gv} - \ gv %c %i &, -filextype *.djvu - \ {View in zathura} - \ zathura %f, - \ {View in apvlv} - \ apvlv %f, -filetype *.wav,*.mp3,*.flac,*.ogg,*.m4a,*.wma,*.ape,*.ac3 - \ mpv %f, - \ {Play using ffplay} - \ ffplay -nodisp %c, - \ {Play using MPlayer} - \ mplayer %f, - \ ffplay %c, -fileviewer *.mp3 mp3info -fileviewer *.flac soxi -filextype *.avi,*.mp4,*.wmv,*.dat,*.3gp,*.ogv,*.mkv,*.mpg,*.vob,*.flv,*.m2v,*.mov,*.webm,*.ts,*.m4v - \ {View using vlc} - \ vlc %c, - \ {View using ffplay} - \ ffplay -fs %c, - \ {View using Dragon} - \ dragon %f, - \ {View using mplayer} - \ mplayer %f, -fileviewer *.avi,*.mp4,*.wmv,*.dat,*.3gp,*.ogv,*.mkv,*.mpg,*.vob,*.flv,*.m2v,*.mov,*.webm,*.ts,*.m4v - \ ffprobe -pretty %c 2>&1 -filextype *.html,*.htm - \ {Open with uzbl} - \ qutebrowser %f %i &, - \ {Open with dwb} - \ dwb %f %i &, - \ {Open with firefox} - \ firefox %f &, -filetype *.html,*.htm links, lynx -filetype *.o nm %f | less -filetype *.[1-8] man ./%c -fileviewer *.[1-8] man ./%c | col -b -filextype *.bmp,*.jpg,*.jpeg,*.png,*.gif,*.xpm - \ {View in feh} - \ feh %d --scale-down --start-at %d/%c 2>/dev/null &, - \ {View in sxiv} - \ sxiv, - \ {View in gpicview} - \ gpicview %c, - \ {View in shotwell} - \ shotwell, -fileviewer *.bmp,*.jpg,*.jpeg,*.png,*.gif,*.xpm convert -identify %f -verbose /dev/null -filetype *.md5 - \ {Check MD5 hash sum} - \ md5sum -c %f, -filetype *.asc - \ {Check signature} - \ !!gpg --verify %c, -filetype *.geo, *.msh, *.pos - \ {Open in gmsh} - \ gmsh %d, -filetype *.exe wine %f -filetype *.torrent ktorrent %f & -fileviewer *.torrent dumptorrent -v %c -filetype *.zip,*.jar,*.war,*.ear,*.oxt - \ {Mount with fuse-zip} - \ FUSE_MOUNT|fuse-zip %SOURCE_FILE %DESTINATION_DIR, - \ {View contents} - \ zip -sf %c | less, - \ {Extract here} - \ tar -xf %c, -fileviewer *.zip,*.jar,*.war,*.ear,*.oxt zip -sf %c -filetype *.tar,*.tar.bz2,*.tbz2,*.tgz,*.tar.gz,*.tar.xz,*.txz - \ {Mount with archivemount} - \ FUSE_MOUNT|archivemount %SOURCE_FILE %DESTINATION_DIR, -fileviewer *.tgz,*.tar.gz tar -tzf %c -fileviewer *.tar.bz2,*.tbz2 tar -tjf %c -fileviewer *.tar.txz,*.txz xz --list %c -filetype *.rar - \ {Mount with rar2fs} - \ FUSE_MOUNT|rar2fs %SOURCE_FILE %DESTINATION_DIR, -fileviewer *.rar unrar v %c -filetype *.iso - \ {Mount with fuseiso} - \ FUSE_MOUNT|fuseiso %SOURCE_FILE %DESTINATION_DIR, -filetype *.ssh - \ {Mount with sshfs} - \ FUSE_MOUNT2|sshfs %PARAM %DESTINATION_DIR, -filetype *.ftp - \ {Mount with curlftpfs} - \ FUSE_MOUNT2|curlftpfs -o ftp_port=-,,disable_eprt %PARAM %DESTINATION_DIR, -filetype *.7z - \ {Mount with fuse-7z} - \ FUSE_MOUNT|fuse-7z %SOURCE_FILE %DESTINATION_DIR, -fileviewer *.7z 7z l %c -filextype *.odt,*.doc,*.docx,*.xls,*.xlsx,*.odp,*.pptx libreoffice %f & -fileviewer *.doc catdoc %c -fileviewer *.docx, docx2txt.pl %f - -filetype *.tudu tudu -f %c -filextype *.pro qtcreator %f & -filextype */ - \ {View in thunar} - \ Thunar %f &, -set vifminfo=dhistory,savedirs,chistory,state,tui,shistory, - \phistory,fhistory,dirstack,registers,bookmarks,bmarks +" Commands +command! backup !cp -r %f %f.bak + +" Mappings nnoremap s :shell<cr> -nnoremap S :sort<cr> nnoremap w :view<cr> -vnoremap w :view<cr>gv -nnoremap o :!gvim --remote-tab-silent %f<cr> -nnoremap O :!gvim %f<cr> -nnoremap gb :file &<cr>l -nnoremap yd :!echo %d | xclip %i<cr> -nnoremap yf :!echo %c:p | xclip %i<cr> -nnoremap I cw<c-a> -nnoremap cc cw<c-u> -nnoremap A cw -nnoremap ,t :!xterm &<cr> -nnoremap ,c :write | execute ':!vim $MYVIFMRC' | restart<cr> -nnoremap ,C :!gvim --remote-tab-silent $MYVIFMRC &<cr> -nnoremap ,w :set wrap!<cr> -nnoremap <f3> :!less %f<cr> -nnoremap <f4> :edit<cr> -nnoremap <f5> :copy<cr> -nnoremap <f6> :move<cr> -nnoremap <f7> :mkdir<space> -nnoremap <f8> :delete<cr> +nnoremap o :file<cr> +nnoremap b :marks<cr> +nnoremap gm :bmark<space> +nnoremap gb :bmarks<cr> +nnoremap r :run<cr> +nnoremap ,b :backup<cr> +nnoremap ,r :%rename<cr> +nnoremap ,t :!urxvt &<cr> +nnoremap ,l :!less %f<cr> + +" Colorscheme +source /usr/share/vifm/colors/juef-zenburn.vifm + +" Only one pane +only -mark b ~/bin/ -mark h ~/ +" vim: ft=vim @@ -384,6 +384,7 @@ augroup vimrc autocmd FileType freefem comp freefem autocmd FileType dirvish setlocal relativenumber autocmd FileType dirvish setlocal errorformat=%f + autocmd FileType dirvish silent! unmap <buffer> <C-p> autocmd FileType tex set spell augroup END @@ -464,4 +465,4 @@ if has("nvim") nnoremap <A-k> <C-w>k nnoremap <A-l> <C-w>l endif -" }}}
\ No newline at end of file +" }}} |