Initial commit
This commit is contained in:
commit
153479352c
39
bin/lock
Executable file
39
bin/lock
Executable file
@ -0,0 +1,39 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
echo RELOADAGENT | gpg-connect-agent
|
||||||
|
ssh-add -D
|
||||||
|
|
||||||
|
if [ "$(xrandr | grep 3440x1440)" != "" ]; then
|
||||||
|
SCALE="100%"
|
||||||
|
DIR=$(echo -e "+800+0\n-800+0" | sort -R | head -1)
|
||||||
|
else
|
||||||
|
SCALE="75%"
|
||||||
|
DIR=$(echo -e "+500+0\n-500+0" | sort -R | head -1)
|
||||||
|
fi
|
||||||
|
|
||||||
|
IMAGE=/tmp/screenlock.png
|
||||||
|
|
||||||
|
IMG="$HOME/.LinuxConfig/imgs/"
|
||||||
|
IMG=$IMG$(ls $IMG | sort -R | head -1)
|
||||||
|
|
||||||
|
echo $DIR
|
||||||
|
|
||||||
|
maim -m 1 $IMAGE
|
||||||
|
convert $IMAGE -filter gaussian -blur 0x9 \
|
||||||
|
-gravity center -matte \
|
||||||
|
"$IMG[$SCALE]" -geometry $DIR -composite \
|
||||||
|
~/.LinuxConfig/lock.png -composite \
|
||||||
|
-font Noto-Sans-CJK-JP-Regular -pointsize 25 -fill 'rgba(255,255,255,0.85)' -draw "text 0,150 'Enter password'" \
|
||||||
|
-font Noto-Sans-CJK-JP-Regular -pointsize 20 -fill 'rgba(255,255,255,0.60)' -draw "text 0,200 'パスワードを入力する'" \
|
||||||
|
$IMAGE
|
||||||
|
|
||||||
|
i3lock \
|
||||||
|
--textcolor=00000000 \
|
||||||
|
--separatorcolor=00000000 --linecolor=00000000 \
|
||||||
|
--keyhlcolor=22cc2288 --bshlcolor=cc222288 \
|
||||||
|
--insidecolor=33333344 --ringcolor=aaaaaa88 \
|
||||||
|
--insidevercolor=55555544 --ringvercolor=cccccc88 \
|
||||||
|
--insidewrongcolor=cc222244 --ringwrongcolor=cc222288 \
|
||||||
|
-eni $IMAGE
|
||||||
|
|
||||||
|
rm $IMAGE
|
13
bin/panel
Executable file
13
bin/panel
Executable file
@ -0,0 +1,13 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
while (true); do
|
||||||
|
if [ "$(mpc | wc -l)" -eq "3" ]; then
|
||||||
|
SONG=$(mpc | head -1)
|
||||||
|
if [ "$(mpc | grep '\[paused\]' | wc -l)" -eq "1" ]; then
|
||||||
|
SONG="⏸ $SONG"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
xsetroot -name " $SONG | $(date '+%Y-%m-%d %H:%M:%S') "
|
||||||
|
sleep 0.3s;
|
||||||
|
done
|
26
bin/screenie
Executable file
26
bin/screenie
Executable file
@ -0,0 +1,26 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
NAME="ss-$(cat /dev/urandom | tr -dc A-Za-z0-9 | head -c${1:-32};)"
|
||||||
|
|
||||||
|
maim -m 1 -s /tmp/$NAME.png -c 1,0.25,0.25,0.6 --hidecursor
|
||||||
|
if [ $? -ne 0 ]
|
||||||
|
then
|
||||||
|
notify-send 'Screenshot canceled' -u low
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ ! -e /tmp/$NAME.png ]
|
||||||
|
then
|
||||||
|
notify-send 'Screenshot failed' 'File does <u>not</u> exist' -u critical
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
|
||||||
|
scp /tmp/$NAME.png ss:ss
|
||||||
|
if [ $? -eq 0 ]
|
||||||
|
then
|
||||||
|
echo -n 'https://ss.fuyu.moe/nisevoid/'$NAME'.png' | xclip -selection "clip-board"
|
||||||
|
notify-send 'Screenshot uploaded' -u low
|
||||||
|
else
|
||||||
|
notify-send 'Screenshot failed' 'Could not upload image' -u critical
|
||||||
|
fi
|
||||||
|
rm /tmp/$NAME.png
|
10
bin/song
Executable file
10
bin/song
Executable file
@ -0,0 +1,10 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
song=$(mpc --format "%position%\t%artist%\t%title%" playlist | sort | column -s" " -t | fzf)
|
||||||
|
|
||||||
|
if [ "$song" == "" ]
|
||||||
|
then
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
|
||||||
|
mpc play $(echo $song | awk '{print $1}')
|
5
bin/switchbg
Executable file
5
bin/switchbg
Executable file
@ -0,0 +1,5 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
IMG="$HOME/images/"$(ls ~/images/ | sort -R | head -1)
|
||||||
|
|
||||||
|
feh --bg-fill "$IMG"
|
13
bin/watch-screen
Executable file
13
bin/watch-screen
Executable file
@ -0,0 +1,13 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
xset s 300
|
||||||
|
xset dpms 300 450 600
|
||||||
|
|
||||||
|
while true; do
|
||||||
|
sleep 1s;
|
||||||
|
if [ "$(xset q | grep 'Monitor is' | grep -v 'On' 2> /dev/null)" != "" ]; then
|
||||||
|
if [ "$(ps aux | grep '[i]3lock')" == "" ]; then
|
||||||
|
lock;
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
done
|
BIN
imgs/fuyu-logo.png
Normal file
BIN
imgs/fuyu-logo.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 19 KiB |
13
install.sh
Executable file
13
install.sh
Executable file
@ -0,0 +1,13 @@
|
|||||||
|
#! /bin/bash
|
||||||
|
# Dependancies: feh maim slop mpd mpc mpv youtube-dl i3lock imagemagick dmenu neovim (lo)ksh fzf
|
||||||
|
# Build: dwm st
|
||||||
|
|
||||||
|
ln -s ~/.LinuxConfig/profile ~/.profile
|
||||||
|
ln -s ~/.LinuxConfig/kshrc ~/.kshrc
|
||||||
|
|
||||||
|
mkdir ~/.config/mpv
|
||||||
|
ln -s ~/.LinuxConfig/mpv.conf ~/.config/mpv/
|
||||||
|
|
||||||
|
ln -s ~/.LinuxConfig/xinitrc ~/.xinitrc
|
||||||
|
|
||||||
|
sudo ln -s ~/.LinuxConfig/bin/* /usr/bin
|
12
kshrc
Executable file
12
kshrc
Executable file
@ -0,0 +1,12 @@
|
|||||||
|
alias gpg='gpg2'
|
||||||
|
export GPG_TTY=$(tty)
|
||||||
|
|
||||||
|
alias vim=nvim
|
||||||
|
alias uwpass='PASSWORD_STORE_DIR=~/.pass/uw pass'
|
||||||
|
alias gca='git commit --amend --no-edit'
|
||||||
|
alias gpf='git push --force-with-lease'
|
||||||
|
alias openvpn='sudo openvpn --config *.ovpn'
|
||||||
|
|
||||||
|
set -o emacs
|
||||||
|
|
||||||
|
PS1='${PWD##*/} $ '
|
6
mpv.conf
Normal file
6
mpv.conf
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
audio-device='alsa/front:CARD=Multibit,DEV=0'
|
||||||
|
no-audio-display
|
||||||
|
|
||||||
|
hwdec=vaapi
|
||||||
|
|
||||||
|
no-osc
|
2
nvim/.gitignore
vendored
Normal file
2
nvim/.gitignore
vendored
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
plugged
|
||||||
|
autoload/plug.vim.old
|
2526
nvim/autoload/plug.vim
Normal file
2526
nvim/autoload/plug.vim
Normal file
File diff suppressed because it is too large
Load Diff
534
nvim/colors/Tomorrow-Night.vim
Normal file
534
nvim/colors/Tomorrow-Night.vim
Normal file
@ -0,0 +1,534 @@
|
|||||||
|
" Tomorrow Night - Full Colour and 256 Colour
|
||||||
|
" http://chriskempson.com
|
||||||
|
"
|
||||||
|
" Hex colour conversion functions borrowed from the theme "Desert256""
|
||||||
|
|
||||||
|
" Default GUI Colours
|
||||||
|
let s:foreground = "c5c8c6"
|
||||||
|
let s:selection = "373b41"
|
||||||
|
let s:line = "282a2e"
|
||||||
|
let s:comment = "969896"
|
||||||
|
let s:red = "cc6666"
|
||||||
|
let s:orange = "de935f"
|
||||||
|
let s:yellow = "cfc484"
|
||||||
|
let s:green = "b5bd68"
|
||||||
|
let s:aqua = "8abeb7"
|
||||||
|
let s:blue = "81a2be"
|
||||||
|
let s:purple = "b294bb"
|
||||||
|
let s:window = "4d5057"
|
||||||
|
|
||||||
|
let s:lightred = "d8b6b6"
|
||||||
|
let s:lightblue = "b3c8db"
|
||||||
|
let s:lightpurple = "cdbcd2"
|
||||||
|
|
||||||
|
let s:darkred = "551f21"
|
||||||
|
let s:darkorange = "505020"
|
||||||
|
let s:darkyellow = "705d36"
|
||||||
|
let s:darkgreen = "205020"
|
||||||
|
let s:darkaqua = "2d3e3c"
|
||||||
|
let s:darkblue = "2a353e"
|
||||||
|
let s:darkpurple = "392f3b"
|
||||||
|
|
||||||
|
let s:highlight = "444444"
|
||||||
|
|
||||||
|
" Console 256 Colours
|
||||||
|
if !has("gui_running")
|
||||||
|
let s:window = "444444"
|
||||||
|
let s:line = "3a3a3a"
|
||||||
|
let s:selection = "585858"
|
||||||
|
end
|
||||||
|
|
||||||
|
hi clear
|
||||||
|
syntax reset
|
||||||
|
|
||||||
|
let g:colors_name = "Tomorrow-Night"
|
||||||
|
|
||||||
|
if has("gui_running") || &t_Co == 88 || &t_Co == 256
|
||||||
|
" Returns an approximate grey index for the given grey level
|
||||||
|
fun <SID>grey_number(x)
|
||||||
|
if &t_Co == 88
|
||||||
|
if a:x < 23
|
||||||
|
return 0
|
||||||
|
elseif a:x < 69
|
||||||
|
return 1
|
||||||
|
elseif a:x < 103
|
||||||
|
return 2
|
||||||
|
elseif a:x < 127
|
||||||
|
return 3
|
||||||
|
elseif a:x < 150
|
||||||
|
return 4
|
||||||
|
elseif a:x < 173
|
||||||
|
return 5
|
||||||
|
elseif a:x < 196
|
||||||
|
return 6
|
||||||
|
elseif a:x < 219
|
||||||
|
return 7
|
||||||
|
elseif a:x < 243
|
||||||
|
return 8
|
||||||
|
else
|
||||||
|
return 9
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
if a:x < 14
|
||||||
|
return 0
|
||||||
|
else
|
||||||
|
let l:n = (a:x - 8) / 10
|
||||||
|
let l:m = (a:x - 8) % 10
|
||||||
|
if l:m < 5
|
||||||
|
return l:n
|
||||||
|
else
|
||||||
|
return l:n + 1
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
endfun
|
||||||
|
|
||||||
|
" Returns the actual grey level represented by the grey index
|
||||||
|
fun <SID>grey_level(n)
|
||||||
|
if &t_Co == 88
|
||||||
|
if a:n == 0
|
||||||
|
return 0
|
||||||
|
elseif a:n == 1
|
||||||
|
return 46
|
||||||
|
elseif a:n == 2
|
||||||
|
return 92
|
||||||
|
elseif a:n == 3
|
||||||
|
return 115
|
||||||
|
elseif a:n == 4
|
||||||
|
return 139
|
||||||
|
elseif a:n == 5
|
||||||
|
return 162
|
||||||
|
elseif a:n == 6
|
||||||
|
return 185
|
||||||
|
elseif a:n == 7
|
||||||
|
return 208
|
||||||
|
elseif a:n == 8
|
||||||
|
return 231
|
||||||
|
else
|
||||||
|
return 255
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
if a:n == 0
|
||||||
|
return 0
|
||||||
|
else
|
||||||
|
return 8 + (a:n * 10)
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
endfun
|
||||||
|
|
||||||
|
" Returns the palette index for the given grey index
|
||||||
|
fun <SID>grey_colour(n)
|
||||||
|
if &t_Co == 88
|
||||||
|
if a:n == 0
|
||||||
|
return 16
|
||||||
|
elseif a:n == 9
|
||||||
|
return 79
|
||||||
|
else
|
||||||
|
return 79 + a:n
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
if a:n == 0
|
||||||
|
return 16
|
||||||
|
elseif a:n == 25
|
||||||
|
return 231
|
||||||
|
else
|
||||||
|
return 231 + a:n
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
endfun
|
||||||
|
|
||||||
|
" Returns an approximate colour index for the given colour level
|
||||||
|
fun <SID>rgb_number(x)
|
||||||
|
if &t_Co == 88
|
||||||
|
if a:x < 69
|
||||||
|
return 0
|
||||||
|
elseif a:x < 172
|
||||||
|
return 1
|
||||||
|
elseif a:x < 230
|
||||||
|
return 2
|
||||||
|
else
|
||||||
|
return 3
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
if a:x < 75
|
||||||
|
return 0
|
||||||
|
else
|
||||||
|
let l:n = (a:x - 55) / 40
|
||||||
|
let l:m = (a:x - 55) % 40
|
||||||
|
if l:m < 20
|
||||||
|
return l:n
|
||||||
|
else
|
||||||
|
return l:n + 1
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
endfun
|
||||||
|
|
||||||
|
" Returns the actual colour level for the given colour index
|
||||||
|
fun <SID>rgb_level(n)
|
||||||
|
if &t_Co == 88
|
||||||
|
if a:n == 0
|
||||||
|
return 0
|
||||||
|
elseif a:n == 1
|
||||||
|
return 139
|
||||||
|
elseif a:n == 2
|
||||||
|
return 205
|
||||||
|
else
|
||||||
|
return 255
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
if a:n == 0
|
||||||
|
return 0
|
||||||
|
else
|
||||||
|
return 55 + (a:n * 40)
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
endfun
|
||||||
|
|
||||||
|
" Returns the palette index for the given R/G/B colour indices
|
||||||
|
fun <SID>rgb_colour(x, y, z)
|
||||||
|
if &t_Co == 88
|
||||||
|
return 16 + (a:x * 16) + (a:y * 4) + a:z
|
||||||
|
else
|
||||||
|
return 16 + (a:x * 36) + (a:y * 6) + a:z
|
||||||
|
endif
|
||||||
|
endfun
|
||||||
|
|
||||||
|
" Returns the palette index to approximate the given R/G/B colour levels
|
||||||
|
fun <SID>colour(r, g, b)
|
||||||
|
" Get the closest grey
|
||||||
|
let l:gx = <SID>grey_number(a:r)
|
||||||
|
let l:gy = <SID>grey_number(a:g)
|
||||||
|
let l:gz = <SID>grey_number(a:b)
|
||||||
|
|
||||||
|
" Get the closest colour
|
||||||
|
let l:x = <SID>rgb_number(a:r)
|
||||||
|
let l:y = <SID>rgb_number(a:g)
|
||||||
|
let l:z = <SID>rgb_number(a:b)
|
||||||
|
|
||||||
|
if l:gx == l:gy && l:gy == l:gz
|
||||||
|
" There are two possibilities
|
||||||
|
let l:dgr = <SID>grey_level(l:gx) - a:r
|
||||||
|
let l:dgg = <SID>grey_level(l:gy) - a:g
|
||||||
|
let l:dgb = <SID>grey_level(l:gz) - a:b
|
||||||
|
let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb)
|
||||||
|
let l:dr = <SID>rgb_level(l:gx) - a:r
|
||||||
|
let l:dg = <SID>rgb_level(l:gy) - a:g
|
||||||
|
let l:db = <SID>rgb_level(l:gz) - a:b
|
||||||
|
let l:drgb = (l:dr * l:dr) + (l:dg * l:dg) + (l:db * l:db)
|
||||||
|
if l:dgrey < l:drgb
|
||||||
|
" Use the grey
|
||||||
|
return <SID>grey_colour(l:gx)
|
||||||
|
else
|
||||||
|
" Use the colour
|
||||||
|
return <SID>rgb_colour(l:x, l:y, l:z)
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
" Only one possibility
|
||||||
|
return <SID>rgb_colour(l:x, l:y, l:z)
|
||||||
|
endif
|
||||||
|
endfun
|
||||||
|
|
||||||
|
" Returns the palette index to approximate the 'rrggbb' hex string
|
||||||
|
fun <SID>rgb(rgb)
|
||||||
|
let l:r = ("0x" . strpart(a:rgb, 0, 2)) + 0
|
||||||
|
let l:g = ("0x" . strpart(a:rgb, 2, 2)) + 0
|
||||||
|
let l:b = ("0x" . strpart(a:rgb, 4, 2)) + 0
|
||||||
|
|
||||||
|
return <SID>colour(l:r, l:g, l:b)
|
||||||
|
endfun
|
||||||
|
|
||||||
|
" Sets the highlighting for the given group
|
||||||
|
fun <SID>X(group, fg, bg, attr)
|
||||||
|
if a:fg != ""
|
||||||
|
exec "hi " . a:group . " guifg=#" . a:fg . " ctermfg=" . <SID>rgb(a:fg)
|
||||||
|
endif
|
||||||
|
if a:bg != ""
|
||||||
|
exec "hi " . a:group . " guibg=#" . a:bg . " ctermbg=" . <SID>rgb(a:bg)
|
||||||
|
endif
|
||||||
|
if a:attr != ""
|
||||||
|
exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
|
||||||
|
endif
|
||||||
|
endfun
|
||||||
|
|
||||||
|
" Vim Highlighting
|
||||||
|
call <SID>X("Normal", s:foreground, "", "")
|
||||||
|
call <SID>X("LineNr", s:selection, "", "")
|
||||||
|
call <SID>X("NonText", s:selection, "", "")
|
||||||
|
call <SID>X("SpecialKey", s:selection, "", "")
|
||||||
|
call <SID>X("Search", "", s:highlight, "")
|
||||||
|
call <SID>X("TabLine", s:window, s:foreground, "reverse")
|
||||||
|
call <SID>X("TabLineFill", s:window, s:foreground, "reverse")
|
||||||
|
call <SID>X("StatusLine", s:window, s:yellow, "reverse")
|
||||||
|
call <SID>X("StatusLineNC", s:window, s:foreground, "reverse")
|
||||||
|
call <SID>X("VertSplit", s:window, "", "none")
|
||||||
|
call <SID>X("Visual", "", s:selection, "")
|
||||||
|
call <SID>X("Directory", s:blue, "", "")
|
||||||
|
call <SID>X("ModeMsg", s:green, "", "")
|
||||||
|
call <SID>X("MoreMsg", s:green, "", "")
|
||||||
|
call <SID>X("Question", s:green, "", "")
|
||||||
|
call <SID>X("WarningMsg", s:red, "", "")
|
||||||
|
call <SID>X("MatchParen", "", s:selection, "")
|
||||||
|
call <SID>X("Folded", s:comment, "", "")
|
||||||
|
call <SID>X("FoldColumn", "", "", "")
|
||||||
|
if version >= 700
|
||||||
|
call <SID>X("CursorLine", "", s:line, "none")
|
||||||
|
call <SID>X("CursorColumn", "", s:line, "none")
|
||||||
|
call <SID>X("PMenu", s:foreground, s:selection, "none")
|
||||||
|
call <SID>X("PMenuSel", s:foreground, s:selection, "reverse")
|
||||||
|
call <SID>X("SignColumn", "", "", "none")
|
||||||
|
end
|
||||||
|
if version >= 703
|
||||||
|
call <SID>X("ColorColumn", "", s:line, "none")
|
||||||
|
end
|
||||||
|
|
||||||
|
" Standard Highlighting
|
||||||
|
call <SID>X("Comment", s:comment, "", "")
|
||||||
|
call <SID>X("Todo", s:comment, "", "")
|
||||||
|
call <SID>X("Title", s:comment, "", "")
|
||||||
|
call <SID>X("Identifier", s:red, "", "none")
|
||||||
|
call <SID>X("Statement", s:foreground, "", "")
|
||||||
|
call <SID>X("Conditional", s:foreground, "", "")
|
||||||
|
call <SID>X("Repeat", s:foreground, "", "")
|
||||||
|
call <SID>X("Structure", s:purple, "", "")
|
||||||
|
call <SID>X("Function", s:blue, "", "")
|
||||||
|
call <SID>X("Constant", s:orange, "", "")
|
||||||
|
call <SID>X("Keyword", s:orange, "", "")
|
||||||
|
call <SID>X("String", s:green, "", "")
|
||||||
|
call <SID>X("Special", s:foreground, "", "")
|
||||||
|
call <SID>X("PreProc", s:purple, "", "")
|
||||||
|
call <SID>X("Operator", s:aqua, "", "none")
|
||||||
|
call <SID>X("Type", s:blue, "", "none")
|
||||||
|
call <SID>X("Define", s:purple, "", "none")
|
||||||
|
call <SID>X("Include", s:blue, "", "")
|
||||||
|
"call <SID>X("Ignore", "666666", "", "")
|
||||||
|
|
||||||
|
" Vim Highlighting
|
||||||
|
call <SID>X("vimCommand", s:red, "", "none")
|
||||||
|
|
||||||
|
" C Highlighting
|
||||||
|
call <SID>X("cType", s:yellow, "", "")
|
||||||
|
call <SID>X("cStorageClass", s:purple, "", "")
|
||||||
|
call <SID>X("cConditional", s:purple, "", "")
|
||||||
|
call <SID>X("cRepeat", s:purple, "", "")
|
||||||
|
|
||||||
|
" PHP Highlighting
|
||||||
|
call <SID>X("phpVarSelector", s:red, "", "")
|
||||||
|
call <SID>X("phpKeyword", s:purple, "", "")
|
||||||
|
call <SID>X("phpRepeat", s:purple, "", "")
|
||||||
|
call <SID>X("phpConditional", s:purple, "", "")
|
||||||
|
call <SID>X("phpStatement", s:purple, "", "")
|
||||||
|
call <SID>X("phpMemberSelector", s:foreground, "", "")
|
||||||
|
|
||||||
|
" Ruby Highlighting
|
||||||
|
call <SID>X("rubySymbol", s:green, "", "")
|
||||||
|
call <SID>X("rubyConstant", s:yellow, "", "")
|
||||||
|
call <SID>X("rubyAccess", s:yellow, "", "")
|
||||||
|
call <SID>X("rubyAttribute", s:blue, "", "")
|
||||||
|
call <SID>X("rubyInclude", s:blue, "", "")
|
||||||
|
call <SID>X("rubyLocalVariableOrMethod", s:orange, "", "")
|
||||||
|
call <SID>X("rubyCurlyBlock", s:orange, "", "")
|
||||||
|
call <SID>X("rubyStringDelimiter", s:green, "", "")
|
||||||
|
call <SID>X("rubyInterpolationDelimiter", s:orange, "", "")
|
||||||
|
call <SID>X("rubyConditional", s:purple, "", "")
|
||||||
|
call <SID>X("rubyRepeat", s:purple, "", "")
|
||||||
|
call <SID>X("rubyControl", s:purple, "", "")
|
||||||
|
call <SID>X("rubyException", s:purple, "", "")
|
||||||
|
|
||||||
|
" Crystal Highlighting
|
||||||
|
call <SID>X("crystalSymbol", s:green, "", "")
|
||||||
|
call <SID>X("crystalConstant", s:yellow, "", "")
|
||||||
|
call <SID>X("crystalAccess", s:yellow, "", "")
|
||||||
|
call <SID>X("crystalAttribute", s:blue, "", "")
|
||||||
|
call <SID>X("crystalInclude", s:blue, "", "")
|
||||||
|
call <SID>X("crystalLocalVariableOrMethod", s:orange, "", "")
|
||||||
|
call <SID>X("crystalCurlyBlock", s:orange, "", "")
|
||||||
|
call <SID>X("crystalStringDelimiter", s:green, "", "")
|
||||||
|
call <SID>X("crystalInterpolationDelimiter", s:orange, "", "")
|
||||||
|
call <SID>X("crystalConditional", s:purple, "", "")
|
||||||
|
call <SID>X("crystalRepeat", s:purple, "", "")
|
||||||
|
call <SID>X("crystalControl", s:purple, "", "")
|
||||||
|
call <SID>X("crystalException", s:purple, "", "")
|
||||||
|
|
||||||
|
" Python Highlighting
|
||||||
|
call <SID>X("pythonInclude", s:purple, "", "")
|
||||||
|
call <SID>X("pythonStatement", s:purple, "", "")
|
||||||
|
call <SID>X("pythonConditional", s:purple, "", "")
|
||||||
|
call <SID>X("pythonRepeat", s:purple, "", "")
|
||||||
|
call <SID>X("pythonException", s:purple, "", "")
|
||||||
|
call <SID>X("pythonFunction", s:blue, "", "")
|
||||||
|
call <SID>X("pythonPreCondit", s:purple, "", "")
|
||||||
|
call <SID>X("pythonRepeat", s:aqua, "", "")
|
||||||
|
call <SID>X("pythonExClass", s:orange, "", "")
|
||||||
|
|
||||||
|
" JavaScript Highlighting
|
||||||
|
call <SID>X("javaScriptBraces", s:foreground, "", "")
|
||||||
|
call <SID>X("javaScriptFunction", s:purple, "", "")
|
||||||
|
call <SID>X("javaScriptConditional", s:purple, "", "")
|
||||||
|
call <SID>X("javaScriptRepeat", s:purple, "", "")
|
||||||
|
call <SID>X("javaScriptNumber", s:orange, "", "")
|
||||||
|
call <SID>X("javaScriptMember", s:orange, "", "")
|
||||||
|
call <SID>X("javascriptNull", s:orange, "", "")
|
||||||
|
call <SID>X("javascriptGlobal", s:blue, "", "")
|
||||||
|
call <SID>X("javascriptStatement", s:red, "", "")
|
||||||
|
|
||||||
|
" CoffeeScript Highlighting
|
||||||
|
call <SID>X("coffeeRepeat", s:purple, "", "")
|
||||||
|
call <SID>X("coffeeConditional", s:purple, "", "")
|
||||||
|
call <SID>X("coffeeKeyword", s:purple, "", "")
|
||||||
|
call <SID>X("coffeeObject", s:yellow, "", "")
|
||||||
|
|
||||||
|
" HTML Highlighting
|
||||||
|
call <SID>X("htmlTag", s:red, "", "")
|
||||||
|
call <SID>X("htmlTagName", s:red, "", "")
|
||||||
|
call <SID>X("htmlArg", s:red, "", "")
|
||||||
|
call <SID>X("htmlScriptTag", s:red, "", "")
|
||||||
|
|
||||||
|
" Diff Highlighting
|
||||||
|
call <SID>X("diffAdd", "", "4c4e39", "")
|
||||||
|
call <SID>X("diffDelete", "", s:red, "")
|
||||||
|
call <SID>X("diffChange", "", "2B5B77", "")
|
||||||
|
call <SID>X("diffText", s:line, s:blue, "")
|
||||||
|
|
||||||
|
" ShowMarks Highlighting
|
||||||
|
call <SID>X("ShowMarksHLl", s:orange, "", "none")
|
||||||
|
call <SID>X("ShowMarksHLo", s:purple, "", "none")
|
||||||
|
call <SID>X("ShowMarksHLu", s:yellow, "", "none")
|
||||||
|
call <SID>X("ShowMarksHLm", s:aqua, "", "none")
|
||||||
|
|
||||||
|
" Lua Highlighting
|
||||||
|
call <SID>X("luaStatement", s:purple, "", "")
|
||||||
|
call <SID>X("luaRepeat", s:purple, "", "")
|
||||||
|
call <SID>X("luaCondStart", s:purple, "", "")
|
||||||
|
call <SID>X("luaCondElseif", s:purple, "", "")
|
||||||
|
call <SID>X("luaCond", s:purple, "", "")
|
||||||
|
call <SID>X("luaCondEnd", s:purple, "", "")
|
||||||
|
|
||||||
|
" Cucumber Highlighting
|
||||||
|
call <SID>X("cucumberGiven", s:blue, "", "")
|
||||||
|
call <SID>X("cucumberGivenAnd", s:blue, "", "")
|
||||||
|
|
||||||
|
" Rust Highlighting
|
||||||
|
call <SID>X("rustQuestionMark", s:red, "", "")
|
||||||
|
|
||||||
|
" Go Highlighting
|
||||||
|
call <SID>X("goDirective", s:purple, "", "")
|
||||||
|
call <SID>X("goDeclaration", s:purple, "", "")
|
||||||
|
call <SID>X("goStatement", s:purple, "", "")
|
||||||
|
call <SID>X("goConditional", s:purple, "", "")
|
||||||
|
call <SID>X("goConstants", s:orange, "", "")
|
||||||
|
call <SID>X("goTodo", s:yellow, "", "")
|
||||||
|
call <SID>X("goDeclType", s:foreground, "", "")
|
||||||
|
call <SID>X("goBuiltins", s:purple, "", "")
|
||||||
|
call <SID>X("goRepeat", s:purple, "", "")
|
||||||
|
call <SID>X("goLabel", s:purple, "", "")
|
||||||
|
call <SID>X("goTypeName", s:red, "", "")
|
||||||
|
call <SID>X("goFunction", s:blue, "", "")
|
||||||
|
call <SID>X("goReceiverType", s:red, "", "")
|
||||||
|
call <SID>X("goFunctionCall", s:lightblue, "", "")
|
||||||
|
call <SID>X("goMethodCall", s:lightblue, "", "")
|
||||||
|
call <SID>X("goTypeConstructor", s:lightred, "", "")
|
||||||
|
call <SID>X("goPackage", s:orange, "", "")
|
||||||
|
call <SID>X("goType", s:lightpurple, "", "")
|
||||||
|
call <SID>X("goSignedInts", s:foreground, "", "")
|
||||||
|
|
||||||
|
" Clojure Highlighting
|
||||||
|
call <SID>X("clojureConstant", s:orange, "", "")
|
||||||
|
call <SID>X("clojureBoolean", s:orange, "", "")
|
||||||
|
call <SID>X("clojureCharacter", s:orange, "", "")
|
||||||
|
call <SID>X("clojureKeyword", s:green, "", "")
|
||||||
|
call <SID>X("clojureNumber", s:orange, "", "")
|
||||||
|
call <SID>X("clojureString", s:green, "", "")
|
||||||
|
call <SID>X("clojureRegexp", s:green, "", "")
|
||||||
|
call <SID>X("clojureParen", s:aqua, "", "")
|
||||||
|
call <SID>X("clojureVariable", s:yellow, "", "")
|
||||||
|
call <SID>X("clojureCond", s:blue, "", "")
|
||||||
|
call <SID>X("clojureDefine", s:purple, "", "")
|
||||||
|
call <SID>X("clojureException", s:red, "", "")
|
||||||
|
call <SID>X("clojureFunc", s:blue, "", "")
|
||||||
|
call <SID>X("clojureMacro", s:blue, "", "")
|
||||||
|
call <SID>X("clojureRepeat", s:blue, "", "")
|
||||||
|
call <SID>X("clojureSpecial", s:purple, "", "")
|
||||||
|
call <SID>X("clojureQuote", s:blue, "", "")
|
||||||
|
call <SID>X("clojureUnquote", s:blue, "", "")
|
||||||
|
call <SID>X("clojureMeta", s:blue, "", "")
|
||||||
|
call <SID>X("clojureDeref", s:blue, "", "")
|
||||||
|
call <SID>X("clojureAnonArg", s:blue, "", "")
|
||||||
|
call <SID>X("clojureRepeat", s:blue, "", "")
|
||||||
|
call <SID>X("clojureDispatch", s:blue, "", "")
|
||||||
|
|
||||||
|
" Scala Highlighting
|
||||||
|
call <SID>X("scalaKeyword", s:purple, "", "")
|
||||||
|
call <SID>X("scalaKeywordModifier", s:purple, "", "")
|
||||||
|
call <SID>X("scalaOperator", s:blue, "", "")
|
||||||
|
call <SID>X("scalaPackage", s:red, "", "")
|
||||||
|
call <SID>X("scalaFqn", s:foreground, "", "")
|
||||||
|
call <SID>X("scalaFqnSet", s:foreground, "", "")
|
||||||
|
call <SID>X("scalaImport", s:purple, "", "")
|
||||||
|
call <SID>X("scalaBoolean", s:orange, "", "")
|
||||||
|
call <SID>X("scalaDef", s:purple, "", "")
|
||||||
|
call <SID>X("scalaVal", s:purple, "", "")
|
||||||
|
call <SID>X("scalaVar", s:aqua, "", "")
|
||||||
|
call <SID>X("scalaClass", s:purple, "", "")
|
||||||
|
call <SID>X("scalaObject", s:purple, "", "")
|
||||||
|
call <SID>X("scalaTrait", s:purple, "", "")
|
||||||
|
call <SID>X("scalaDefName", s:blue, "", "")
|
||||||
|
call <SID>X("scalaValName", s:foreground, "", "")
|
||||||
|
call <SID>X("scalaVarName", s:foreground, "", "")
|
||||||
|
call <SID>X("scalaClassName", s:foreground, "", "")
|
||||||
|
call <SID>X("scalaType", s:yellow, "", "")
|
||||||
|
call <SID>X("scalaTypeSpecializer", s:yellow, "", "")
|
||||||
|
call <SID>X("scalaAnnotation", s:orange, "", "")
|
||||||
|
call <SID>X("scalaNumber", s:orange, "", "")
|
||||||
|
call <SID>X("scalaDefSpecializer", s:yellow, "", "")
|
||||||
|
call <SID>X("scalaClassSpecializer", s:yellow, "", "")
|
||||||
|
call <SID>X("scalaBackTick", s:green, "", "")
|
||||||
|
call <SID>X("scalaRoot", s:foreground, "", "")
|
||||||
|
call <SID>X("scalaMethodCall", s:blue, "", "")
|
||||||
|
call <SID>X("scalaCaseType", s:yellow, "", "")
|
||||||
|
call <SID>X("scalaLineComment", s:comment, "", "")
|
||||||
|
call <SID>X("scalaComment", s:comment, "", "")
|
||||||
|
call <SID>X("scalaDocComment", s:comment, "", "")
|
||||||
|
call <SID>X("scalaDocTags", s:comment, "", "")
|
||||||
|
call <SID>X("scalaEmptyString", s:green, "", "")
|
||||||
|
call <SID>X("scalaMultiLineString", s:green, "", "")
|
||||||
|
call <SID>X("scalaUnicode", s:orange, "", "")
|
||||||
|
call <SID>X("scalaString", s:green, "", "")
|
||||||
|
call <SID>X("scalaStringEscape", s:green, "", "")
|
||||||
|
call <SID>X("scalaSymbol", s:orange, "", "")
|
||||||
|
call <SID>X("scalaChar", s:orange, "", "")
|
||||||
|
call <SID>X("scalaXml", s:green, "", "")
|
||||||
|
call <SID>X("scalaConstructorSpecializer", s:yellow, "", "")
|
||||||
|
call <SID>X("scalaBackTick", s:blue, "", "")
|
||||||
|
|
||||||
|
" Git
|
||||||
|
call <SID>X("diffAdded", s:green, "", "")
|
||||||
|
call <SID>X("diffRemoved", s:red, "", "")
|
||||||
|
call <SID>X("gitcommitSummary", "", "", "bold")
|
||||||
|
|
||||||
|
" Diff
|
||||||
|
let s:diffbackground = "494e56"
|
||||||
|
call <SID>X("diffAdded", s:green, "", "")
|
||||||
|
call <SID>X("diffRemoved", s:red, "", "")
|
||||||
|
call <SID>X("DiffAdd", s:green, s:diffbackground, "")
|
||||||
|
call <SID>X("DiffDelete", s:red, s:diffbackground, "")
|
||||||
|
call <SID>X("DiffChange", s:yellow, s:diffbackground, "")
|
||||||
|
call <SID>X("DiffText", s:diffbackground, s:orange, "")
|
||||||
|
|
||||||
|
" GitGutter
|
||||||
|
call <SID>X("GitGutterAdd", s:darkgreen, s:darkgreen, "none")
|
||||||
|
call <SID>X("GitGutterChange", s:darkorange, s:darkorange, "none")
|
||||||
|
call <SID>X("GitGutterChangeDelete", s:red, s:darkorange, "underline")
|
||||||
|
call <SID>X("GitGutterDelete", s:red, "", "underline")
|
||||||
|
|
||||||
|
" Delete Functions
|
||||||
|
delf <SID>X
|
||||||
|
delf <SID>rgb
|
||||||
|
delf <SID>colour
|
||||||
|
delf <SID>rgb_colour
|
||||||
|
delf <SID>rgb_level
|
||||||
|
delf <SID>rgb_number
|
||||||
|
delf <SID>grey_colour
|
||||||
|
delf <SID>grey_level
|
||||||
|
delf <SID>grey_number
|
||||||
|
endif
|
169
nvim/init.vim
Normal file
169
nvim/init.vim
Normal file
@ -0,0 +1,169 @@
|
|||||||
|
" Set the encoding to UTF-8
|
||||||
|
scriptencoding utf-8
|
||||||
|
set encoding=utf8
|
||||||
|
|
||||||
|
set shada="NONE"
|
||||||
|
|
||||||
|
" Run :PlugInstall to install plugins
|
||||||
|
|
||||||
|
" Plugins
|
||||||
|
call plug#begin()
|
||||||
|
|
||||||
|
" UI
|
||||||
|
Plug 'ctrlpvim/ctrlp.vim'
|
||||||
|
"Plug 'Shougo/echodoc.vim'
|
||||||
|
|
||||||
|
" Formatting helpers
|
||||||
|
Plug 'tpope/vim-commentary'
|
||||||
|
|
||||||
|
" Language specific
|
||||||
|
Plug 'fatih/vim-go'
|
||||||
|
Plug 'exu/pgsql.vim'
|
||||||
|
Plug 'sirtaj/vim-openscad'
|
||||||
|
"Plug 'rust-lang/rust.vim'
|
||||||
|
"Plug 'racer-rust/vim-racer'
|
||||||
|
|
||||||
|
" Git helpers
|
||||||
|
Plug 'tpope/vim-fugitive'
|
||||||
|
Plug 'airblade/vim-gitgutter'
|
||||||
|
|
||||||
|
call plug#end()
|
||||||
|
|
||||||
|
" Set the vertical split character
|
||||||
|
set fillchars+=vert:\|
|
||||||
|
|
||||||
|
set inccommand=split
|
||||||
|
|
||||||
|
" Prevent useless redraws
|
||||||
|
set lazyredraw
|
||||||
|
|
||||||
|
" Set colors
|
||||||
|
set termguicolors
|
||||||
|
set t_Co=256
|
||||||
|
colorscheme Tomorrow-Night
|
||||||
|
|
||||||
|
let g:gitgutter_sign_added = '+ '
|
||||||
|
let g:gitgutter_sign_modified = '~ '
|
||||||
|
let g:gitgutter_sign_modified_removed = '__'
|
||||||
|
let g:gitgutter_sign_removed = '_ '
|
||||||
|
|
||||||
|
" Syntax
|
||||||
|
syntax on
|
||||||
|
set showmatch
|
||||||
|
|
||||||
|
" Set backspace to work everywhere
|
||||||
|
set backspace=start,eol,indent
|
||||||
|
|
||||||
|
set laststatus=1
|
||||||
|
|
||||||
|
" Show indents and trailing whitespace
|
||||||
|
set list listchars=trail:·,tab:»\ ,eol:¬
|
||||||
|
|
||||||
|
" Set indent settings
|
||||||
|
set tabstop=4 shiftwidth=4 noexpandtab
|
||||||
|
autocmd BufRead,BufNewFile *.py set tabstop=4 shiftwidth=4 noexpandtab
|
||||||
|
|
||||||
|
" Disable auto newlines
|
||||||
|
set wrap
|
||||||
|
set textwidth=0
|
||||||
|
set wrapmargin=0
|
||||||
|
set formatoptions=l
|
||||||
|
|
||||||
|
" GUI options
|
||||||
|
set mouse=a
|
||||||
|
set clipboard=unnamedplus
|
||||||
|
|
||||||
|
" Line numbers
|
||||||
|
set number
|
||||||
|
set numberwidth=6
|
||||||
|
highlight LineNr ctermfg=darkgrey
|
||||||
|
set relativenumber
|
||||||
|
|
||||||
|
set ruler
|
||||||
|
|
||||||
|
set showtabline=1
|
||||||
|
|
||||||
|
set completeopt=menuone,noinsert
|
||||||
|
|
||||||
|
" Configure CtrlP
|
||||||
|
let g:ctrlp_working_path_mode = 'r'
|
||||||
|
|
||||||
|
let g:ctrlp_user_command = ['.git', 'cd %s && git ls-files . -co --exclude-standard', 'find %s -type f']
|
||||||
|
|
||||||
|
let g:netrw_dirhistmax=0
|
||||||
|
let g:netrw_liststyle=3
|
||||||
|
|
||||||
|
set shortmess+=c
|
||||||
|
|
||||||
|
let g:cm_auto_popup = 0
|
||||||
|
let g:cm_sources_override = {
|
||||||
|
\ 'cm-tags': {'enable':0}
|
||||||
|
\ }
|
||||||
|
|
||||||
|
|
||||||
|
" echodoc
|
||||||
|
|
||||||
|
"let g:echodoc_enable_at_startup = 1
|
||||||
|
"set noshowmode
|
||||||
|
|
||||||
|
|
||||||
|
au FileType go nmap <F11> :GoAlternate<CR>
|
||||||
|
|
||||||
|
" Go
|
||||||
|
let g:go_fmt_command = "goimports"
|
||||||
|
let g:go_fmt_fail_silently = 1
|
||||||
|
|
||||||
|
" let g:go_gocode_unimported_packages = 0
|
||||||
|
|
||||||
|
let g:go_highlight_functions = 1
|
||||||
|
let g:go_highlight_methods = 1
|
||||||
|
let g:go_highlight_types = 1
|
||||||
|
let g:go_highlight_structs = 1
|
||||||
|
let g:go_highlight_interfaces = 1
|
||||||
|
let g:go_highlight_operators = 1
|
||||||
|
let g:go_highlight_build_constraints = 1
|
||||||
|
let g:go_highlight_generate_tags = 1
|
||||||
|
|
||||||
|
let g:go_metalinter_autosave = 0
|
||||||
|
" let g:go_metalinter_autosave_enabled = ['golint', 'ineffassign']
|
||||||
|
|
||||||
|
let g:go_template_autocreate = 0
|
||||||
|
|
||||||
|
" let g:go_auto_type_info=1
|
||||||
|
" let g:go_updatetime = 250
|
||||||
|
|
||||||
|
au BufNewFile,BufRead *.gohtml setf gohtmltmpl
|
||||||
|
au BufNewFile,BufRead *.tmpl setf gohtmltmpl
|
||||||
|
|
||||||
|
" Rust
|
||||||
|
|
||||||
|
let g:rustfmt_autosave = 0
|
||||||
|
|
||||||
|
let g:racer_experimental_completer = 1
|
||||||
|
|
||||||
|
autocmd BufRead,BufNewFile *.rs set tabstop=4 shiftwidth=4 expandtab
|
||||||
|
|
||||||
|
au FileType rust nmap gd <Plug>(rust-def)
|
||||||
|
au FileType rust nmap K <Plug>(rust-doc)
|
||||||
|
|
||||||
|
" Set keybindings
|
||||||
|
|
||||||
|
nnoremap <Tab> <C-w><C-w>
|
||||||
|
nnoremap <C-\>> <C-w><\>>
|
||||||
|
nnoremap <C-\<> <C-w><\<>
|
||||||
|
|
||||||
|
nnoremap <silent> <Home> ^
|
||||||
|
vnoremap <silent> <Home> ^
|
||||||
|
inoremap <silent> <Home> <C-o>^
|
||||||
|
|
||||||
|
map <silent> <F5> :nohl<CR>
|
||||||
|
|
||||||
|
inoremap <C-Space> <C-x><C-o>
|
||||||
|
|
||||||
|
nnoremap d "_d
|
||||||
|
vnoremap d "_d
|
||||||
|
|
||||||
|
nnoremap D "_D
|
||||||
|
|
||||||
|
map q: <nop>
|
||||||
|
map Q <nop>
|
5
picom.conf
Normal file
5
picom.conf
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
#backend = "glx";
|
||||||
|
#glx-swap-method = "6";
|
||||||
|
|
||||||
|
inactive-opacity = 0.85;
|
||||||
|
focus-exclude = [ "name *= 'i3lock'", "class_g = 'dmenu'" ];
|
20
profile
Executable file
20
profile
Executable file
@ -0,0 +1,20 @@
|
|||||||
|
export PATH="${PATH}:$HOME/go/bin"
|
||||||
|
export EDITOR=/usr/bin/nvim
|
||||||
|
export PAGER=/bin/less
|
||||||
|
|
||||||
|
# SSH agent
|
||||||
|
if [ ! -S ~/.ssh/ssh_auth_sock ]; then
|
||||||
|
eval `ssh-agent -t 300` > /dev/null
|
||||||
|
ln -sf "$SSH_AUTH_SOCK" ~/.ssh/ssh_auth_sock
|
||||||
|
fi
|
||||||
|
export SSH_AUTH_SOCK=~/.ssh/ssh_auth_sock
|
||||||
|
|
||||||
|
# Go
|
||||||
|
export GOPRIVATE="git.ultraware.nl/*/*,git.sinuss.nl/*/*"
|
||||||
|
|
||||||
|
# Fixes
|
||||||
|
export _JAVA_AWT_WM_NONREPARENTING=1
|
||||||
|
|
||||||
|
case "$SHELL" in
|
||||||
|
/bin/ksh | /bin/loksh | /bin/mksh) export ENV=~/.kshrc ;;
|
||||||
|
esac
|
Loading…
Reference in New Issue
Block a user