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

11 files changed, 151 insertions, 108 deletions

diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc
index 523d3ba..7f72108 100755
--- a/.config/dunst/dunstrc
+++ b/.config/dunst/dunstrc
@@ -35,7 +35,7 @@ class = Dunst
 [shortcuts]
 close = ctrl+space
 close_all = ctrl+shift+space
-history = ctrl+grave
+history = ctrl+0
 context = ctrl+shift+period
 
 [urgency_low]
diff --git a/.config/i3/config##c.desktop,h.Maus b/.config/i3/config##c.desktop,h.Maus
index f169440..0fccdce 100644
--- a/.config/i3/config##c.desktop,h.Maus
+++ b/.config/i3/config##c.desktop,h.Maus
@@ -13,13 +13,15 @@ exec --no-startup-id xidlehook --not-when-fullscreen --not-when-audio --timer no
 
 #autostart
 exec --no-startup-id xsettingsd &
-exec --no-startup-id compton -b &
+exec --no-startup-id picom -b &
+exec --no-startup-id flashfocus &
 exec --no-startup-id nextcloud &
 exec --no-startup-id copyq &
 exec --no-startup-id redshift-gtk &
 exec --no-startup-id nm-applet &
 exec --no-startup-id xrandr --output DVI-D-0 --off --output HDMI-0 --mode 1920x1080 --pos 0x0 --rotate left --output DVI-I-1 --primary --mode 1920x1080 --pos 1132x608 --rotate normal --output DVI-I-0 --off --output DP-1 --off --output DP-0 --off &
 exec --no-startup-id xdotool key --clearmodifiers Num_Lock
+exec --no-startup-id udiskie --automount --file-manager thunar --tray --notify &
 
 # swap caps lock and escape, set keyboard layout
 exec --no-startup-id setxkbmap -model pc105 -layout tr,us -variant ,colemak -option grp:alt_shift_toggle,caps:backspace
@@ -34,7 +36,6 @@ exec --no-startup-id conky --daemonize -c ~/.config/conky/task.conf
 # set the wallpaper last (hopefully after xrandr)
 exec --no-startup-id ~/.fehbg
 
-exec_always --no-startup-id flashfocus
 
 # Font for window titles
 font pango:Lato 11
@@ -71,12 +72,21 @@ bindcode $mod+35 exec --no-startup-id "setxkbmap -model pc105 -layout us,us,tr -
 bindsym Print exec flameshot gui
 
 # media keys
-bindsym $mod+Up exec --no-startup-id "amixer set Master 2%+ && volnoti-show $(amixer get Master | grep -Po '[0-9]+(?=%)' | head -1)"
-bindsym $mod+Down exec --no-startup-id "amixer set Master 2%- && volnoti-show $(amixer get Master | grep -Po '[0-9]+(?=%)' | head -1)"
-bindsym $mod+m exec --no-startup-id "amixer set Master toggle && if amixer get Master | grep -Fq '[off]'; then volnoti-show -m; else volnoti-show $(amixer get Master | grep -Po '[0-9]+(?=%)' | head -1); fi"
-bindsym $mod+q exec --no-startup-id playerctl play-pause
-bindsym $mod+Left exec --no-startup-id playerctl previous
-bindsym $mod+Right exec --no-startup-id playerctl next
+bindsym XF86AudioRaiseVolume exec --no-startup-id "amixer set Master 2%+ && volnoti-show $(amixer get Master | grep -Po '[0-9]+(?=%)' | head -1)"
+bindsym XF86AudioLowerVolume exec --no-startup-id "amixer set Master 2%- && volnoti-show $(amixer get Master | grep -Po '[0-9]+(?=%)' | head -1)"
+bindsym XF86AudioMute exec --no-startup-id "amixer set Master toggle && if amixer get Master | grep -Fq '[off]'; then volnoti-show -m; else volnoti-show $(amixer get Master | grep -Po '[0-9]+(?=%)' | head -1); fi"
+bindsym XF86AudioPlay exec --no-startup-id playerctl play-pause
+bindsym XF86AudioPrev exec --no-startup-id playerctl previous
+bindsym XF86AudioNext exec --no-startup-id playerctl next
+bindsym XF86Tools exec --no-startup-id mpc toggle
+
+# # media keys
+# bindsym $mod+Up exec --no-startup-id "amixer set Master 2%+ && volnoti-show $(amixer get Master | grep -Po '[0-9]+(?=%)' | head -1)"
+# bindsym $mod+Down exec --no-startup-id "amixer set Master 2%- && volnoti-show $(amixer get Master | grep -Po '[0-9]+(?=%)' | head -1)"
+# bindsym $mod+m exec --no-startup-id "amixer set Master toggle && if amixer get Master | grep -Fq '[off]'; then volnoti-show -m; else volnoti-show $(amixer get Master | grep -Po '[0-9]+(?=%)' | head -1); fi"
+# bindsym $mod+q exec --no-startup-id playerctl play-pause
+# bindsym $mod+Left exec --no-startup-id playerctl previous
+# bindsym $mod+Right exec --no-startup-id playerctl next
 
 # Make the currently focused window a scratchpad
 bindsym $mod+Shift+minus move scratchpad
