From 15781e686a45cd1b71630c16e201981d29bcbe69 Mon Sep 17 00:00:00 2001 From: Vasil Zlatanov Date: Mon, 24 Jun 2019 17:21:19 +0100 Subject: Update vimrc & remove fish folder --- Editor/vimrc | 46 +++++++++- Shell/fish/.config.fish.un~ | Bin 1844 -> 0 bytes Shell/fish/aliases | 143 -------------------------------- Shell/fish/config.fish | 4 - Shell/fish/fish_prompt.fish | 46 ---------- Shell/fish/fishd.airon | 32 ------- Shell/fish/functions/fish_greeting.fish | 3 - Window_Manager/ratpoison/py/colorz.pyc | Bin 3149 -> 3149 bytes 8 files changed, 44 insertions(+), 230 deletions(-) delete mode 100644 Shell/fish/.config.fish.un~ delete mode 100644 Shell/fish/aliases delete mode 100644 Shell/fish/config.fish delete mode 100644 Shell/fish/fish_prompt.fish delete mode 100644 Shell/fish/fishd.airon delete mode 100644 Shell/fish/functions/fish_greeting.fish diff --git a/Editor/vimrc b/Editor/vimrc index 6dfebc8..e4a81cf 100644 --- a/Editor/vimrc +++ b/Editor/vimrc @@ -18,16 +18,20 @@ Plugin 'tpope/vim-repeat' Plugin 'Shougo/deoplete.nvim' Plugin 'bling/vim-airline' Plugin 'tpope/vim-fugitive' +Plugin 'vim-airline/vim-airline-themes' "Plugin 'zchee/deoplete-clang' ""Plugin 'Valloric/YouCompleteMe' "Plugin 'SirVer/ultisnips' "Plugin 'honza/vim-snippets' "" make it look good -"Plugin 'junegunn/goyo.vim' "" neomutt support Plugin 'neomutt/neomutt.vim' "" dissaprove indented code to far ""Plugin 'dodie/vim-disapprove-deep-indentation' +" Syntax hilighting for base16 style themes +"Plugin 'plasticboy/vim-markdown' +Plugin 'rhysd/vim-grammarous' +Plugin 'chriskempson/base16-vim' call vundle#end() " required filetype plugin indent on " required @@ -35,7 +39,6 @@ filetype plugin on "General syntax on - set showcmd " Show (partial) command in status line. "set showmatch " Show matching brackets. "set gdefault @@ -86,6 +89,9 @@ nnoremap m :.!~/bin/calc nnoremap i :read !latestimage nnoremap v :!open '' +noremap! +noremap! + "read spaces in path's set isfname+=32 @@ -158,3 +164,39 @@ autocmd BufWinLeave * call clearmatches() "Airline symbols let g:airline_powerline_fonts = 1 + +let g:vim_markdown_folding_disabled = 1 + +let g:airline_theme='base16' + + +" Modify The ColorScheme to show Italic and Bold in Markdown. +" Italicise comments and Type's +" And make Line numbers same as background + +function! s:base16_customize() abort + call Base16hi("htmlBold", g:base16_gui0A, "", g:base16_cterm06, "", "bold", "") + call Base16hi("markdownBold", g:base16_gui0A, "", g:base16_cterm06, "", "bold", "") + call Base16hi("markdownHeadingDelimiter", g:base16_gui0A, "", g:base16_cterm08, "", "bold", "") + call Base16hi("markdownH1", g:base16_gui0A, "", g:base16_cterm08, "", "bold", "") + call Base16hi("markdownH2", g:base16_gui0A, "", g:base16_cterm08, "", "bold", "") + call Base16hi("htmlItalic", g:base16_gui0E, "", g:base16_cterm06, "", "italic", "") + call Base16hi("markdownItalic", g:base16_gui0E, "", g:base16_cterm06, "", "italic", "") + call Base16hi("htmlUnderline", g:base16_gui0E, "", g:base16_cterm06, "", "underline", "") + call Base16hi("Italic", "", "", "", "", "italic", "") + call Base16hi("Comment", g:base16_gui04, "", g:base16_cterm04, "", "italic", "") + + call Base16hi("Type", g:base16_gui0A, "", g:base16_cterm0A, "", "italic", "") + call Base16hi("htmlArg", "", "", "", "", "italic", "") + call Base16hi("LineNr", g:base16_gui03, g:base16_cterm00, g:base16_cterm03, g:base16_cterm00, "", "") + call Base16hi("CursorLineNr", g:base16_gui04, g:base16_gui00, g:base16_cterm04, g:base16_cterm00, "", "") +endfunction +augroup on_change_colorschema + autocmd! + autocmd ColorScheme * call s:base16_customize() +augroup END + +if filereadable(expand("~/.vimrc_background")) + let base16colorspace=256 + source ~/.vimrc_background +endif diff --git a/Shell/fish/.config.fish.un~ b/Shell/fish/.config.fish.un~ deleted file mode 100644 index 3d2f7e8..0000000 Binary files a/Shell/fish/.config.fish.un~ and /dev/null differ diff --git a/Shell/fish/aliases b/Shell/fish/aliases deleted file mode 100644 index 29ac784..0000000 --- a/Shell/fish/aliases +++ /dev/null @@ -1,143 +0,0 @@ -#module for mouse is bcm5974 -# pacat /dev/urandom > padsp -# for volume over 150: pactl set-sink-volume 0 150% (or volume 150%) -#if you wanna change timezone just copy one of /usr/share/zoneinfo/place to /etc/localtime -# awesome perl echo 'one two three'| perl -lne 'print $1 if /one(.*)three/' - - -function yt; mpsyt;end - -# SDR -function sdr; gqrx-alsa; end -# Disable mouse -function remouse; sudo modprobe -r bcm5974; end -function enmouse; sudo modprobe bcm5974 ; ~/bin/mousefix; end - -# Notes -function physics; vim ~/Sync/Notes/Physics/physics.txt; end -function chemistry; vim ~/Sync/Notes/Chemistry/chemistry.txt; end -function english; vim ~/Sync/Notes/English/english.txt; end -function swedish; vim ~/Sync/Notes/Swedish/swedish.txt; end - -#zombify -function zombify; sudo -u dork /home/vasko/dorknet/dork zombify; end - -function irc; autossh -M 0 -o "ServerAliveInterval 45" -o "ServerAliveCountMax 2" -p 55022 vasko@skozl.com; end -function vps; autossh -M 0 -o "ServerAliveInterval 45" -o "ServerAliveCountMax 2" -p 22 vasko@skozl.com; end -function sourcel; source ~/.bash_aliases; end -function ,.; fc -e -; end -function cd..; cd ..; end -function nkill; pkill -f; end -function drop; /home/vasko/drop/dropbox_uploader.sh; end -function lo; libreoffice; end -function tuner; lingot; end -function efbterm; export TERM=fbterm; end -function listd; ls -al /dev/disk/by-uuid/*; end -function py; python3 $argv; end -function scan; iwlist wlan0 scan; end -function connect; sudo iwconfig wlan0 essid; end -function home; cd /home/vasko; end -function l; ls -F $argv; end -function d; ls; end -function dm; ls | more; end -function e; cd; end -function en; cd ..; end -function n; clear; end -function s; sudo; end -function m; mv; end -function r; rm $argv; end -function md; mkdir $argv; end -function rd; rm -rf $argv; end -function c; gcp; end -function v; vim $argv; end -function sv; sudo vim $argv; end -function f; gnome-commander; end -function o; less $argv; end -function g; wget $argv; end -function x; tar -xvzf $argv; end -function a; tar -cvzf $argv; end -function i; yaourt -S $argv; end -function p; sudo pacman -Rs $argv; end -function clean; sudo pacman -Rsn (pacman -Qdtq); end -function t; optirun; end -function ts; optirun -b none nvidia-settings -c :8; end -function tc; lsof -n /dev/nvidia0; end -function endsu; exit & sudo su; end -function iso; dd if=/dev/cdrom of=~/cdrom_image.iso; end -#function glxspheres; vblank_mode=0 /opt/VirtualGL/bin/glxspheres64; end -function tglxspheres; vblank_mode=0 optirun -vv /opt/VirtualGL/bin/glxspheres64; end -function pglxspheres; vblank_mode=0 primusrun /opt/VirtualGL/bin/glxspheres64; end -function httpserve; python -m SimpleHTTPServer; end -function pi; ping -4 google.com; end -function pl; ping 8.8.8.8; end -function def; sdcv; end - - -function aria2c; aria2c -c -x5 -s10 -m0; end - - -# Screen -function scradmin; $HOME/.tools/screen_run admin; end -function scrschool; $HOME/.ratpoison/screen_run school; end - - -# Switch layouts -function qwerty; setxkbmap us; end -function bgkey; setxkbmap bg; end -function colemak; setxkbmap uc -variant colemak ; xset r 64 ; xset r rate 170 60; end -function extmak; setxkbmap us4 -variant colemak ; xset r 64 ; xset r rate 170 60; end -function svenmak; setxkbmap us2 -variant colemak; end -function ansi; setxkbmap us3 -variant colemak; end - -# Make mount give all users right permission -function mount; mount -o gid=users,fmask=113,dmask=002';end - -# Alias FTP mount -function ftpmount; curlftpfs eu5.org ~/ftp/';end -function ftpumount; umount /home/vasko/ftp; end - -function vimrc; vim ~/.vimrc; end -function uzblrc; vim ~/.config/uzbl/config; end -function aliases; vim ~/.config/fish/aliases; end -function solarize; ~/.solarized/solarize; end -function rat; vim ~/.tools/ratpoisonrc.conf; end -function sx; vim ~/.config/sxhkd/sxhkdrc; end -function bs; vim ~/.config/bspwm/bspwmrc; end -function screenrc; vim ~/.ratpoison/screenrc; end -function xkb; sudo vim /usr/share/X11/xkb/symbols/vaskozl; end -function pdf; apvlv; end -function kpaint; kolourpaint; end -function gnu; vrms; end -function layout; vim .rat_layout; end -function lightdm; sudo /etc/init.d/lightdm start; end -function mountem; sudo mount -t auto /dev/sda5 /mnt/sda5; end -function grub; sudo -e /etc/default/grub; end -function reboot; sudo reboot; end - -# Games -#function minecraft; optirun java -Xmx1024M -Xms1024M -XX:+UseFastAccessorMethods -XX:+AggressiveOpts -XX:+DisableExplicitGC -XX:+UseAdaptiveGCBoundary -XX:MaxGCPauseMillis=500 -XX:SurvivorRatio=16 -XX:+UseParallelGC -XX:UseSSE=3 -XX:ParallelGCThreads=2 -jar ~/.minecraft/launcher.jar; end -function amnesia; optirun /usr/games/Amnesia/Launcher.bin; end -function nethackterm; rxvt -bg black -fg green +tr &; end -function cfgpanel; fgpanel --fg-root=/usr/share/games/flightgear --panel=Aircraft/c172p/Panels/FGPanel_c172p.xml; end -function cfgfs; optirun fgfs --generic=socket,out,20,127.0.0.1,34200,udp,../Aircraft/c172p/Panels/FGPanel_Protocol_c172p; end -#function xonotic; cd ~/.Xonotic ; optirun ~/.Xonotic/xonotic-linux64-glx -sessionid vaskozl; end -function blizz; wine ~/.wine/drive_c/Program\ Files\ \(x86\)/Battle.net/Battle.net.exe; end -function starcraft; wine ~/.wine/drive_c/Program\ Files\ \(x86\)/StarCraft\ II/Support/SC2Switcher.exe; end -function lotv; wine "/home/vasko/.wine/drive_c/Program Files (x86)/StarCraft II - Legacy of the Void Beta/Support/SC2Switcher.exe"; end - -# Network tools - -#scan available networks -function wifi; sudo wpa_supplicant -i wlp2s0 -c /etc/wpa_supplicant/wpa_supplicant-wlp2s0.conf; end - -function ipscan; nmap -sP; end -function localscan; sudo nmap -PR -sP 192.168.0.1/24; end -function wifires; modprobe ipw2100; end - -# Drawing -function mspaint; /usr/share/playonlinux/playonlinux --run "Microsoft paint"; end -function msexcel; /usr/share/playonlinux/playonlinux --run "Microsoft Excel 2010"; end -function msword; /usr/share/playonlinux/playonlinux --run "Microsoft Word 2010"; end - - - diff --git a/Shell/fish/config.fish b/Shell/fish/config.fish deleted file mode 100644 index 555c09f..0000000 --- a/Shell/fish/config.fish +++ /dev/null @@ -1,4 +0,0 @@ -source ~/.config/fish/aliases -source ~/.config/fish/fish_prompt.fish -set PATH ~/bin $PATH -set -Ux EDITOR vim diff --git a/Shell/fish/fish_prompt.fish b/Shell/fish/fish_prompt.fish deleted file mode 100644 index 5078671..0000000 --- a/Shell/fish/fish_prompt.fish +++ /dev/null @@ -1,46 +0,0 @@ -# name: RobbyRussel -# -# You can override some default options in your config.fish: -# set -g theme_display_git_untracked no - -function _git_branch_name - echo (command git symbolic-ref HEAD ^/dev/null | sed -e 's|^refs/heads/||') -end - -function _is_git_dirty - set -l show_untracked (git config --bool bash.showUntrackedFiles) - set untracked '' - if [ "$theme_display_git_untracked" = 'no' -o "$show_untracked" = 'false' ] - set untracked '--untracked-files=no' - end - echo (command git status -s --ignore-submodules=dirty $untracked ^/dev/null) -end - -function fish_prompt - set -l last_status $status - set -l cyan (set_color -o cyan) - set -l yellow (set_color -o yellow) - set -l red (set_color -o red) - set -l blue (set_color -o blue) - set -l green (set_color -o green) - set -l normal (set_color normal) - - if test $last_status = 0 - set arrow "$green➜ " - else - set arrow "$red➜ " - end - set -l cwd $cyan(basename (prompt_pwd)) - - if [ (_git_branch_name) ] - set -l git_branch $red(_git_branch_name) - set git_info "$blue git:($git_branch$blue)" - - if [ (_is_git_dirty) ] - set -l dirty "$yellow ✗" - set git_info "$git_info$dirty" - end - end - - echo -n -s $arrow ' ' $cwd $git_info $normal ' ' -end diff --git a/Shell/fish/fishd.airon b/Shell/fish/fishd.airon deleted file mode 100644 index 673c20e..0000000 --- a/Shell/fish/fishd.airon +++ /dev/null @@ -1,32 +0,0 @@ -# This file is automatically generated by the fish. -# Do NOT edit it directly, your changes will be overwritten. -SET_EXPORT EDITOR:vim -SET __fish_classic_git_prompt_initialized:\x1d -SET __fish_init_1_50_0:\x1d -SET fish_color_autosuggestion:969896 -SET fish_color_command:b294bb -SET fish_color_comment:f0c674 -SET fish_color_cwd:green -SET fish_color_cwd_root:red -SET fish_color_end:b294bb -SET fish_color_error:cc6666 -SET fish_color_escape:cyan -SET fish_color_history_current:cyan -SET fish_color_host:\x2do\x1ecyan -SET fish_color_match:cyan -SET fish_color_normal:normal -SET fish_color_operator:cyan -SET fish_color_param:81a2be -SET fish_color_quote:b5bd68 -SET fish_color_redirection:8abeb7 -SET fish_color_search_match:\x2d\x2dbackground\x3dpurple -SET fish_color_selection:\x2d\x2dbackground\x3dpurple -SET fish_color_status:red -SET fish_color_user:\x2do\x1egreen -SET fish_color_valid_path:\x2d\x2dunderline -SET fish_greeting:\x1d -SET fish_key_bindings:fish_default_key_bindings -SET fish_pager_color_completion:normal -SET fish_pager_color_description:555\x1eyellow -SET fish_pager_color_prefix:cyan -SET fish_pager_color_progress:cyan diff --git a/Shell/fish/functions/fish_greeting.fish b/Shell/fish/functions/fish_greeting.fish deleted file mode 100644 index e755d2a..0000000 --- a/Shell/fish/functions/fish_greeting.fish +++ /dev/null @@ -1,3 +0,0 @@ -function fish_greeting -# archey3; -end diff --git a/Window_Manager/ratpoison/py/colorz.pyc b/Window_Manager/ratpoison/py/colorz.pyc index 586db45..bf3f1a4 100644 Binary files a/Window_Manager/ratpoison/py/colorz.pyc and b/Window_Manager/ratpoison/py/colorz.pyc differ -- cgit v1.2.3