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

4 files changed, 69 insertions, 51 deletions

diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc
index e1d2052..523d3ba 100755
--- a/.config/dunst/dunstrc
+++ b/.config/dunst/dunstrc
@@ -57,3 +57,7 @@ timeout = 0
 [Spotify]
 appname = Spotify
 format = "<b>Now Playing</b>\n%s\n%b"
+
+[spliff]
+appname = "spliff"
+format = "<b>ready for printing</b>\n%s\n%b"
diff --git a/.config/i3/config##c.desktop,h.Lowe b/.config/i3/config##c.desktop,h.Lowe
index 30692e1..2e5a8c4 100644
--- a/.config/i3/config##c.desktop,h.Lowe
+++ b/.config/i3/config##c.desktop,h.Lowe
@@ -8,6 +8,9 @@ set $alt Mod1
 # launch polybar
 exec --no-startup-id $HOME/.config/polybar/launch.sh &
 
+# launch spliffer + notification
+exec --no-startup-id $HOME/bin/watch_incoming.sh
+
 # start the screensaver, '' at the end is not a typo
 exec --no-startup-id xidlehook --not-when-fullscreen --not-when-audio --timer normal 300 'betterlockscreen -l dimblur -t "Welcome Back"' ''
 
@@ -105,11 +108,14 @@ bindsym $mod+e layout toggle split
 # toggle tiling / floating
 bindsym $mod+Shift+space floating toggle
 
+# toggle sticky floating window
+bindsym $mod+a sticky toggle
+
 # change focus between tiling / floating windows
 bindsym $mod+space focus mode_toggle
 
 # focus the parent container
-bindsym $mod+a focus parent
+# bindsym $mod+a focus parent
 
 # Define names for default workspaces for which we configure key bindings later on.
 # We use variables to avoid repeating the names in multiple places.
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index fab8f58..9d52e0c 100755
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -1,100 +1,102 @@
 "{{{ Plugs
 call plug#begin('~/.local/share/nvim/plugged')
 
-"completion
+" completion
 Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
 Plug 'lionawurscht/deoplete-biblatex'
 Plug 'deoplete-plugins/deoplete-jedi'
 
 " ledger
 Plug 'ledger/vim-ledger'
-"language packs
+" language packs
 Plug 'sheerun/vim-polyglot'
-"syntax checking
+" syntax checking
 Plug 'dense-analysis/ale'
-"manages tag files
+" manages tag files
 Plug 'ludovicchabant/vim-gutentags'
-"run your tests
-Plug 'janko/vim-test'
-" latex
-Plug 'lervag/vimtex'
+" run your tests
+" Plug 'janko/vim-test' " TODO benched for now but should be useful later
+" open a floating terminal
+Plug 'voldikss/vim-floaterm'
 
-"snippet solution
+" snippets to expand
 Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets'
-"autopair plugin
+" autopair plugin
 Plug 'tmsvg/pear-tree'
-"colored brackets
-Plug 'luochen1990/rainbow'
 
 " Plugin outside ~/.vim/plugged with post-update hook
 Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
 Plug 'junegunn/fzf.vim'
 
-"tree explorer
-Plug 'scrooloose/nerdtree'
-"displays tags ordered by scope
+" tree explorer
+" Plug 'scrooloose/nerdtree' TODO benched for now, use netrw
+" displays tags ordered by scope
 Plug 'majutsushi/tagbar'
-"status/tabline
+" status/tabline
 Plug 'bling/vim-airline'
+" floating terminal
+Plug 'voldikss/vim-floaterm'
 
-" " color theme
+" color theme of $CURRENT_YEAR
 Plug 'joshdick/onedark.vim'
 
-"Personal wiki
+" Personal wiki
 Plug 'vimwiki/vimwiki'
-"distraction-free writing
+" centers the writing
 Plug 'junegunn/goyo.vim'
+" highlights the current parapraph
 Plug 'junegunn/limelight.vim'
+" latex
+Plug 'lervag/vimtex'
 
-"text alignment
+" text alignment
 Plug 'godlygeek/tabular'
-"color code highlight
-Plug 'chrisbra/Colorizer'
-"move selections up and down
+" color code highlight
+" Plug 'chrisbra/Colorizer' " TODO benched for now, can't remember the last
+" time this was useful
+" move selections up and down
 Plug 'matze/vim-move'