@@ -173,8 +183,8 @@ bindsym $mod+Shift+8 move container to workspace $ws8
 bindsym $mod+Shift+9 move container to workspace $ws9
 bindsym $mod+Shift+0 move container to workspace $ws10
 
-bindsym $mod+Shift+greater move container to output right
-bindsym $mod+Shift+less move container to output left
+bindsym $mod+z move container to output right
+# bindsym $mod+Shift+less move container to output left
 
 # reload the configuration file
 bindsym $mod+Shift+c reload
@@ -269,7 +279,7 @@ for_window [class="Zotero" instance="Toplevel" title="Progress"] floating enable
 assign [class="^Steam$"] 9
 assign [class="^Thunderbird$"] 8
 
-exec --no-startup-id i3-msg 'exec /usr/bin/firefox;move container to output right'
+# exec --no-startup-id i3-msg 'exec /usr/bin/firefox;move container to output right'
 
 # class                 border  backgr. text    indicator child_border
 client.focused          #458588 #285577 #ffffff #458588   #285577
@@ -284,3 +294,4 @@ client.background       #ffffff
 hide_edge_borders smart
 workspace_auto_back_and_forth yes
 focus_follows_mouse no
+mouse_warping none
diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
index 08a2ab7..7629b57 100644
--- a/.config/kitty/kitty.conf
+++ b/.config/kitty/kitty.conf
@@ -78,29 +78,30 @@ inactive_tab_font_style normal
 
 #: Color scheme {{{
 
-# Dark
-
-foreground #979eab
-background #282c34
-cursor #cccccc
-color0 #282c34
-color1 #e06c75
-color2 #98c379
-color3 #e5c07b
-color4 #61afef
-color5 #be5046
-color6 #56b6c2
-color7 #979eab
-color8 #393e48
-color9 #d19a66
-color10 #56b6c2
-color11 #e5c07b
-color12 #61afef
-color13 #be5046
-color14 #56b6c2
-color15 #abb2bf
-selection_foreground #282c34
-selection_background #979eab
+# moonfly
+# https://github.com/bluz71/vim-moonfly-colors/blob/master/terminal_themes/kitty-theme.conf
+
+background #080808
+foreground #b2b2b2
+cursor #9e9e9e
+color0 #373c40
+color1 #ff5454
+color2 #8cc85f
+color3 #e3c78a
+color4 #80a0ff
+color5 #d183e8
+color6 #7ee0ce
+color7 #de935f
+color8 #f09479
+color9 #f74782
+color10 #42cf89
+color11 #cfcfb0
+color12 #78c2ff
+color13 #ae81ff
+color14 #85dc85
+color15 #e2637f
+selection_background #b2ceee
+selection_foreground #080808
 
 #: }}}
 
