updates

2020-05-19 14:38:04 +02:00
parent 366b20f705
commit 5f9662158c
10 changed files with 126 additions and 73 deletions
@@ -0,0 +1 @@
+thefuck --alias | source
@@ -8,7 +8,7 @@ set $mod Mod4
 # workspace_layout tabbed <stacking|tabbed>

 # Configure border style <normal|1pixel|pixel xx|none|pixel>
-default_border pixel 1
+default_border pixel 3
 default_floating_border normal

 # Hide borders
@@ -19,6 +19,11 @@ bindsym $mod+u border none
 bindsym $mod+y border pixel 1
 bindsym $mod+n border normal

+# configure some stuff
+focus_follows_mouse no
+mouse_warping none
+workspace_auto_back_and_forth no
+
 # Font for window titles. Will also be used by the bar unless a different font
 # is used in the bar {} block below.
 # font xft:URWGothic-Book 11
@@ -34,7 +39,10 @@ bindsym $mod+Return exec terminal
 bindsym $mod+Shift+q kill

 # start program launcher
-bindsym $mod+d exec --no-startup-id dmenu_recency
+# bindsym $mod+d exec --no-startup-id dmenu_recency
+bindsym $mod+d exec --no-startup-id rofi -show run
+#-lines 10 -eh 2 -width 30 -padding 800
+

 # launch categorized menu
 bindsym $mod+z exec --no-startup-id morc_menu
@@ -64,18 +72,14 @@ bindsym $mod+Ctrl+b exec terminal -e 'bmenu'
 bindsym $mod+F2 exec chromium
 bindsym $mod+F3 exec thunar
 bindsym $mod+Shift+F3 exec terminal -e 'ranger'
-bindsym $mod+F5 exec terminal -e 'mocp'
-bindsym $mod++Shift+F5 exec terminal -e 'ncspot'
+bindsym $mod+F4 exec terminal -e 'mocp'
+bindsym $mod++Shift+F4 exec terminal -e 'ncspot'
 bindsym $mod+t exec --no-startup-id pkill picom
 bindsym $mod+Shift+t exec --no-startup-id picom -b
 bindsym $mod+Shift+d --release exec "killall dunst; exec notify-send 'restart dunst'"
-bindsym F12 exec --no-startup-id i3-scrot
-bindsym $mod+F12 --release exec --no-startup-id i3-scrot -w
-bindsym $mod+Shift+F12 --release exec --no-startup-id i3-scrot -s
+bindsym $mod+F12 --release exec --no-startup-id i3-scrot -s
 bindsym $mod+Ctrl+x --release exec --no-startup-id xkill

-# focus_follows_mouse no
-
 # change focus
 bindsym $mod+h focus left
 bindsym $mod+j focus down
@@ -93,9 +97,12 @@ bindsym $mod+Shift+h move left
 bindsym $mod+Shift+j move down
 bindsym $mod+Shift+k move up
 bindsym $mod+Shift+l move right
+bindsym $mod+Shift+left move left
+bindsym $mod+Shift+down move down
+bindsym $mod+Shift+up move up
+bindsym $mod+Shift+right move right

 # workspace back and forth (with/without active container)
-workspace_auto_back_and_forth yes
 bindsym $mod+b workspace back_and_forth
 bindsym $mod+Shift+b move container to workspace back_and_forth; workspace back_and_forth

@@ -271,24 +278,23 @@ bindsym $mod+9 exec --no-startup-id blurlock

 # Autostart applications
 exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
-exec --no-startup-id nitrogen --random ~/Wallpapers/; sleep 1; picom -b
-#exec --no-startup-id manjaro-hello
 exec --no-startup-id nm-applet
+exec --no-startup-id nitrogen --restore
 exec --no-startup-id xfce4-power-manager
 exec --no-startup-id pamac-tray
 exec --no-startup-id clipit
-# exec --no-startup-id blueman-applet
-# exec_always --no-startup-id sbxkb
-exec --no-startup-id start_conky_maia
-# exec --no-startup-id start_conky_green
+exec --no-startup-id start_conky_live_green
 exec --no-startup-id xautolock -time 10 -locker blurlock