-" search/select/edit sandwiched textobjects (vim-surround)
+" search/select/edit sandwiched textobjects
 Plug 'machakann/vim-sandwich'
 " provide additional text objects
 Plug 'wellle/targets.vim'
 " indentation level text object
 Plug 'michaeljsmith/vim-indent-object'
-" undo history visualizer
-Plug 'mbbill/undotree'
 
-"reopen files at your last edit position
+" reopen files at your last edit position
 Plug 'farmergreg/vim-lastplace'
-"toggle, display and navigate marks
-Plug 'kshenoy/vim-signature'
-"git diff in the sign column
+" toggle, display and navigate marks
+" Plug 'kshenoy/vim-signature' TODO benched for now, never used
+" git diff in the sign column
 Plug 'airblade/vim-gitgutter'
-"jump to location by 2 characters
+" jump to location by 2 characters
 Plug 'justinmk/vim-sneak'
 
-"splits delete into cut and delete
+" splits delete into cut and delete
 Plug 'svermeulen/vim-cutlass'
-"change text with yank
+" change text with yank
 Plug 'svermeulen/vim-subversive'
-"yank history
+" yank history
 Plug 'svermeulen/vim-yoink'
 
-"enable repeating supported plugin maps with '.'
+" enable repeating supported plugin maps with '.'
 Plug 'tpope/vim-repeat'
-"pairs of handy bracket mappings
+" pairs of handy bracket mappings
 Plug 'tpope/vim-unimpaired'
-"git wrapper
+" git wrapper
 Plug 'tpope/vim-fugitive'
-"increment dates, times & more
+" increment dates, times & more
 Plug 'tpope/vim-speeddating'
-"search, substitute and abbreviate
+" search, substitute and abbreviate
 Plug 'tpope/vim-abolish'
-"provides ga, show unicode stuff of char under cursor
+" provides ga, show unicode stuff of char under cursor
 Plug 'tpope/vim-characterize'
-"comment helper
+" comment helper
 Plug 'tpope/vim-commentary'
-"asynchronous build and test dispatcher
+" asynchronous build and test dispatcher
 Plug 'tpope/vim-dispatch'
 
-"fancy start screen
+" fancy start screen
 Plug 'mhinz/vim-startify'
 Plug 'ryanoasis/vim-devicons' " asks to be placed last, sure
 
@@ -112,6 +114,9 @@ autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isT
 " Resize all windows proportionally when the terminal is resized
 " let terminal resize scale the internal windows
 autocmd VimResized * :wincmd =
+
+" Set spell for prose
+autocmd FileType markdown,tex setlocal spell
 "}}}
 
 "{{{Misc Settings
@@ -152,6 +157,8 @@ set splitbelow " new split panes will split to below and right
 set splitright
 set cursorline
 
+set thesaurus+=~/.local/share/thesaurus.txt
+
 " persistent undo
 set undodir=~/.vim/undodir
 set undofile
@@ -185,7 +192,8 @@ colorscheme onedark
 " Open the TagBar Plugin <F3>
 nnoremap <silent> <F3> :TagbarToggle<CR>
 " Open NERDTree <F4>
-nnoremap <silent> <F4> :NERDTreeToggle<CR>
+" nnoremap <silent> <F4> :NERDTreeToggle<CR>
+let g:floaterm_keymap_toggle = '<F4>'
 " Fix whole buffer via ALE
 nmap <F9> <Plug>(ale_fix)
 
diff --git a/.config/polybar/focus b/.config/polybar/focus
index 8eeb92a..17c9862 100755
--- a/.config/polybar/focus
+++ b/.config/polybar/focus
@@ -34,10 +34,10 @@ $active_task_maybe =~ s/^\s+|\s+$//g;
 my @lines = split /\n/, $active_task_maybe;
 
 my $task = $lines[2];
-$task =~ s/^\s+|\s+$//g;
-$task =~ s/\s+/ /g;
+$task =~ s/^\s+|\s+$//g;  # left and right trim
+$task =~ s/\s+/ /g;  # reduce multiple whitespace into one
 
-# if ($task =~ m/.*?next (.*)$/) {
-#     print "$1";
-# }
-print $task;
+if ($task =~ m/^(.*)?\s(\d+\w+)$/g) {
+    print "$1 | $2";
+}
+# print $task;