diff options
| -rw-r--r-- | .config/coc/extensions/package.json | 7 | ||||
| -rwxr-xr-x | .config/i3/autostart##template | 7 | ||||
| -rw-r--r-- | .config/mozc/user_dictionary.db | bin | 293 -> 315 bytes | |||
| -rw-r--r-- | .config/mpv/mpv.conf | 4 | ||||
| -rw-r--r-- | .config/nvim/coc-settings.json | 3 | ||||
| -rw-r--r-- | .config/nvim/init.vim | 21 | ||||
| -rwxr-xr-x | .local/share/bin/java | 4 | ||||
| -rwxr-xr-x | .local/share/bin/mode | 3 | ||||
| -rw-r--r-- | .profile | 6 | ||||
| -rw-r--r-- | .zshrc | 6 |
10 files changed, 44 insertions, 17 deletions
diff --git a/.config/coc/extensions/package.json b/.config/coc/extensions/package.json index 34f6010..ad9dfbf 100644 --- a/.config/coc/extensions/package.json +++ b/.config/coc/extensions/package.json @@ -4,7 +4,7 @@ "coc-emmet": ">=1.1.6", "coc-go": ">=1.3.0", "coc-html": ">=1.6.1", - "coc-java": ">=1.5.5", + "coc-java": ">=1.15.2", "coc-json": ">=1.6.1", "coc-neosnippet": ">=1.2.2", "coc-python": ">=1.2.12", @@ -12,9 +12,10 @@ "coc-tsserver": ">=1.5.8", "coc-vimtex": ">=1.1.5", "coc-lua": ">=2.0.5", - "coc-deno": ">=3.12.0" + "coc-deno": ">=3.12.0", + "coc-sh": ">=1.2.2" }, "disabled": [], "locked": [], - "lastUpdate": 1687433956734 + "lastUpdate": 1707505805890 }
\ No newline at end of file diff --git a/.config/i3/autostart##template b/.config/i3/autostart##template index c7ef3b6..02135f6 100755 --- a/.config/i3/autostart##template +++ b/.config/i3/autostart##template @@ -4,7 +4,7 @@ cat "$XDG_CONFIG_HOME/X11/$(cat "$XDG_DATA_HOME/mode/active")" | xrdb -override & polybar & rwall & -picom -b +compfy -b xbanish & dunst & autocutsel & @@ -15,7 +15,8 @@ xdimmer -t 45 -p 3 & light-locker --no-late-locking & {% else %} redshift -l 52:6 & -nicotine & +nicotine --hidden & +desktop2mqtt --config "$XDG_CONFIG_HOME/desktop2mqtt/config.yml" & {% endif %} flashfocus & @@ -26,5 +27,5 @@ flashfocus & } & # auto start lazy script after everything else -[ -f "$HOME/do.sh" ] && . "$HOME/do.sh" +[ -x "$HOME/do.sh" ] && "$HOME/do.sh" diff --git a/.config/mozc/user_dictionary.db b/.config/mozc/user_dictionary.db Binary files differindex 0f5a0f0..644c695 100644 --- a/.config/mozc/user_dictionary.db +++ b/.config/mozc/user_dictionary.db diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf index 50d629c..a2bbaba 100644 --- a/.config/mpv/mpv.conf +++ b/.config/mpv/mpv.conf @@ -3,3 +3,7 @@ fs=yes # Display English subtitles if available. slang=en + +# Override ASS subtitles with same format as SRT +sub-ass-override=force + diff --git a/.config/nvim/coc-settings.json b/.config/nvim/coc-settings.json index b11ef71..e1cb2f0 100644 --- a/.config/nvim/coc-settings.json +++ b/.config/nvim/coc-settings.json @@ -34,5 +34,6 @@ "command": "vhdl_ls", "filetypes": ["vhdl"] } - } + }, + "java.import.gradle.java.home": "/usr/lib/jvm/java-17-openjdk" } diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 153652f..77cc2c0 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -14,7 +14,7 @@ set smartcase set timeoutlen=500 set updatetime=100 set mouse=a -set cino=N-s,E-s,l1,g-1 +set cino=N-s,E-s,l1,g-1,j1 set linebreak " set wrap but don't wrap inside words set viminfo+='1000,n~/.local/nvim/viminfo set guifont=JetBrainsMono\ Nerd\ Font:h9:#e-subpixelantialias:#h-slight @@ -25,6 +25,7 @@ let g:airline_powerline_fonts = 1 let g:minimap_highlight='Visual' let g:python3_host_prog='/usr/bin/python3' let g:vimtex_quickfix_open_on_warning = 0 +let g:vimtex_imaps_enabled = 0 hi! link CocFloating SneakScope if exists("g:neovide") @@ -92,7 +93,8 @@ Plug 'tikhomirov/vim-glsl' Plug 'vim-scripts/syntaxm4.vim' Plug 'elkowar/yuck.vim' Plug 'eraserhd/parinfer-rust', {'do': 'cargo build --release'} -Plug 'sile-typesetter/vim-sile' +Plug 'kaarmu/typst.vim' +Plug 'aklt/plantuml-syntax' " 'vim=ide' Plug 'neoclide/coc.nvim', {'branch': 'release'} @@ -241,6 +243,17 @@ else colorscheme ghdark endif +" change default vim-sneak colors to be more readable +hi! SneakLabel gui=reverse +hi! SneakLabelMask gui=reverse + +" fix terminal color +hi! link TermCursor Cursor +hi! link TermCursorNC Cursor + +" fix which key color +hi! link WhichKeyFloating NormalFloat + source $HOME/.config/nvim/lightline.vim let g:lightline = { \ 'colorscheme': 'auto', @@ -321,6 +334,10 @@ let g:vimtex_compiler_latexmk = { " TeX quotes autocmd FileType tex let b:surround_{char2nr("q")} = "`\r'" autocmd FileType tex let b:surround_{char2nr('Q')} = "``\r''" +autocmd FileType tex let b:AutoPairs = AutoPairsDefine({'(':')', '[':']', '{':'}', "``":"''", "`":"'", '$':'$', '"':'"'}) + +" AutoPairs for plantuml +autocmd FileType plantuml let b:AutoPairs = {'(':')', '[':']', '{':'}', '`':'`'} " coc.vim <tab> completion and <cr> stuff function! CheckBackspace() abort diff --git a/.local/share/bin/java b/.local/share/bin/java deleted file mode 100755 index a189d14..0000000 --- a/.local/share/bin/java +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -# this is a stupid fix because java has no option to silence the -# "Picked up _JAVA_OPTIONS:" message -exec /usr/bin/java $_SILENT_JAVA_OPTIONS "$@" diff --git a/.local/share/bin/mode b/.local/share/bin/mode index 60683b6..703515f 100755 --- a/.local/share/bin/mode +++ b/.local/share/bin/mode @@ -83,10 +83,13 @@ EOF switch_gtk() { GTK_3_SETTINGS_INI="$XDG_CONFIG_HOME/gtk-3.0/settings.ini" + GTK_4_SETTINGS_ENV="$XDG_CONFIG_HOME/gtk-4.0/env" if [ $1 = "light" ]; then + sed 's/^\(export\s\+GTK_THEME=.\+\)-Dark\(.*\)$/\1-Light\2/g' -i "$GTK_4_SETTINGS_ENV" sed "s/-Dark/-Light/" -i "$GTK_3_SETTINGS_INI" sed "s/gtk-application-prefer-dark-theme.*/gtk-application-prefer-dark-theme=false/" -i "$GTK_3_SETTINGS_INI" else + sed 's/^\(export\s\+GTK_THEME=.\+\)-Light\(.*\)$/\1-Dark\2/g' -i "$GTK_4_SETTINGS_ENV" sed "s/-Light/-Dark/" -i "$GTK_3_SETTINGS_INI" sed "s/gtk-application-prefer-dark-theme.*/gtk-application-prefer-dark-theme=true/" -i "$GTK_3_SETTINGS_INI" fi @@ -50,13 +50,16 @@ export XDG_DATA_HOME="$HOME/.local/share" export PATH="$HOME/.local/share/bin:$PATH" export PATH="$HOME/.local/bin:$PATH" export PATH="$HOME/.local/go/bin:$PATH" +export PATH="$HOME/.local/share/cargo/bin:$PATH" # export PATH="/opt/f4pga/xc7/conda/bin:$PATH" +export PATH="$HOME/.lyp/bin:$PATH" # other stuff export EDITOR="nvim" export FZF_DEFAULT_COMMAND="find ." export FZF_DEFAULT_OPTS="--color=16" export GOPATH="$HOME/.local/go" +. "$XDG_CONFIG_HOME/gtk-4.0/env" # use .config/ instead of home directory export ANDROID_SDK_HOME="$XDG_CONFIG_HOME/android" @@ -80,9 +83,8 @@ alias gpg2="gpg2 --homedir $XDG_DATA_HOME/gnupg" export DOTNET_CLI_TELEMETRY_OPTOUT=1 # java -export _SILENT_JAVA_OPTIONS="-Djava.util.prefs.userRoot=$XDG_CONFIG_HOME/java -Dawt.useSystemAAFontSettings=on -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel" +export _JAVA_OPTIONS="-Djava.util.prefs.userRoot=$XDG_CONFIG_HOME/java -Dawt.useSystemAAFontSettings=on -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel" export _JAVA_AWT_WM_NONREPARENTING=1 -unset _JAVA_OPTIONS # secrets [ -f "$HOME/.env" ] && . "$HOME/.env" @@ -1,5 +1,7 @@ ZSH_THEME="loek" zstyle ':omz:update' mode reminder +DISABLE_AUTO_UPDATE=true +DISABLE_UPDATE_PROMPT=true plugins=( git @@ -8,7 +10,7 @@ plugins=( # oh-my-zsh export ZSH="$HOME/.local/share/oh-my-zsh" -source $ZSH/oh-my-zsh.sh +source "$ZSH/oh-my-zsh.sh" # shift-tab fix bindkey '^[[Z' reverse-menu-complete @@ -22,5 +24,5 @@ aliases[=]="noglob =" alias 16="python3 -c 'import sys;print(f\"{int(sys.stdin.read().strip()):x}\")'" # cleanup -rm -rf ~/.xsession-errors ~/.xsession-errors.old ~/.zshrc.zwc ~/.lesshst ~/.lyrics ~/.android ~/.zcalc_history .git-credentials .node_repl_history .python_history +fork rm -rf ~/.xsession-errors ~/.xsession-errors.old ~/.zshrc.zwc ~/.lesshst ~/.lyrics ~/.android ~/.zcalc_history .git-credentials .node_repl_history .python_history |