+exec_always --no-startup-id sbxkb
 exec_always --no-startup-id ff-theme-util
 exec_always --no-startup-id fix_xcursor
+exec --no-startup-id xrandr --output HDMI-0 --primary --output DP-0 --rotate left --right-of HDMI-0 --output DP-2 --rotate left --left-of HDMI-0

 # HB STARTUP ADDITIONS
+bindsym Shift+Pause exec --no-startup-id setxkbmap -option "caps:escape"
+bindsym Shift+Scroll_Lock exec --no-startup-id setxkbmap -option
 exec --no-startup-id setxkbmap -option "caps:escape"
 exec --no-startup-id redshift-gtk
-exec --no-startup-id megasync &
 exec --no-startup-id dropbox start &
 exec --no-startup-id nvidia-settings -a GPUFanControlState=1 -a GPUTargetFanSpeed=60

@@ -331,6 +337,7 @@ bar {
 	position bottom

 ## please set your primary output first. Example: 'xrandr --output eDP1 --primary'
+
 #	tray_output primary
 #	tray_output eDP1

@@ -280,7 +280,8 @@ c.ConsoleWidget.include_other_output = True

 ## If not empty, use this Pygments style for syntax highlighting. Otherwise, the
 #  style sheet is queried for Pygments style information.
-#c.JupyterWidget.syntax_style = ''
+c.JupyterWidget.syntax_style = 'monokai'
+# monokai, fruity, native, paraiso-dark, rrt, solarized-dark, stata-dark, vim

 #------------------------------------------------------------------------------
 # KernelManager(ConnectionFileMixin) configuration
@@ -3,27 +3,23 @@
  * `yay megasync`
  * `yay onedrive-abraunegg`
  * `yay dropbox`
-* nvidia
-  * `sudo pacman -S cuda`
-  * `yay nvidia-vulkan`
-* applications
-  * `sudo pacman -S npm nodejs`
-  * `sudo pacman -S ninja the_silver_searcher`
-  * `sudo pacman -S zathura-pdf-mupdf redshift yay trash-cli`
-  * `yay ncspot-git`
-* code
-  * `sudo pacman -S neovim powerline tmux diff-so-fancy ttf-inconsolata`
-* gaming
-  * `sudo pacman -S steam-manjaro steam-native`
+* applications `sudo pacman -S npm nodejs ninja zathura-pdf-mupdf redshift yay trash-cli conky-manager feh pv fancontrol-gui thefuck ncdu`
+* spotify `yay ncspot-git`
+* code `sudo pacman -S neovim tig powerline the_silver_searcher tmux diff-so-fancy ttf-inconsolata`
+* gaming `sudo pacman -S steam-manjaro steam-native`
 * ssh setup
  * enable SSH `sudo systemctl enable --now sshd.service`
  * enable X11 forwarding in `/etc/ssh/sshd_config`
 * set shell to 'fish' via `bmenu`
 * replace caps with esc `setxkbmap -option 'caps:escape`
+* nvidia
+  * `sudo pacman -S cuda`
+  * `yay nvidia-vulkan`

 # python
 * `pip install --pre torch torchvision -f https://download.pytorch.org/whl/nightly/cu101/torch_nightly.html`
 * `pip install nodejs plotly flake8 numpy scipy sympy matplotlib seaborn pytorch-lightning ggplot ptvsd tensorboard torchtext ipython matplotlib-label-lines ipympl pytest qbstyles`
+* `jupyter nbextension enable --py widgetsnbextension`

 # enable services
 * `systemctl enable --user onedrive --now`
@@ -56,7 +56,7 @@ toggle_read_tags        = T
 toggle_shuffle          = S
 toggle_repeat           = R
 toggle_auto_next        = X
-toggle_menu             = ^W
+toggle_menu             = TAB
 toggle_layout           = ^l
 add_file                = a
 add_directory           = A
@@ -16,7 +16,6 @@ Plug 'junegunn/fzf.vim'
 Plug 'sheerun/vim-polyglot'           " language syntax
 Plug 'godlygeek/tabular'              " help aligning text on tabs
 Plug 'tpope/vim-fugitive'
-Plug 'jupyter-vim/jupyter-vim'
 " markdown
 Plug 'iamcco/markdown-preview.nvim', { 'do': { -> mkdp#util#install() } }
 Plug 'plasticboy/vim-markdown'        " markdown helper.
@@ -212,13 +211,13 @@ imap <silent><expr> <TAB>
 imap <expr><S-Tab> pumvisible() ? "\<C-p>" : "\<C-h>"
 imap <silent><expr> <C-space> coc#refresh()
 " coc helpers
-nmap <silent> gP <Plug>(coc-diagnostic-prev)
-nmap <silent> gp <Plug>(coc-diagnostic-next)
-nmap <silent> gd <Plug>(coc-definition)
-nmap <silent> gy <Plug>(coc-type-definition)
-nmap <silent> gi <Plug>(coc-implementation)
-nmap <silent> gr <Plug>(coc-references)
-nmap <silent> gR <Plug>(coc-refactor)
+nmap gP <Plug>(coc-diagnostic-prev)
+nmap gp <Plug>(coc-diagnostic-next)
+nmap gd <Plug>(coc-definition)
+nmap gy <Plug>(coc-type-definition)
+nmap gi <Plug>(coc-implementation)
+nmap gr <Plug>(coc-references)
+nmap gR <Plug>(coc-refactor)
 " coc git
 nmap <leader>gn <Plug>(coc-git-nextchunk)
 nmap <leader>gp <Plug>(coc-git-prevchunk)
@@ -275,21 +274,6 @@ map <leader>T :BuffergatorTabsClose<cr>
 nmap <leader>j :BuffergatorMruCyclePrev<cr>
 nmap <leader>k :BuffergatorMruCycleNext<cr>

-" jupyter-vim
-let g:jupyter_mapkeys = 0
-" Send a selection of lines
-nmap <buffer> <silent> <leader>qR :JupyterRunFile<CR>
-nmap <buffer> <silent> <leader>qQ :JupyterSendCell<CR>
-nmap <buffer> <silent> <leader>qq <Plug>JupyterRunTextObj
-vmap <buffer> <silent> <leader>qq <Plug>JupyterRunVisual
-" nmap <buffer> <silent> <leader>qr :JupyterSendRange<CR>
-" other
-nmap <buffer> <silent> <leader>qc :JupyterConnect<cr>
-nmap <buffer> <silent> <leader>qi :PythonImportThisFile<CR>
-nmap <buffer> <silent> <leader>qu :JupyterUpdateShell<CR>
-nmap <buffer> <silent> <leader>qb :PythonSetBreak<CR>
-nmap <buffer> <silent> <leader>qd :JupyterCd %:p:h<CR>
-
 " -----------------------------------------------------------------------------
 " plugin config
 " -----------------------------------------------------------------------------
@@ -351,28 +335,13 @@ let g:mkdp_auto_start=0             " auto start on moving into
 let g:mkdp_auto_close=0             " auto close on moving away
 let g:mkdp_open_to_the_world=0      " available to others
 let g:mkdp_open_ip=''               " use custom IP to open preview page
-let g:mkdp_port=''                  " use a custom port to start server or random for empty
-let g:mkdp_browser='google-chrome'  " specify browser to open preview page
-let g:mkdp_markdown_css=''          " use a custom markdown style must be absolute path
-let g:mkdp_highlight_css=''         " use a custom highlight style must absolute path
 let g:mkdp_preview_options={
-    \ 'mkit': {},
-    \ 'katex': {},
-    \ 'uml': {},
-    \ 'maid': {},
    \ 'disable_sync_scroll': 0,
    \ 'sync_scroll_type': 'middle',
    \ 'hide_yaml_meta': 1
    \ }
-" mkit: markdown-it options for render
-" katex: katex options for math
-" uml: markdown-it-plantuml options
-" maid: mermaid options
 " disable_sync_scroll: if disable sync scroll, default 0
-" sync_scroll_type: 'middle', 'top' or 'relative', default value is 'middle'
-"   middle: mean the cursor position alway show at the middle of the preview page
-"   top: mean the vim top viewport alway show at the top of the preview page
-"   relative: mean the cursor position alway show at the relative positon of the preview page
+" sync_scroll_type: 'middle', 'top' or 'relative'
 " hide_yaml_meta: if hide yaml metadata, default is 1

 " peekaboo
@@ -8,7 +8,7 @@
 sync_dir = "/mnt/storage/Onedrive"
 # skip_file = "~*|.~*|*.tmp"
 # monitor_interval = "45"
-skip_dir = "Videos"
+# skip_dir = "Videos"
 # log_dir = "/var/log/onedrive/"
 # drive_id = ""
 # upload_only = "false"
@@ -267,7 +267,7 @@ map !  console shell%space
 map @  console -p6 shell  %%s
 map #  console shell -p%space
 map s  console shell%space
-map r  chain draw_possible_programs; console open_with%%space
+map r  chain draw_possible_programs; console open_with%space
 #map f  console find%space
 map f console scout -ftsea%space
 map cd console cd%space
@@ -310,7 +310,7 @@ map <END>      move to=-1
 map <PAGEDOWN> move down=1   pages=True
 map <PAGEUP>   move up=1     pages=True
 map <CR>       move right=1
-map <DELETE>   console delete
+map <DELETE>   shell -s trash-put %s
 map <INSERT>   console touch%space

 # VIM-like
@@ -379,6 +379,7 @@ map pht paste_hardlinked_subtree
 map pr paste_as_root

 map dD console delete
+map dT shell -s trash-put %s

 map dd cut
 map ud uncut
@@ -3,6 +3,8 @@ export EDITOR=/usr/bin/nvim
 export BROWSER=/usr/bin/chromium
 export QT_QPA_PLATFORMTHEME="qt5ct"
 export GTK2_RC_FILES="$HOME/.gtkrc-2.0"
+export PYTHONBREAKPOINT=ipdb.set_trace
+

 # cuda stuff
 export CUDA_HOME=/opt/cuda
@@ -0,0 +1,76 @@
+# Vim-style keybindings for Tig
+#
+# To use these keybindings copy the file to your HOME directory and include
+# it from your ~/.tigrc file:
+#
+#	$ cp contrib/vim.tigrc ~/.tigrc.vim
+#	$ echo "source ~/.tigrc.vim" >> ~/.tigrc
+
+bind generic h scroll-left
+bind generic j move-down
+bind generic k move-up
+bind generic l scroll-right
+
+bind generic g  none
+bind generic gg move-first-line
+bind generic J next
+bind generic K previous
+bind generic gp parent
+bind generic gP back
+bind generic gn view-next
+
+bind main    G move-last-line
+bind generic G move-last-line
+
+bind generic <C-f> move-page-down
+bind generic <C-b> move-page-up
+
+bind generic v  none
+bind generic vm view-main
+bind generic vd view-diff
+bind generic vl view-log
+bind generic vt view-tree
+bind generic vb view-blob
+bind generic vx view-blame
+bind generic vr view-refs
+bind generic vs view-status
+bind generic vu view-stage
+bind generic vy view-stash
+bind generic vg view-grep
+bind generic vp view-pager
+bind generic vh view-help
+
+bind generic o  none
+bind generic oo :toggle sort-order
+bind generic os :toggle sort-field
+bind generic on :toggle line-number
+bind generic od :toggle date
+bind generic oa :toggle author
+bind generic og :toggle line-graphics
+bind generic of :toggle file-name
+bind generic op :toggle ignore-space
+bind generic oi :toggle id
+bind generic ot :toggle commit-title-overflow
+bind generic oF :toggle file-filter
+bind generic or :toggle commit-title-refs
+
+bind generic @  none
+bind generic @j :/^@@
+bind generic @k :?^@@
+bind generic @- :toggle diff-context -1
+bind generic @+ :toggle diff-context +1
+
+bind status  u  none
+bind stage   u  none
+bind generic uu status-update
+bind generic ur status-revert
+bind generic um status-merge
+bind generic ul stage-update-line
+bind generic us stage-split-chunk
+
+bind generic c  none
+bind generic cc !git commit
+bind generic ca !?@git commit --amend --no-edit
+
+bind generic ? view-help
+bind generic <C-w><C-w> view-next