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

7 files changed, 18 insertions, 27 deletions

diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 2bb1324..5d415ce 100755
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -1,5 +1,4 @@
 "{{{ Plugs
-
 call plug#begin('~/.local/share/nvim/plugged')
 
 "A code-completion engine for Vim
@@ -104,18 +103,10 @@ autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isT
 "{{{Misc Settings
 
 let g:ycm_global_ycm_extra_conf = '~/.ycm_extra_conf.py'
-" necesary  for lots of cool vim things
-set nocompatible
-" See below
-" https://stackoverflow.com/a/33380495
-if !exists("g:syntax_on")
-    syntax enable
-endif
-set grepprg=grep\ -nH\ $* " DONT KNOW WHAT THIS DOES
+
 " Tab stuff
 set autoindent
 set expandtab " Use appropriate number of spaces to insert a <Tab>
-set smarttab
 set shiftwidth=4
 set softtabstop=4
 set tabstop=8
@@ -123,19 +114,12 @@ set tabstop=8
 set spell spelllang=en_us
 set nospell
 " Cool tab completion stuff
-set wildmenu
 set wildmode=list:longest,full
 set wildignore=*.o,*.obj,*.class
-set encoding=utf-8
 set scrolloff=4 " Keep n lines above/below cursor
 set mouse=c
-set backspace=2 " make backspace work like most other programs
 set number " line numbers
-set history=1000 " number of lines that are remembered
-set showcmd " this shows what you are typing as a command.  I love this!
 set foldmethod=marker " folding stuffs
-set incsearch " search as you type (before <CR>)
-set hlsearch " highlight things that we find with the search
 set nohidden " when i close a tab, remove the buffer
 set title " set terminal title
 set showmatch " jump to the matching bracket briefly, REMOVE AFTER TESTING
@@ -157,9 +141,6 @@ set cinoptions=l1
 "{{{Look and Feel
 
 set termguicolors
-
-set background=dark    " Setting dark mode
-
 "highlight NormalNC guibg='Black'
 
 let g:nord_underline = 1
@@ -407,5 +388,6 @@ nnoremap X D
 
 " {{{ vimtex
 let g:vimtex_view_method = 'zathura'
+let g:vimtex_syntax_enabled = 0
 
 " }}}
diff --git a/.config/polybar/config##desktop.Linux.Lowe b/.config/polybar/config##desktop.Linux.Lowe
index 7e96a22..5b0c3c0 100644
--- a/.config/polybar/config##desktop.Linux.Lowe
+++ b/.config/polybar/config##desktop.Linux.Lowe
@@ -69,7 +69,7 @@ host = 127.0.0.1
 port = 6600
 
 format-online = <toggle> <label-song> <icon-random>
-label-song = %artist% - %title%
+label-song = %artist:0:24:...% - %title:0:24:...%
 icon-pause = 
 icon-play = 
 icon-random = 咽
diff --git a/.config/polybar/focus b/.config/polybar/focus
index 0cccea4..8eeb92a 100755
--- a/.config/polybar/focus
+++ b/.config/polybar/focus
@@ -19,9 +19,9 @@ use strict;
 use warnings;
 use IO::CaptureOutput qw/capture_exec/;
 
-my ($stdout, $stderr, $success, $exit_code) = capture_exec("task active");
+my ($stdout, $stderr, $success, $exit_code) = capture_exec("task custom_focus");
 
-#print("out: $stdout\nerr: $stderr\nexit_code: $exit_code\n");
+# print("out: $stdout\nerr: $stderr\nexit_code: $exit_code\n");
 
 if ($stderr =~ /No matches\./) {
     system 'echo "What a beautiful day"';
@@ -37,6 +37,7 @@ my $task = $lines[2];
 $task =~ s/^\s+|\s+$//g;
 $task =~ s/\s+/ /g;
 
-if ($task =~ m/.*?next (.*)$/) {
-    print "$1";
-}
+# if ($task =~ m/.*?next (.*)$/) {
+#     print "$1";
+# }
+print $task;
diff --git a/.config/rofi/onedark.rasi b/.config/rofi/onedark.rasi
index 2902fcb..9680d32 100644
--- a/.config/rofi/onedark.rasi
+++ b/.config/rofi/onedark.rasi
@@ -9,7 +9,7 @@
  */
 
 configuration {
-    display-drun:    "act";
+    display-drun:    "drun";
     display-run:     "run";
     display-window:  "win";
     show-icons:      true;
diff --git a/.cvsignore b/.cvsignore
new file mode 100644
index 0000000..6e92f57
--- /dev/null
+++ b/.cvsignore
@@ -0,0 +1 @@
+tags
diff --git a/.gitconfig b/.gitconfig
index ae74399..16c1e83 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -6,6 +6,7 @@
     autocrlf = input
     safecrlf = true
     pager = diff-so-fancy | less --tabs=4 -RFX
+        excludesfile = ~/.cvsignore
 [alias]
     co = checkout
     ci = commit
diff --git a/.taskrc b/.taskrc
index c7a4112..f86bb63 100644
--- a/.taskrc
+++ b/.taskrc
@@ -58,6 +58,12 @@ 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