Merge branch 'master' of 207.154.210.186:/home/yigit/dots

7 files changed, 108 insertions, 12 deletions

diff --git a/.config/i3/config##desktop.Linux.Maus b/.config/i3/config##desktop.Linux.Maus
index 33c2484..9c62d18 100644
--- a/.config/i3/config##desktop.Linux.Maus
+++ b/.config/i3/config##desktop.Linux.Maus
@@ -8,7 +8,7 @@ set $alt Mod1
 #autostart
 exec --no-startup-id xsettingsd &
 exec --no-startup-id compton -b &
-exec --no-startup-id dropbox &
+exec --no-startup-id nextcloud &
 exec --no-startup-id copyq &
 exec --no-startup-id redshift-gtk &
 exec --no-startup-id nm-applet &
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index bd3a3a7..c7fe6de 100755
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -53,6 +53,8 @@ Plug 'chrisbra/Colorizer'
 Plug 'matze/vim-move'
 " search/select/edit sandwiched textobjects (vim-surround)
 Plug 'machakann/vim-sandwich'
+" provide additional text objects
+Plug 'wellle/targets.vim'
 
 "folding ledger files
 Plug 'ledger/vim-ledger'
diff --git a/.config/polybar/config##desktop.Linux.Lowe b/.config/polybar/config##desktop.Linux.Lowe
index 5b0c3c0..8ee7e4d 100644
--- a/.config/polybar/config##desktop.Linux.Lowe
+++ b/.config/polybar/config##desktop.Linux.Lowe
@@ -50,7 +50,7 @@ module-margin = 1
 font-0 = scientifica:antialias=false;0
 font-1 = Lato:size=10;1
 font-2 = Raleway:size=10;1
-font-3 = FuraCode Nerd Font Mono:size=12;2
+font-3 = FuraCode Nerd Font:size=12;2
 
 modules-left = i3 pulseaudio mpd
 modules-center = xwindow
diff --git a/.taskrc b/.taskrc##desktop.Linux.Lowe
index 375080c..fee2a32 100644
--- a/.taskrc
+++ b/.taskrc##desktop.Linux.Lowe
@@ -85,6 +85,6 @@ calendar.details=full
 taskd.certificate=\/home\/yigit\/.task\/yigit_sever.cert.pem
 taskd.key=\/home\/yigit\/.task\/yigit_sever.key.pem
 taskd.ca=\/home\/yigit\/.task\/ca.cert.pem
-taskd.server=207.154.210.186:80
+taskd.server=localhost:53589
 taskd.credentials=Public\/Yigit Sever\/d4682d9a-9895-4127-86af-8d2ffc6fffcd
 taskd.trust=ignore hostname
diff --git a/.taskrc##desktop.Linux.Maus b/.taskrc##desktop.Linux.Maus
new file mode 100644
index 0000000..23addf7
--- /dev/null
+++ b/.taskrc##desktop.Linux.Maus
@@ -0,0 +1,90 @@
+# [Created by task 2.5.1 2/6/2017 17:29:09]
+# Taskwarrior program configuration file.
+# For more documentation, see http://taskwarrior.org or try 'man task', 'man task-color',
+# 'man task-sync' or 'man taskrc'
+
+# Here is an example of entries that use the default, override and blank values
+#   variable=foo   -- By specifying a value, this overrides the default
+#   variable=      -- By specifying no value, this means no default
+#   #variable=foo  -- By commenting out the line, or deleting it, this uses the default
+
+# Use the command 'task show' to see all defaults and overrides
+
+# Files
+#data.location=/home/yigit/Dropbox/.task
+
+# Color theme (uncomment one to use)
+#include /usr/share/doc/task/rc/light-16.theme
+#include /usr/share/doc/task/rc/light-256.theme
+#include /usr/share/doc/task/rc/dark-16.theme
+#include /usr/share/doc/task/rc/dark-256.theme
+#include /usr/share/doc/task/rc/dark-red-256.theme
+#include /usr/share/doc/task/rc/dark-green-256.theme
+#include /usr/share/doc/task/rc/dark-blue-256.theme
+#include /usr/share/doc/task/rc/dark-violets-256.theme
+#include /usr/share/doc/task/rc/dark-yellow-green.theme
+#include /usr/share/doc/task/rc/dark-gray-256.theme
+#include /usr/share/doc/task/rc/dark-gray-blue-256.theme
+include /usr/share/doc/task/rc/solarized-dark-256.theme
+#include /usr/share/doc/task/rc/solarized-light-256.theme
+#include /usr/share/doc/task/rc/no-color.theme
+
+###### GTD Configuration ######
+### 'in' Report Definition
+report.in.columns     = id,description
+report.in.description = Inbox
+report.in.filter      = status:pending limit:page (+in)
+report.in.labels      = ID,Description
+
+### 'inConky' Report Definition
+report.inConky.columns     = description
+report.inConky.description = Inbox for Conky
+report.inConky.filter      = status:pending limit:page (+in)
+report.inConky.labels      = Description
+#
+### 'todo' Report Definition
+report.todo.columns     = id,description,due
+report.todo.labels      = ID,Description,Due
+report.todo.description = Tasks with due dates
+report.todo.filter      = status:pending and due.after:now and due.before:later
+report.todo.sort        = due+
+report.todo.dateformat  = D/M, a @H:N
+
+### 'todo to Show in Conky' Report Definition
+report.todoConky.columns     = description,due
+report.todoConky.labels      = Description, Due
+report.todoConky.description = Tasks to do
+report.todoConky.sort        = due+
+report.todoConky.filter      = status:pending and due.after:now and due.before:later
+report.todoConky.dateformat  = D-M-y H:N (A)
+
+### report for focus script
+report.custom_focus.columns     = description
+report.custom_focus.labels      = Description
+report.custom_focus.description = Task to feed to focus script
+report.custom_focus.filter      = status:pending and +ACTIVE
+
+### contexts
+context.home = +@home or +@online
+context.work = +@work or +@online
+
+### user defined attribute brainpower (difficulty of tasks)
+uda.brainpower.type    = string
+uda.brainpower.label   = Brainpower
+uda.brainpower.values  = H,M,L
+uda.brainpower.default = M
+
+### overriding 'next' report
+report.next.description = Most urgent tasks
+report.next.columns     = id,start.age,entry.age,urgency,depends,priority,project,tags,recur,scheduled.countdown,due.remaining,until.remaining,description,brainpower
+report.next.filter      = status:pending and due.none: and +next
+report.next.labels      = ID,Active,Age,Urgency,Deps,P,Project,Tag,Recur,S,Due,Until,Description,Brainpower
+report.next.sort        = brainpower-,priority-,urgency-
+
+calendar.details=full
+taskd.certificate=\/home\/yigit\/.task\/yigit_sever.cert.pem
+taskd.key=\/home\/yigit\/.task\/yigit_sever.key.pem
+taskd.ca=\/home\/yigit\/.task\/ca.cert.pem
+taskd.server=yigitsever.bike:53589
+taskd.credentials=Public\/Yigit Sever\/d4682d9a-9895-4127-86af-8d2ffc6fffcd
+taskd.trust=ignore hostname
diff --git a/.xsession##desktop.Linux.Lowe b/.xsession##desktop.Linux.Lowe
index 5ca1fa9..f6f1fd9 100755
--- a/.xsession##desktop.Linux.Lowe
+++ b/.xsession##desktop.Linux.Lowe
@@ -24,7 +24,7 @@ xsettingsd &
 redshift-gtk &
 
 # utilities
