This commit is contained in:
Cynthia Foxwell 2022-10-15 21:20:55 -06:00
parent 7c48b60462
commit 56b3646458
3 changed files with 22 additions and 32 deletions

View file

@ -165,7 +165,7 @@ local config = {
} }
if wezterm.target_triple == "x86_64-pc-windows-msvc" then 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.default_cwd = "D:/Downloads"
config.font = wezterm.font_with_fallback({ config.font = wezterm.font_with_fallback({
"Terminus (TTF)", "Terminus (TTF)",
@ -178,7 +178,7 @@ if wezterm.target_triple == "x86_64-pc-windows-msvc" then
name = "unix", name = "unix",
}, },
} }
config.default_gui_startup_args = {"connect", "unix"} -- config.default_gui_startup_args = {"connect", "unix"}
table.insert(config.launch_menu, { table.insert(config.launch_menu, {
label = "MSYS2", label = "MSYS2",

View file

@ -1,9 +1,6 @@
" plugins " {{{ plugins
call plug#begin(stdpath('data') . '/plugged') call plug#begin(stdpath('data') . '/plugged')
" color scheme
"Plug 'owozsh/amora'
" misc " misc
Plug 'nvim-lua/plenary.nvim' Plug 'nvim-lua/plenary.nvim'
Plug 'tpope/vim-sensible' Plug 'tpope/vim-sensible'
@ -45,8 +42,9 @@ Plug 'hrsh7th/cmp-vsnip'
Plug 'hrsh7th/vim-vsnip' Plug 'hrsh7th/vim-vsnip'
call plug#end() call plug#end()
" }}}
" misc " {{{ options
set notermguicolors set notermguicolors
colorscheme lena colorscheme lena
@ -77,10 +75,15 @@ let bufferline.icon_pinned = '▲'
let g:presence_buttons = 0 let g:presence_buttons = 0
let g:ale_linters = {
\ 'javascript': ['eslint'],
\ 'typescript': ['eslint', 'tsserver'],
\}
let g:ale_fixers = { let g:ale_fixers = {
\ '*': ['trim_whitespace'], \ '*': ['trim_whitespace'],
\ 'vim': [], \ 'vim': [],
\ 'javascript': ['prettier'], \ 'javascript': ['prettier', 'eslint'],
\ 'typescript': ['prettier', 'eslint'],
\ 'json': ['prettier'], \ 'json': ['prettier'],
\ 'css': ['prettier'], \ 'css': ['prettier'],
\} \}
@ -89,7 +92,9 @@ let g:ale_fix_on_save = 1
set fillchars+=vert:▎ set fillchars+=vert:▎
set completeopt=menu,menuone,noselect set completeopt=menu,menuone,noselect
" }}}
" {{{ scripts
lua << EOF lua << EOF
vim.cmd("highlight IndentBlanklineIndent1 ctermfg=11 cterm=nocombine") vim.cmd("highlight IndentBlanklineIndent1 ctermfg=11 cterm=nocombine")
vim.cmd("highlight IndentBlanklineIndent2 ctermfg=10 cterm=nocombine") vim.cmd("highlight IndentBlanklineIndent2 ctermfg=10 cterm=nocombine")
@ -254,22 +259,9 @@ lspconfig.eslint.setup(
} }
)--]] )--]]
EOF EOF
" }}}
" tre " {{{ keys
"let g:NERDTreeGitStatusIndicatorMapCustom = {
" \ 'Modified' :'U',
" \ 'Staged' :'A',
" \ 'Untracked' :'',
" \ 'Renamed' :'R',
" \ 'Unmerged' :'M',
" \ 'Deleted' :'D',
" \ 'Dirty' :'',
" \ 'Ignored' :'I',
" \ 'Clean' :'',
" \ 'Unknown' :'?',
" \ }
" keys
tnoremap <Esc> <C-\><C-n> tnoremap <Esc> <C-\><C-n>
inoremap <silent> <C-f> <C-i> inoremap <silent> <C-f> <C-i>
@ -311,7 +303,9 @@ nnoremap <silent> <A-p> :BufferPin<CR>
" Close buffer " Close buffer
nnoremap <silent> <A-c> :BufferClose<CR> nnoremap <silent> <A-c> :BufferClose<CR>
" Colors " }}}
" {{{ colors
hi Normal ctermbg=NONE hi Normal ctermbg=NONE
hi LineNr ctermfg=7 hi LineNr ctermfg=7
hi CursorLineNr ctermfg=1 ctermbg=0 hi CursorLineNr ctermfg=1 ctermbg=0
@ -351,19 +345,14 @@ hi LspDiagnosticsDefaultInformation ctermfg=7
hi ALEErrorSign ctermfg=1 hi ALEErrorSign ctermfg=1
hi ALEWarningSign ctermfg=3 hi ALEWarningSign ctermfg=3
" statusline hell
hi StatusLineMode ctermbg=1 ctermfg=0 hi StatusLineMode ctermbg=1 ctermfg=0
hi StatusLineGitBranch ctermbg=5 ctermfg=0 hi StatusLineGitBranch ctermbg=5 ctermfg=0
hi StatusLineChar ctermbg=4 ctermfg=0 hi StatusLineChar ctermbg=4 ctermfg=0
hi StatusLineFormat ctermbg=3 ctermfg=0 hi StatusLineFormat ctermbg=3 ctermfg=0
hi StatusLineFileType ctermbg=7 ctermfg=0 hi StatusLineFileType ctermbg=7 ctermfg=0
" }}}
"call s:h('StatusLineMode', g:amora#palette.bgdark, g:amora#palette.red) " {{{ statusline
"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)
function! GetMode() function! GetMode()
let l:m = mode(1) let l:m = mode(1)
@ -389,7 +378,6 @@ function! GitBranch()
return strlen(l:branch) ? ' ' . l:branch . ' ' : '' return strlen(l:branch) ? ' ' . l:branch . ' ' : ''
endfunction endfunction
set statusline= set statusline=
set statusline+=%#StatusLineMode# set statusline+=%#StatusLineMode#
set statusline+=%{GetMode()} set statusline+=%{GetMode()}
@ -405,3 +393,4 @@ set statusline+=%#StatusLineFormat#
set statusline+=\ %{&fileencoding?&fileencoding:&encoding}\ %{&fileformat}\ set statusline+=\ %{&fileencoding?&fileencoding:&encoding}\ %{&fileformat}\
set statusline+=%#StatusLineFileType# set statusline+=%#StatusLineFileType#
set statusline+=\ %{&filetype}\ set statusline+=\ %{&filetype}\
" }}}

View file

@ -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;.*;;0;0;0;1;1;0;
Config_rule=WindowsForms10.Window.8.app.0.2bf8098_r7_ad1;.+;;1;0;0;0;0;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=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=Valve001;.*;;0;0;;1;1;1;
Config_rule=Chrome_WidgetWin_1;.*;;1;0;0;0;1;0; Config_rule=Chrome_WidgetWin_1;.*;;1;0;0;0;1;0;
Config_rule=Chrome_WidgetWin_1;.*;Window_isPopup;1;1;0;1;1;0; Config_rule=Chrome_WidgetWin_1;.*;Window_isPopup;1;1;0;1;1;0;