diff options
| -rw-r--r-- | i3/.xinitrc | 4 | ||||
| -rw-r--r-- | kakoune/.config/kak/kakrc | 6 | ||||
| -rw-r--r-- | termite/.config/termite/config | 2 | ||||
| -rw-r--r-- | vim-core/.config/nvim/init.vim | 27 | ||||
| -rwxr-xr-x | xinit/.xprofile | 3 | ||||
| -rwxr-xr-x | xinit/Scripts/lock.sh | 8 |
6 files changed, 26 insertions, 24 deletions
diff --git a/i3/.xinitrc b/i3/.xinitrc index 598e231..2dbc46f 100644 --- a/i3/.xinitrc +++ b/i3/.xinitrc @@ -1,6 +1,8 @@ -export LOPTS="screensaver composer" +export LOPTS="screensaver composer gnome-keyring" # Launch other stuff source ~/.xprofile +source ~/Scripts/xlaunchrc +#trayer --edge top --align right --SetDockType true --SetPartialStrut true --expand true --width 2 --height 18 --transparent true --tint 0x000000 --alpha 0 & exec i3 diff --git a/kakoune/.config/kak/kakrc b/kakoune/.config/kak/kakrc index 0393024..bb9a004 100644 --- a/kakoune/.config/kak/kakrc +++ b/kakoune/.config/kak/kakrc @@ -9,9 +9,9 @@ map global user l %{: enter-user-mode lsp<ret>} -docstring "LSP mode" # General stuff colorscheme gruvbox-dark -# hook global InsertChar \t %{ exec -draft -itersel h@ } -set global tabstop 4 -set global indentwidth 4 +hook global InsertChar \t %{ exec -draft -itersel h@ } +set global tabstop 2 +set global indentwidth 2 map global insert <c-w> '<a-;><a-/>\S+\s*<ret><a-;>d' map global insert <tab> '.<a-;>><backspace>' diff --git a/termite/.config/termite/config b/termite/.config/termite/config index 7cc3118..67f2d79 100644 --- a/termite/.config/termite/config +++ b/termite/.config/termite/config @@ -7,7 +7,7 @@ #clickable_url = true #dynamic_title = true font = Comic Mono 14 -font = Ubuntu Mono 15 +font = Ubuntu Mono 13 # font = cozette 11 #fullscreen = true #icon_name = terminal diff --git a/vim-core/.config/nvim/init.vim b/vim-core/.config/nvim/init.vim index 81d69c9..070e076 100644 --- a/vim-core/.config/nvim/init.vim +++ b/vim-core/.config/nvim/init.vim @@ -20,12 +20,12 @@ filetype plugin indent on " required " Do not create the tilde files set nobackup - set tabstop=4 - set shiftwidth=4 + set tabstop=2 + set shiftwidth=2 set expandtab set colorcolumn=80 - set softtabstop=4 + set softtabstop=2 set autoindent set smartindent @@ -68,15 +68,18 @@ filetype plugin indent on " required augroup end"}}} " Language specific{{{ - autocmd FileType python set et - autocmd FileType go setlocal noet - autocmd FileType nix setlocal shiftwidth=4 softtabstop=4 - autocmd FileType vim setlocal foldmethod=marker"}}} - autocmd BufNewFile,BufRead *.tex - \ set nocursorline | - \ set nornu | - \ set number | - \ let g:loaded_matchparen=1 | + autocmd FileType python + \ set et | + \ set tabstop=2 | + \ set shiftwidth=2 | + autocmd FileType go setlocal noet + autocmd FileType vim setlocal foldmethod=marker + autocmd BufNewFile,BufRead *.tex + \ set nocursorline | + \ set nornu | + \ set number | + \ let g:loaded_matchparen=1 | +"}}} " File management{{{ " Fuzzy like menu diff --git a/xinit/.xprofile b/xinit/.xprofile index d2a6731..b8a34a0 100755 --- a/xinit/.xprofile +++ b/xinit/.xprofile @@ -3,11 +3,10 @@ export _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.defaultlaf=com.su export TERM=termite export TERMINAL=termite -# export SSH_AUTH_SOCK=${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh +export SSH_AUTH_SOCK=${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh export XKB_DEFAULT_LAYOUT=us export XKB_DEFAULT_VARIANT=altgr-intl -export LOPTS="screensaver composer gnome-keyring" export MOZ_X11_EGL=1 export MOZ_WEBRENDER=1 diff --git a/xinit/Scripts/lock.sh b/xinit/Scripts/lock.sh index 49cc197..aff989d 100755 --- a/xinit/Scripts/lock.sh +++ b/xinit/Scripts/lock.sh @@ -1,11 +1,9 @@ #!/usr/bin/env bash LOCKFILE=/tmp/lockscreen.png +INFILE=$HOME/Pictures/current_wall -scrot -o $LOCKFILE -size=$(identify -format "%[fx:w]x%[fx:h]" "$LOCKFILE") +convert $INFILE -blur 10x10 $LOCKFILE -convert $LOCKFILE -scale 70 -sample $size\! -quality 11 $LOCKFILE - -# i3lock -i $LOCKFILE +i3lock -i $LOCKFILE |