diff --git a/.config/nvim/after/plugin/abolish.vim b/.config/nvim/after/plugin/abolish.vim
index e313ecb..a295819 100644
--- a/.config/nvim/after/plugin/abolish.vim
+++ b/.config/nvim/after/plugin/abolish.vim
@@ -12,3 +12,4 @@ iabbrev <silent> todaydatetime <C-R>=strftime("%F %T")<CR>
 iabbrev <silent> todaydate <C-R>=strftime("%F")<CR>
 iabbrev <silent> pwn English Princeton WordNet
 iabbrev <silent> omw Open Multilingual WordNet
+iabbrev <silent> BC blockchain
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index fb68190..36e62c0 100755
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -1,6 +1,9 @@
 "{{{ Plugs
 call plug#begin('~/.local/share/nvim/plugged')
 
+" latex " had to move vimtex to top to avoid a difficult error
+Plug 'lervag/vimtex'
+
 " completion
 Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
 Plug 'lionawurscht/deoplete-biblatex'
@@ -26,15 +29,16 @@ Plug 'tmsvg/pear-tree'
 Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
 Plug 'junegunn/fzf.vim'
 
-" tree explorer
+" tree explorer, i don't use this as much but don't like netrw either
 Plug 'scrooloose/nerdtree'
 " displays tags ordered by scope
 Plug 'majutsushi/tagbar'
 " status/tabline
-Plug 'bling/vim-airline'
+Plug 'vim-airline/vim-airline'
+Plug 'vim-airline/vim-airline-themes'
 
 " color theme of $CURRENT_YEAR
-Plug 'joshdick/onedark.vim'
+Plug 'bluz71/vim-moonfly-colors'
 
 " Personal wiki
 Plug 'vimwiki/vimwiki'
@@ -42,28 +46,24 @@ Plug 'vimwiki/vimwiki'
 Plug 'junegunn/goyo.vim'
 " highlights the current paragraph
 Plug 'junegunn/limelight.vim'
-" latex
-Plug 'lervag/vimtex'
 
-" text alignment
+" text alignment \w :Tab
 Plug 'godlygeek/tabular'
-" move selections up and down
+" move selections up and down with alt+[j,k]
 Plug 'matze/vim-move'
-" search/select/edit sandwiched textobjects
+" surround text objects; sa, sr and sd
 Plug 'machakann/vim-sandwich'
 " provide additional text objects
 Plug 'wellle/targets.vim'
-" indentation level text object
+" indentation level text object, ia, ii
 Plug 'michaeljsmith/vim-indent-object'
-" visual feedback for substitute
+" visual feedback for substitute holy shit this is amazing
 Plug 'markonm/traces.vim'
-" insert mode completions from tmux panes
-Plug 'wellle/tmux-complete.vim'
 " see the contents of registers on "/<CTRL-R>
 Plug 'junegunn/vim-peekaboo'
 " use <leader>k to highlight multiple words
 Plug 'lfv89/vim-interestingwords'
-" swap delimited items
+" swap delimited items using g>, g<
 Plug 'machakann/vim-swap'
 
 " reopen files at your last edit position
@@ -72,7 +72,7 @@ Plug 'farmergreg/vim-lastplace'
 Plug 'airblade/vim-gitgutter'
 " Conflict merger
 Plug 'christoomey/vim-conflicted'
-" jump to location by 2 characters
+" jump to location by 2 characters, `
 Plug 'justinmk/vim-sneak'
 
 " splits delete into cut and delete
@@ -102,7 +102,6 @@ Plug 'tpope/vim-dispatch'
 " fancy start screen
 Plug 'mhinz/vim-startify'
 Plug 'ryanoasis/vim-devicons' " asks to be placed last, sure
-
 call plug#end()            " required
 
 "}}}
@@ -122,6 +121,19 @@ autocmd VimResized * :wincmd =
 autocmd FileType markdown,tex setlocal spell
 "}}}
 