-dropbox &
+nextcloud &
 copyq &
 conky --daemonize -c ~/.config/conky/conky.conf &
 conky --daemonize -c ~/.config/conky/task.conf &
@@ -32,3 +32,6 @@ unclutter --timeout 3 --jitter 3 -b &
 
 # keyboard with alt+shift us,tr switch, map escape to capslock
 setxkbmap -model pc105 -layout us,tr -option grp:alt_shift_toggle,caps:swapescape &
+
+# bind the local port to overseer
+ssh -N -f -L 127.0.0.1:53589:yigitsever.bike:53589 overseer
diff --git a/.zshrc b/.zshrc
index e84e3cb..88a059a 100644
--- a/.zshrc
+++ b/.zshrc
@@ -120,18 +120,13 @@ alias -g C='| xsel -b' # Copy to clipboard
 alias bc='bc -l'
 alias maas="expr $(cal | awk 'FNR>2{d+=NF}END{print d}') - $(date +%d)"
 alias gg="exit"
-alias ledger="ledger -f ~/Dropbox/ledger.dat"
-alias report="report -f ~/Dropbox/ledger.dat"
+alias ledger="ledger -f ~/Nextcloud/ledger.dat"
+alias report="report -f ~/Nextcloud/ledger.dat"
 
 RANGER_LOAD_DEFAULT_RC=FALSE; export RANGER_LOAD_DEFAULT_RC
 
 export GPG_TTY=$(tty)
 
-if [ "$hostname" != "Luchs" ]; then
-    PATH="$PATH:$(ruby -e 'print Gem.user_dir')/bin"
-    export GEM_HOME=$HOME/.gem
-fi
-
 # Getting Things Done & Taskwarrior Related
 alias in='task add +in' # Alias for tasks with in tag (in tray)
 alias inc='task +in +PENDING count'     # Reporting the number of in things
@@ -147,7 +142,7 @@ alias tick=tickle
 #think it over
 alias think='tickle +1d'
 
-alias lim='nvim /home/yigit/Dropbox/ledger.dat'
+alias lim='nvim /home/yigit/Nextcloud/ledger.dat'
 alias maybe='task due:someday list'
 alias music='mpv --no-vid'
 alias s="du -hs * | sort -rh | head -5"
@@ -158,3 +153,9 @@ alias tp='trash-put'
 [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
 
 export GOOGLE_APPLICATION_CREDENTIALS="/home/yigit/translation/DanNet-152c89acaeb0.json"
+
+PATH="/home/yigit/perl5/bin${PATH:+:${PATH}}"; export PATH;
+PERL5LIB="/home/yigit/perl5/lib/perl5${PERL5LIB:+:${PERL5LIB}}"; export PERL5LIB;
+PERL_LOCAL_LIB_ROOT="/home/yigit/perl5${PERL_LOCAL_LIB_ROOT:+:${PERL_LOCAL_LIB_ROOT}}"; export PERL_LOCAL_LIB_ROOT;
+PERL_MB_OPT="--install_base \"/home/yigit/perl5\""; export PERL_MB_OPT;
+PERL_MM_OPT="INSTALL_BASE=/home/yigit/perl5"; export PERL_MM_OPT;