commit 28cb9274f1db32c621ac771debd906bb64adab67
parent b36cab16e3d272da8d9bea17e1d0d7d64c865dd1
Author: Szymon Mikulicz <szymon.mikulicz@posteo.net>
Date: Tue, 2 Jul 2019 18:54:42 +0200
Merge branch 'master' into notwobug
Diffstat:
8 files changed, 61 insertions(+), 17 deletions(-)
diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml
@@ -99,7 +99,7 @@ font:
use_thin_strokes: false
# Should display the render timer
-render_timer: false
+debug.render_timer: false
# Colors (Tomorrow Night Bright)
colors:
diff --git a/astroid/.config/astroid/poll.sh b/astroid/.config/astroid/poll.sh
@@ -2,6 +2,11 @@
set -e
+if ! ping -w 1 -W 1 -c 1 posteo.de; then
+ echo "No connection to posteo"
+ exit
+fi
+
export MAILDIR="/home/shyman/.mail"
moveIt()
@@ -32,13 +37,14 @@ mbsync posteo
notmuch new
notmuch tag --batch <<EOF
- +posteo tag:new and path:"posteo/**"
- +deleted tag:new and folder:posteo/Trash
- +sent tag:new and folder:posteo/Sent
- +inbox tag:new and folder:posteo/Inbox
- +draft tag:new and folder:posteo/Drafts
- +note tag:new and folder:posteo/Notes
- +migration tag:new and folder:"posteo/Migration_*"
+ +posteo tag:new and path:"posteo/**"
+ +o2 tag:new and to:czilukim@o2.pl
+ +deleted tag:new and folder:posteo/Trash
+ +sent tag:new and folder:posteo/Sent
+ +inbox tag:new and folder:posteo/Inbox
+ +draft tag:new and folder:posteo/Drafts
+ +note tag:new and folder:posteo/Notes
+ +migration tag:new and folder:"posteo/Migration_*"
EOF
notmuch tag -new tag:new
diff --git a/fish/.config/fish/functions/g.fish b/fish/.config/fish/functions/g.fish
@@ -0,0 +1,31 @@
+#!/usr/bin/env fish
+function g
+ set len (count $argv)
+ if test $len -gt 0
+ if test $len -gt 1
+ set rest $argv[2..$len]
+ else
+ set rest
+ end
+ switch $argv[1]
+ case "s"
+ git status
+ case "a"
+ git add $rest
+ case "c"
+ git commit $rest
+ case "p"
+ git push $rest
+ case "pl"
+ git pull $rest
+ case "ch"
+ git checkout $rest
+ case "d"
+ git diff $rest
+ case "m"
+ git merge $rest
+ case '*'
+ git $argv
+ end
+ end
+end
diff --git a/i3/.i3/config b/i3/.i3/config
@@ -146,6 +146,7 @@ for_window [instance="mpv"] pixel 0
for_window [instance="^r_x11$"] floating enable
for_window [instance="^octave\-gui$"] floating enable
for_window [instance="^matplotlib$"] floating enable
+for_window [instance="^gnuplot_qt$"] floating enable
exec --no-startup-id /usr/lib/geoclue-2.0/demos/agent
exec --no-startup-id redshift-gtk
diff --git a/nvidia-xrun/.nvidia-xinitrc b/nvidia-xrun/.nvidia-xinitrc
@@ -1,3 +1,2 @@
#!/bin/sh
-source ~/.xprofile
-openbox-session
+exec openbox-session
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
@@ -1,3 +1,7 @@
+if &shell =~# 'fish$'
+ set shell=bash
+endif
+
" Install vim-plug if not isntalled
if empty(glob('~/.local/share/nvim/site/autoload/plug.vim'))
silent !curl -fLo ~/.local/share/nvim/site/autoload/plug.vim --create-dirs
@@ -21,6 +25,8 @@ Plug 'lervag/vimtex'
Plug 'rust-lang/rust.vim'
+Plug 'dag/vim-fish'
+
Plug 'OmniSharp/omnisharp-vim'
Plug 'jalvesaq/Nvim-R'
@@ -84,6 +90,11 @@ if !exists('g:deoplete#omni#input_patterns')
endif
let g:deoplete#omni#input_patterns.tex = g:vimtex#re#deoplete
+" eclim
+let g:EclimCompletionMethod = 'omnifunc'
+let g:deoplete#omni#input_patterns.java = '[^. *\t]\.\w*'
+
+
" Nvim-R
call deoplete#custom#option('omni_patterns', {
\ 'r': ['[^. *\t]\.\w*', '\h\w*::\w*', '\h\w*\$\w*'],
diff --git a/trackma/.trackma/ui-qt.json b/trackma/.trackma/ui-qt.json
@@ -13,17 +13,12 @@
"progress_sub_fg": "#5187B1"
},
"columns_per_api": false,
- "columns_state": {
- "COMPLETED": "AAAA/wAAAAAAAAABAAAAAAAAAAEBAAAAAAAAAAAAAAALoQcAAAAGAAAACQAAAGQAAAAKAAAAZAAAAAAAAABkAAAABQAAAGQAAAAHAAAAZAAAAAgAAABkAAAGZQAAAAsBAQAAAAAAAAEAAAAAAAAAZP////8AAACEAAAAAAAAAAsAAAAAAAAAAQAAAAAAAAUgAAAAAQAAAAEAAABGAAAAAQAAAAIAAAA3AAAAAQAAAAIAAABkAAAAAQAAAAAAAAAAAAAAAQAAAAAAAABkAAAAAQAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAQAAAAAAAAPoAAAAAAA=",
- "CURRENT": "AAAA/wAAAAAAAAABAAAAAQAAAAYBAAAACwAAAAAAAAABAAAAAgAAAAMAAAAFAAAABAAAAAYAAAAHAAAACAAAAAkAAAAKAAAACwAAAAAAAAABAAAAAgAAAAMAAAAFAAAABAAAAAYAAAAHAAAACAAAAAkAAAAKAAAAC5EHAAAABgAAAAkAAABkAAAACgAAAGQAAAAAAAAAZAAAAAUAAABkAAAABwAAAGQAAAAIAAAAZAAABnMAAAALAQEAAAAAAAABAAAAAAAAAGT/////AAAAhAAAAAAAAAALAAAAAAAAAAEAAAAAAAAFIAAAAAEAAAABAAAARgAAAAEAAAACAAAANwAAAAEAAAACAAAAAAAAAAEAAAAAAAAAcgAAAAEAAAAAAAAAZAAAAAEAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAAD6AAAAAAA",
- "DROPPED": "AAAA/wAAAAAAAAABAAAAAAAAAAEBAAAAAAAAAAAAAAALoQcAAAAGAAAACQAAAGQAAAAKAAAAZAAAAAAAAABkAAAABQAAAGQAAAAHAAAAZAAAAAgAAABkAAACfAAAAAsBAQAAAAAAAAEAAAAAAAAAZP////8AAACEAAAAAAAAAAsAAAAAAAAAAQAAAAAAAAE3AAAAAQAAAAEAAABGAAAAAQAAAAIAAAA3AAAAAQAAAAIAAABkAAAAAQAAAAAAAAAAAAAAAQAAAAAAAABkAAAAAQAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAQAAAAAAAAPoAAAAAAA=",
- "PAUSED": "AAAA/wAAAAAAAAABAAAAAAAAAAEBAAAAAAAAAAAAAAALoQcAAAAGAAAACQAAAGQAAAAKAAAAZAAAAAAAAABkAAAABQAAAGQAAAAHAAAAZAAAAAgAAABkAAACfAAAAAsBAQAAAAAAAAEAAAAAAAAAZP////8AAACEAAAAAAAAAAsAAAAAAAAAAQAAAAAAAAE3AAAAAQAAAAEAAABGAAAAAQAAAAIAAAA3AAAAAQAAAAIAAABkAAAAAQAAAAAAAAAAAAAAAQAAAAAAAABkAAAAAQAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAQAAAAAAAAPoAAAAAAA=",
- "PLANNING": "AAAA/wAAAAAAAAABAAAAAAAAAAEBAAAAAAAAAAAAAAALoQcAAAAGAAAACQAAAGQAAAAKAAAAZAAAAAAAAABkAAAABQAAAGQAAAAHAAAAZAAAAAgAAABkAAACfAAAAAsBAQAAAAAAAAEAAAAAAAAAZP////8AAACEAAAAAAAAAAsAAAAAAAAAAQAAAAAAAAE3AAAAAQAAAAEAAABGAAAAAQAAAAIAAAA3AAAAAQAAAAIAAABkAAAAAQAAAAAAAAAAAAAAAQAAAAAAAABkAAAAAQAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAQAAAAAAAAPoAAAAAAA="
- },
+ "columns_state": "AAAA/wAAAAAAAAABAAAAAQAAAAYAAAAAAAAAAAAAAAAMoQ8AAAAHAAAACAAAAGQAAAALAAAAZAAAAAoAAABkAAAABQAAAGQAAAAHAAAAZAAAAAAAAABkAAAACQAAAGQAAAaGAAAADAEBAAAAAAAAAQAAAAAAAABk/////wAAAIQAAAAAAAAADAAAAAAAAAABAAAAAAAABUEAAAABAAAAAQAAAEYAAAABAAAAAgAAADcAAAABAAAAAgAAAGQAAAABAAAAAAAAAAAAAAABAAAAAAAAAGQAAAABAAAAAAAAAAAAAAABAAAAAAAAAAAAAAABAAAAAAAAAAAAAAABAAAAAAAAAAAAAAABAAAAAAAAAAAAAAABAAAAAAAAA+gAAAAAAA==",
"episodebar_style": 1,
"episodebar_text": false,
"filter_bar_position": 2,
"filter_global": false,
+ "inline_edit": true,
"last_height": 480,
"last_width": 740,
"last_x": 0,
diff --git a/xorg/.xprofile b/xorg/.xprofile
@@ -4,3 +4,4 @@ xinput --set-prop 'SynPS/2 Synaptics TouchPad' 'libinput Tapping Enabled' 1
xrandr --dpi 96
xrdb -merge ~/.Xresources
export QT_QPA_PLATFORMTHEME="qt5ct"
+export NVIM_GTK_NO_HEADERBAR=1