+" Functions {{{
+function! CreatePaper(citekey)
+    exe "e! " . fnameescape("~/Nextcloud/personal_wiki/papers/" . a:citekey . ".wiki")
+
+    let l:timestap="Report Created at: " . strftime("%c")
+    let l:text="= Came From =\n\n= Takeaways =\n\n= Might Go To =\n\n"
+
+    put! =l:timestap
+    put  =l:text
+
+endfunction
+" }}} Function "
+
 "{{{Misc Settings
 
 " Use deoplete.
@@ -182,19 +194,23 @@ if executable('rg')
     set grepprg=rg\ --vimgrep\ --no-heading\ --smart-case
 endif
 
-set diffopt+=internal,algorithm:patience
+set diffopt=algorithm:patience
 
 " }}}
 
 "{{{Look and Feel
-let g:onedark_terminal_italics=1
 set termguicolors
-colorscheme onedark
+colorscheme moonfly
+let g:moonflyUndercurls = 0
 
 " }}}
 
 "{{{ Mappings
 
+" If you like "Y" to work from the cursor to the end of line (which is more
+" logical, but not Vi-compatible)
+map Y y$
+
 " Open the TagBar Plugin <F3>
 nnoremap <silent> <F3> :TagbarToggle<CR>
 " Open NERDTree <F4>
@@ -230,8 +246,8 @@ nnoremap <C-l> <C-w>l
 
 " Disable highlight when <leader><cr> is pressed
 nnoremap <silent> <Leader><cr> :noh<cr>
-" Space will toggle folds!
-nnoremap <space> za
+" Space used to toggle folds, now it's x (because x is d)
+nnoremap <space> "_x
 
 " checkmarks on vimwiki
 nmap <Leader>v <Plug>VimwikiToggleListItem
@@ -287,7 +303,6 @@ let g:tagbar_width = 25
 
 "{{{ Airline
 let g:airline_powerline_fonts = 1
-let g:airline_theme='onedark'
 let g:airline#extensions#tabline#formatter = 'unique_tail'
 let g:airline#extensions#tabline#enabled = 1
 let g:airline_mode_map = {}
@@ -324,11 +339,12 @@ let g:ledger_fillstring = '   ~'
 
 "{{{ UltiSnips
 set runtimepath+=~/.vim/my-snippets/
-let g:UltiSnipsEditSplit="vertical"
-let g:UltiSnipsSnippetsDir=$HOME.'/.vim/my-snippets/UltiSnips'
+let g:UltiSnipsEditSplit = "vertical"
+let g:UltiSnipsSnippetsDir = $HOME.'/.vim/my-snippets/UltiSnips'
 
 " ctrl + l expands the snippet, c + j/k navigates placeholders
 let g:UltiSnipsExpandTrigger = "<C-l>"
+let g:UltiSnipsEnableSnipMate = "1"
 "}}}
 
 "{{{ vim-startify
@@ -368,10 +384,10 @@ let g:vimwiki_global_ext = 0
 "}}}
 
 " {{{ vimtex
-let g:vimtex_view_method = 'zathura'
+let g:vimtex_view_method='zathura'
 let g:tex_flavor='latex'
-let g:vimtex_quickfix_mode = 0
-let g:polyglot_disabled = ['latex', 'tex', 'ledger']
+let g:vimtex_quickfix_mode=0
+let g:polyglot_disabled=['latex', 'tex', 'ledger']
 " }}}
 
 " {{{ Gutentags
diff --git a/.config/nvim/spell/en.utf-8.add b/.config/nvim/spell/en.utf-8.add
index 33ac00d..c78ddf8 100644
--- a/.config/nvim/spell/en.utf-8.add
+++ b/.config/nvim/spell/en.utf-8.add
@@ -43,3 +43,5 @@ unsecure
 replaceability
 Kerberos
 IoT
