diff options
| -rw-r--r-- | i3/.config/i3/config | 5 | ||||
| -rwxr-xr-x[-rw-r--r--] | nnn/.config/nnn/plugins/mediainf | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | nnn/.config/nnn/plugins/picker | 0 | ||||
| -rw-r--r-- | nvim/.config/nvim/init.vim | 5 | ||||
| -rwxr-xr-x | scripts/.local/bin/to60fps | 25 | ||||
| -rw-r--r-- | shell/.config/shell/profile | 7 | ||||
| -rw-r--r-- | tmux/.tmux.conf | 46 | ||||
| -rw-r--r-- | zsh/.config/zsh/.zshrc | 2 |
8 files changed, 75 insertions, 15 deletions
diff --git a/i3/.config/i3/config b/i3/.config/i3/config index 0fd90f0..2ed72ee 100644 --- a/i3/.config/i3/config +++ b/i3/.config/i3/config @@ -47,6 +47,8 @@ bindsym $mod+Shift+Right move right # split in horizontal/vertical orientation bindsym $mod+v split toggle +bindsym $mod+z sticky toggle + # enter fullscreen mode for the focused container bindsym $mod+f fullscreen toggle @@ -202,6 +204,7 @@ set $workspace10 "" assign [class="QtCreator"] $workspace3 assign [class="matplotlib"] $workspace4 assign [class="Matplotlib"] $workspace4 +assign [class="gksqt"] $workspace4 assign [class="Matlab"] $workspace4 assign [class="Steam"] $workspace5 assign [class="qBittorrent"] $workspace6 @@ -261,7 +264,7 @@ exec --no-startup-id discord exec_always --no-startup-id "setxkbmap -model pc105 -layout us,ru -option grp:ctrl_shift_toggle" # keyboard hold-down buttons rate -exec_always --no-startup-id "xset r rate 200 80" +exec_always --no-startup-id "xset r rate 200 75" # set wallpaper exec_always --no-startup-id "feh --no-fehbg --bg-scale ~/.local/share/wallpapers/bg.jpg" diff --git a/nnn/.config/nnn/plugins/mediainf b/nnn/.config/nnn/plugins/mediainf index 22ae824..22ae824 100644..100755 --- a/nnn/.config/nnn/plugins/mediainf +++ b/nnn/.config/nnn/plugins/mediainf diff --git a/nnn/.config/nnn/plugins/picker b/nnn/.config/nnn/plugins/picker index 93acca5..93acca5 100644..100755 --- a/nnn/.config/nnn/plugins/picker +++ b/nnn/.config/nnn/plugins/picker diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim index 8af47a1..35ab3e9 100644 --- a/nvim/.config/nvim/init.vim +++ b/nvim/.config/nvim/init.vim @@ -20,6 +20,7 @@ Plug 'neovim/nvim-lspconfig' Plug 'ervandew/supertab' " A Vim Plugin for Lively Previewing LaTeX PDF Output Plug 'xuhdev/vim-latex-live-preview', { 'for': 'tex' } +Plug 'https://github.com/christoomey/vim-tmux-navigator' call plug#end() nnoremap <F4> :NERDTreeToggle<CR> @@ -27,6 +28,8 @@ nnoremap <F4> :NERDTreeToggle<CR> "JULIA STUFF let g:slime_paste_file = "$HOME/.cache/slime_paste" +let g:slime_target = "tmux" +let g:slime_default_config = {"socket_name": "default", "target_pane": "{last}"} autocmd Filetype julia setlocal omnifunc=v:lua.vim.lsp.omnifunc lua << EOF @@ -71,4 +74,4 @@ let g:livepreview_previewer = 'zathura' let g:livepreview_use_biber = 1 let g:livepreview_cursorhold_recompile = 1 -set updatetime=750 +set updatetime=2000 diff --git a/scripts/.local/bin/to60fps b/scripts/.local/bin/to60fps index 68b806c..c9bee4a 100755 --- a/scripts/.local/bin/to60fps +++ b/scripts/.local/bin/to60fps @@ -1,7 +1,12 @@ -#input file full name +# input file full name iffname=$1 -ifname=${iffname%.*} -ifext=${iffname##*.} +quality=$2 #23..12, less is better quality +threads=$3 + +# getting input file name without path and extension and extension +ifname=$(basename -- "$iffname") +ifext="${ifname##*.}" +ifname="${ifname%.*}" #temporary file full name tffname=$ifname.temp.mkv @@ -9,13 +14,11 @@ tffname=$ifname.temp.mkv #output file full name offname=$ifname-60fps.mp4 -quality=$2 #23..12, less is more quality - -threads=$3 - -#echo $iffname $ifname $ifext -#echo $tffname -#echo $offname +echo "Input full filename:" $iffname +echo "Input filename:" $ifname +echo "Input file extension:" $ifext +echo "Temporary full filename:" $tffname +echo "Output full filename:" $offname mpv \ "$iffname" \ @@ -26,7 +29,7 @@ mpv \ --input-ipc-server=/tmp/mpvencodesocket \ --input-media-keys=no \ --no-msg-color \ - --vf=vapoursynth:/home/ivan/.local/share/SVP4/scripts/ffff.py:4:6 \ + --vf=vapoursynth:$(echo $HOME)/.local/share/SVP4/scripts/ffff.py:4:6 \ --of=matroska \ --ovc=libx264 \ --ovcopts=crf=$quality,preset=slow,threads=$threads diff --git a/shell/.config/shell/profile b/shell/.config/shell/profile index 4e30500..91fa42c 100644 --- a/shell/.config/shell/profile +++ b/shell/.config/shell/profile @@ -21,6 +21,7 @@ fi # Adds `~/.local/bin` to $PATH export PATH="$PATH:$(du -a "$HOME/.local/bin" | cut -f2 | paste -sd ':')" +export PAGER="less" export EDITOR="nvim" export TERMINAL="st" export BROWSER="firefox" @@ -47,4 +48,8 @@ export MOZ_USE_XINPUT2="1" # nnn things export NNN_BMS='w:/media/wdblue;v:~/vid;d:~/dox;m:/mnt;M:/media' -export NNN_PLUG="t:st" +export NNN_PLUG="t:st;m:mediainf" + +# fixing VapourSynth problem +# TODO change 3.9 to whatever may be later +export PYTHONPATH=/usr/local/lib/python3.9/site-packages diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf new file mode 100644 index 0000000..9d1d067 --- /dev/null +++ b/tmux/.tmux.conf @@ -0,0 +1,46 @@ +# remap prefix from 'C-b' to 'C-a' +unbind C-b +set-option -g prefix C-a +bind-key C-a send-prefix + +# split panes using | and - +bind \\ split-window -h +bind - split-window -v +unbind '"' +unbind % + +# reload config file easily +bind r source-file ~/.tmux.conf + +# Enable mouse control +set -g mouse on + +# 256 colors +# Note: you'll need to tmux kill-server and restart to have this take effect +set -g default-terminal "screen-256color" + +# Bottom bar black instead of green +set -g status-style "bg=black" + +# Vi mode +set-window-option -g mode-keys vi + +# Smart pane switching with awareness of Vim splits. +# See: https://github.com/christoomey/vim-tmux-navigator +is_vim="ps -o state= -o comm= -t '#{pane_tty}' \ + | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'" +bind-key -n 'C-h' if-shell "$is_vim" 'send-keys C-h' 'select-pane -L' +bind-key -n 'C-j' if-shell "$is_vim" 'send-keys C-j' 'select-pane -D' +bind-key -n 'C-k' if-shell "$is_vim" 'send-keys C-k' 'select-pane -U' +bind-key -n 'C-l' if-shell "$is_vim" 'send-keys C-l' 'select-pane -R' +tmux_version='$(tmux -V | sed -En "s/^tmux ([0-9]+(.[0-9]+)?).*/\1/p")' +if-shell -b '[ "$(echo "$tmux_version < 3.0" | bc)" = 1 ]' \ + "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\' 'select-pane -l'" +if-shell -b '[ "$(echo "$tmux_version >= 3.0" | bc)" = 1 ]' \ + "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\\\' 'select-pane -l'" + +bind-key -T copy-mode-vi 'C-h' select-pane -L +bind-key -T copy-mode-vi 'C-j' select-pane -D +bind-key -T copy-mode-vi 'C-k' select-pane -U +bind-key -T copy-mode-vi 'C-l' select-pane -R +bind-key -T copy-mode-vi 'C-\' select-pane -l diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc index 921a3fb..902b027 100644 --- a/zsh/.config/zsh/.zshrc +++ b/zsh/.config/zsh/.zshrc @@ -8,7 +8,7 @@ stty stop undef # Disable ctrl-s to freeze terminal. setopt interactive_comments # Lines configured by zsh-newuser-install -HISTFILE=~/.histfile +HISTFILE=~/.local/share/.histfile HISTSIZE=1000000000 SAVEHIST=1000000000 bindkey -v |
