diff --git a/common/.wezterm.lua b/common/.wezterm.lua index 6bc8945..31d12a9 100644 --- a/common/.wezterm.lua +++ b/common/.wezterm.lua @@ -165,7 +165,7 @@ local config = { } if wezterm.target_triple == "x86_64-pc-windows-msvc" then - config.default_prog = {"D:/Programs/git-sdk-64/usr/bin/fish", "-i"} + config.default_prog = {"D:/Programs/git-sdk-64/usr/bin/zsh", "-i"} config.default_cwd = "D:/Downloads" config.font = wezterm.font_with_fallback({ "Terminus (TTF)", @@ -178,7 +178,7 @@ if wezterm.target_triple == "x86_64-pc-windows-msvc" then name = "unix", }, } - config.default_gui_startup_args = {"connect", "unix"} + -- config.default_gui_startup_args = {"connect", "unix"} table.insert(config.launch_menu, { label = "MSYS2", diff --git a/common/nvim/init.vim b/common/nvim/init.vim index 170276e..e84811c 100644 --- a/common/nvim/init.vim +++ b/common/nvim/init.vim @@ -1,9 +1,6 @@ -" plugins +" {{{ plugins call plug#begin(stdpath('data') . '/plugged') -" color scheme -"Plug 'owozsh/amora' - " misc Plug 'nvim-lua/plenary.nvim' Plug 'tpope/vim-sensible' @@ -45,8 +42,9 @@ Plug 'hrsh7th/cmp-vsnip' Plug 'hrsh7th/vim-vsnip' call plug#end() +" }}} -" misc +" {{{ options set notermguicolors colorscheme lena @@ -77,10 +75,15 @@ let bufferline.icon_pinned = '▲' let g:presence_buttons = 0 +let g:ale_linters = { +\ 'javascript': ['eslint'], +\ 'typescript': ['eslint', 'tsserver'], +\} let g:ale_fixers = { \ '*': ['trim_whitespace'], \ 'vim': [], -\ 'javascript': ['prettier'], +\ 'javascript': ['prettier', 'eslint'], +\ 'typescript': ['prettier', 'eslint'], \ 'json': ['prettier'], \ 'css': ['prettier'], \} @@ -89,7 +92,9 @@ let g:ale_fix_on_save = 1 set fillchars+=vert:▎ set completeopt=menu,menuone,noselect +" }}} +" {{{ scripts lua << EOF vim.cmd("highlight IndentBlanklineIndent1 ctermfg=11 cterm=nocombine") vim.cmd("highlight IndentBlanklineIndent2 ctermfg=10 cterm=nocombine") @@ -254,22 +259,9 @@ lspconfig.eslint.setup( } )--]] EOF +" }}} -" tre -"let g:NERDTreeGitStatusIndicatorMapCustom = { -" \ 'Modified' :'U', -" \ 'Staged' :'A', -" \ 'Untracked' :'', -" \ 'Renamed' :'R', -" \ 'Unmerged' :'M', -" \ 'Deleted' :'D', -" \ 'Dirty' :'', -" \ 'Ignored' :'I', -" \ 'Clean' :'', -" \ 'Unknown' :'?', -" \ } - -" keys +" {{{ keys tnoremap inoremap @@ -311,7 +303,9 @@ nnoremap :BufferPin " Close buffer nnoremap :BufferClose -" Colors +" }}} + +" {{{ colors hi Normal ctermbg=NONE hi LineNr ctermfg=7 hi CursorLineNr ctermfg=1 ctermbg=0 @@ -351,19 +345,14 @@ hi LspDiagnosticsDefaultInformation ctermfg=7 hi ALEErrorSign ctermfg=1 hi ALEWarningSign ctermfg=3 -" statusline hell hi StatusLineMode ctermbg=1 ctermfg=0 hi StatusLineGitBranch ctermbg=5 ctermfg=0 hi StatusLineChar ctermbg=4 ctermfg=0 hi StatusLineFormat ctermbg=3 ctermfg=0 hi StatusLineFileType ctermbg=7 ctermfg=0 +" }}} -"call s:h('StatusLineMode', g:amora#palette.bgdark, g:amora#palette.red) -"call s:h('StatusLineGitBranch', g:amora#palette.bgdark, g:amora#palette.pink) -"call s:h('StatusLineChar', g:amora#palette.bgdark, g:amora#palette.purple) -"call s:h('StatusLineFormat', g:amora#palette.bgdark, g:amora#palette.yellow) -"call s:h('StatusLineFileType', g:amora#palette.bgdark, g:amora#palette.fg) - +" {{{ statusline function! GetMode() let l:m = mode(1) @@ -389,7 +378,6 @@ function! GitBranch() return strlen(l:branch) ? ' ' . l:branch . ' ' : '' endfunction - set statusline= set statusline+=%#StatusLineMode# set statusline+=%{GetMode()} @@ -405,3 +393,4 @@ set statusline+=%#StatusLineFormat# set statusline+=\ %{&fileencoding?&fileencoding:&encoding}\ %{&fileformat}\ set statusline+=%#StatusLineFileType# set statusline+=\ %{&filetype}\ +" }}} diff --git a/windows/bug.n/Config.ini b/windows/bug.n/Config.ini index 5ac8c0c..0596c9f 100644 --- a/windows/bug.n/Config.ini +++ b/windows/bug.n/Config.ini @@ -144,6 +144,7 @@ Config_rule=WindowsForms10.Window.8.app.0..*;ShareX - Image viewer;;0;1;;0;0;0; Config_rule=WindowsForms10.Window.8.app.0.2bf8098_r7_ad1;.*;;0;0;0;1;1;0; Config_rule=WindowsForms10.Window.8.app.0.2bf8098_r7_ad1;.+;;1;0;0;0;0;0; Config_rule=Qt5.*QWindowIcon;.*;;1;0;0;0;0;0; +Config_rule=Qt6.*QWindowIcon;.*;;1;0;0;0;0;0; Config_rule=Valve001;.*;;0;0;;1;1;1; Config_rule=Chrome_WidgetWin_1;.*;;1;0;0;0;1;0; Config_rule=Chrome_WidgetWin_1;.*;Window_isPopup;1;1;0;1;1;0;