+Blockchain
+blockchain
diff --git a/.config/compton/compton.conf b/.config/picom/picom.conf
index 357f978..5d4b9ce 100644
--- a/.config/compton/compton.conf
+++ b/.config/picom/picom.conf
@@ -4,7 +4,7 @@ shadow-radius = 0;
 shadow-offset-x = 5;
 shadow-offset-y = 5;
 log-level = "warn";
-# log-file = "/path/to/your/log/file";
+# log-file = "~/.picom.log";
 shadow-opacity = 0.8;
 #shadow-red = 0.33;
 #shadow-green = 0.33;
@@ -62,8 +62,8 @@ mark-ovredir-focused = true;
 detect-rounded-corners = true;
 detect-client-opacity = true;
 refresh-rate = 0;
-vsync = "opengl-swc";
-paint-on-overlay = true;
+vsync = true;
+# paint-on-overlay = true;
 sw-opti = false;
 # unredir-if-possible = true;
 # unredir-if-possible-delay = 5000;
@@ -77,7 +77,7 @@ invert-color-include = [ ];
 # GLX backend
 glx-no-stencil = true;
 glx-copy-from-front = false;
-glx-swap-method = "undefined";
+use-damage = true
 # glx-no-rebind-pixmap = true;
 # glx-swap-method = "undefined";
 # glx-use-gpushader4 = true;
diff --git a/.config/polybar/config##c.desktop,h.Maus b/.config/polybar/config##c.desktop,h.Maus
index d074d43..eca6920 100644
--- a/.config/polybar/config##c.desktop,h.Maus
+++ b/.config/polybar/config##c.desktop,h.Maus
@@ -48,20 +48,24 @@ border-bottom-color = ${colors.background}
 padding = 2
 module-margin = 1
 
-font-0 = Cozette:antialias=false;2
+font-0 = scientifica:antialias=false;1
 font-1 = Lato:size=10;1
 font-2 = Raleway:size=10;1
 font-3 = FuraCode Nerd Font:size=12;2
 
-modules-left = i3 pulseaudio-control spotify
+modules-left = i3 pulseaudio-control spotify mpd
 modules-center = xwindow
-modules-right = focus date time xkeyboard
+modules-right = cpu focus date time xkeyboard
 
 tray-position = right
 
+[module/cpu]
+type = internal/cpu
+
 [module/focus]
 type = custom/script
 exec = ~/.config/polybar/focus
+double-click-left = exec ~/.config/polybar/stop &
 interval = 10
 
 [module/spotify]
@@ -76,22 +80,20 @@ format-padding = 0
 exec = python /home/yigit/.config/polybar/spotify_status.py -f '{play_pause} {artist} - {song}' -p ' , '
 ;契
 
-; [module/mpd]
-; type = internal/mpd
-; host = 127.0.0.1
-; port = 6600
+[module/mpd]
+type = internal/mpd
 
-; format-online = <toggle> <label-song> <icon-random>
-; label-song = %artist% - %title%
-; icon-pause = 
-; icon-play = 
-; icon-random = 咽
+format-online = <toggle> <label-song> <icon-random>
+label-song = %artist% - %title%
+icon-pause = 
+icon-play = 
+icon-random = 咽
 
-; toggle-on-foreground = ${colors.background_modules}
-; toggle-off-foreground = ${colors.foreground_modules}
+toggle-on-foreground = ${colors.background_modules}
+toggle-off-foreground = ${colors.foreground_modules}
 
-; format-offline = <label-offline>
-; label-offline = mpd is offline
+format-offline = <label-offline>
+label-offline = mpd is offline
 
 [module/xwindow]
 type = internal/xwindow
@@ -100,7 +102,6 @@ label = %title:0:70:...%
 
 y-offset = 10
 label-padding = 1
-label-font = 1
 
 label-empty = 
 label-empty-font = 3
diff --git a/.config/polybar/focus b/.config/polybar/focus
index fdf2f30..f375cc3 100755
--- a/.config/polybar/focus
+++ b/.config/polybar/focus
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 # shows active taskwarrior task on polybar
-#Copyright © 2019 yourname
+#Copyright © 2019 yigit
 
 #This program is free software: you can redistribute it and/or modify
 #it under the terms of the GNU General Public License as published by
diff --git a/.config/polybar/pulseaudio-control.sh b/.config/polybar/pulseaudio-control.sh
index a080d65..51247fd 100755
--- a/.config/polybar/pulseaudio-control.sh
+++ b/.config/polybar/pulseaudio-control.sh
@@ -14,7 +14,7 @@ VOLUME_ICONS=( " " " " " " )  # Volume icons array, from lower volume t
 MUTED_ICON=" "  # Muted volume icon
 MUTED_COLOR="%{F#A9AA83}"  # Color when the audio is muted
 DEFAULT_SINK_ICON=""  # The default sink icon if a custom one isn't found
-CUSTOM_SINK_ICONS=("" "���" "���")  # Custom sink icons in index of sink order
+CUSTOM_SINK_ICONS=("" "���" "���")  # Custom sink icons in index of sink order
 NOTIFICATIONS="yes"  # Notifications when switching sinks if enabled
 SINK_BLACKLIST=(  )  # Index blacklist for sinks when switching between them
 
diff --git a/.config/zathura/zathurarc b/.config/zathura/zathurarc
index 58b466d..a0759f3 100644
--- a/.config/zathura/zathurarc
+++ b/.config/zathura/zathurarc
@@ -1,37 +1,48 @@
-set selection-clipboard       clipboard
-set incremental-search        "true"
+set selection-clipboard "clipboard"
+set incremental-search "true"
+set guioptions "shv"
 
-set default-bg                "#282c34"
-set default-fg                "#353b45"
+set default-fg "#9e9e9e"
+set default-bg "#0e0e0e"
 
-set statusbar-fg              "#c8ccd4"
-set statusbar-bg              "#3e4451"
+set recolor-darkcolor "#b2b2b2"
+set recolor-lightcolor "#080808"
 
-set inputbar-bg               "#282c34"
-set inputbar-fg               "#c8ccd4"
+set statusbar-fg "#b2b2b2"
+set statusbar-bg "#080808"
 
-set notification-bg           "#282c34"
-set notification-fg           "#c8ccd4"
+set inputbar-fg "#9e9e9e"
+set inputbar-bg "#080808"
 
-set notification-error-bg     "#282c34"
-set notification-error-fg     "#e06c75"
+set notification-fg "#c8ccd4"
+set notification-bg "#282c34"
 
-set notification-warning-bg   "#282c34"
-set notification-warning-fg   "#e06c75"
+set notification-error-fg "#ff5454"
+set notification-error-bg "#080808"
 
-set highlight-color           "#e5c07b"
-set highlight-active-color    "#61afef"
+set notification-warning-fg "#e3c78a"
+set notification-warning-bg "#080808"
 
-set completion-bg             "#353b45"
-set completion-fg             "#61afef"
+set highlight-color "#e5c07b"
+set highlight-active-color "#ff5454"
 
-set completion-highlight-fg   "#c8ccd4"
-set completion-highlight-bg   "#61afef"
+set completion-fg "#80a0ff"
+set completion-bg "#080808"
 
-set recolor-lightcolor        "#282c34"
-set recolor-darkcolor         "#b6bdca"
+set completion-highlight-fg "#080808"
+set completion-highlight-bg "#80a0ff"
 
-set recolor                   "true"
-set recolor-keephue           "false"
+set tabbar-fg "#f74782"
+set tabbar-bg "#080808"
+
+set index-fg "#9e9e9e"
+set index-bg "#080808"
+set index-active-fg "#080808"
+set index-active-bg "#8cc85f"
+
+set recolor "true"
+set recolor-keephue "false"
+set synctex "true"
+set syntex-editor-command "nvr --remote +%line %file""
 
 map <C-s> feedkeys ":write /home/yigit/Downloads/toPrint/toPrint_staging<Return>"