diff --git a/.config/nvim/README.md b/.config/nvim/README.md deleted file mode 100644 index 12099b7..0000000 --- a/.config/nvim/README.md +++ /dev/null @@ -1 +0,0 @@ -Until changes are fixed with main neovim repo, use my neovim repo that was patched to have the package manager work with my init. diff --git a/.config/nvim/colors/everforest.vim b/.config/nvim/colors/everforest.vim index 84155d6..9665683 100644 --- a/.config/nvim/colors/everforest.vim +++ b/.config/nvim/colors/everforest.vim @@ -1,11 +1,3 @@ -" ----------------------------------------------------------------------------- -" Name: Everforest -" Description: Comfortable & Pleasant Color Scheme for Vim -" Author: sainnhe -" Website: https://github.com/sainnhe/everforest -" License: MIT -" ----------------------------------------------------------------------------- - " Initialization: {{{ let s:configuration = everforest#get_configuration() let s:palette = everforest#get_palette(s:configuration.background, s:configuration.colors_override) @@ -741,488 +733,13 @@ endif highlight! link TSModuleInfoGood Green highlight! link TSModuleInfoBad Red " }}} -" github/copilot.vim {{{ -highlight! link CopilotSuggestion Grey -" }}} -" neoclide/coc.nvim {{{ -call everforest#highlight('CocHoverRange', s:palette.none, s:palette.none, 'bold,underline') -call everforest#highlight('CocSearch', s:palette.green, s:palette.none, 'bold') -call everforest#highlight('CocPumSearch', s:palette.green, s:palette.none, 'bold') -call everforest#highlight('CocMarkdownHeader', s:palette.orange, s:palette.none, 'bold') -call everforest#highlight('CocMarkdownLink', s:palette.green, s:palette.none, 'underline') -highlight! link CocMarkdownCode Green -highlight! link CocPumShortcut Grey -highlight! link CocPumVirtualText Grey -highlight! link CocPumMenu Pmenu -highlight! link CocMenuSel PmenuSel -highlight! link CocDisabled Grey -highlight! link CocSnippetVisual DiffAdd -highlight! link CocInlayHint InlayHints -highlight! link CocNotificationProgress Green -highlight! link CocNotificationButton PmenuSel -highlight! link CocSemClass TSType -highlight! link CocSemEnum TSType -highlight! link CocSemInterface TSType -highlight! link CocSemStruct TSType -highlight! link CocSemTypeParameter TSType -highlight! link CocSemVariable TSVariable -highlight! link CocSemEnumMember TSProperty -highlight! link CocSemEvent TSLabel -highlight! link CocSemModifier TSOperator -highlight! link CocErrorFloat ErrorFloat -highlight! link CocWarningFloat WarningFloat -highlight! link CocInfoFloat InfoFloat -highlight! link CocHintFloat HintFloat -highlight! link CocFloating NormalFloat -highlight! link CocFloatDividingLine Grey -highlight! link CocErrorHighlight ErrorText -highlight! link CocWarningHighlight WarningText -highlight! link CocInfoHighlight InfoText -highlight! link CocHintHighlight HintText -highlight! link CocHighlightText CurrentWord -highlight! link CocHoverRange CurrentWord -highlight! link CocErrorSign RedSign -highlight! link CocWarningSign YellowSign -highlight! link CocInfoSign BlueSign -highlight! link CocHintSign GreenSign -highlight! link CocWarningVirtualText VirtualTextWarning -highlight! link CocErrorVirtualText VirtualTextError -highlight! link CocInfoVirtualText VirtualTextInfo -highlight! link CocHintVirtualText VirtualTextHint -highlight! link CocErrorLine ErrorLine -highlight! link CocWarningLine WarningLine -highlight! link CocInfoLine InfoLine -highlight! link CocHintLine HintLine -highlight! link CocCodeLens Grey -highlight! link CocFadeOut Grey -highlight! link CocStrikeThrough Grey -highlight! link CocListMode StatusLine -highlight! link CocListPath StatusLine -highlight! link CocSelectedText Orange -highlight! link CocListsLine Fg -highlight! link CocListsDesc Grey -highlight! link HighlightedyankRegion Visual -highlight! link CocGitAddedSign GreenSign -highlight! link CocGitChangeRemovedSign PurpleSign -highlight! link CocGitChangedSign BlueSign -highlight! link CocGitRemovedSign RedSign -highlight! link CocGitTopRemovedSign RedSign -highlight! link CocInlineVirtualText Grey -" }}} -" prabirshrestha/vim-lsp {{{ -highlight! link LspErrorVirtualText VirtualTextError -highlight! link LspWarningVirtualText VirtualTextWarning -highlight! link LspInformationVirtualText VirtualTextInfo -highlight! link LspHintVirtualText VirtualTextHint -highlight! link LspErrorHighlight ErrorText -highlight! link LspWarningHighlight WarningText -highlight! link LspInformationHighlight InfoText -highlight! link LspHintHighlight HintText -highlight! link lspReference CurrentWord -highlight! link lspInlayHintsType InlayHints -highlight! link lspInlayHintsParameter InlayHints -highlight! link LspSemanticType TSType -highlight! link LspSemanticClass TSType -highlight! link LspSemanticEnum TSType -highlight! link LspSemanticInterface TSType -highlight! link LspSemanticStruct TSType -highlight! link LspSemanticTypeParameter TSType -highlight! link LspSemanticParameter TSParameter -highlight! link LspSemanticVariable TSVariable -highlight! link LspSemanticProperty TSProperty -highlight! link LspSemanticEnumMember TSProperty -highlight! link LspSemanticEvents TSLabel -highlight! link LspSemanticFunction TSFunction -highlight! link LspSemanticMethod TSMethod -highlight! link LspSemanticKeyword TSKeyword -highlight! link LspSemanticModifier TSOperator -highlight! link LspSemanticComment TSComment -highlight! link LspSemanticString TSString -highlight! link LspSemanticNumber TSNumber -highlight! link LspSemanticRegexp TSStringRegex -highlight! link LspSemanticOperator TSOperator -" }}} -" yegappan/lsp {{{ -highlight! link LspDiagInlineError ErrorText -highlight! link LspDiagInlineWarning WarningText -highlight! link LspDiagInlineInfo InfoText -highlight! link LspDiagInlineHint HintText -highlight! link LspDiagSignErrorText RedSign -highlight! link LspDiagSignWarningText YellowSign -highlight! link LspDiagSignInfoText BlueSign -highlight! link LspDiagSignHintText GreenSign -highlight! link LspDiagVirtualTextError VirtualTextError -highlight! link LspDiagVirtualTextWarning VirtualTextWarning -highlight! link LspDiagVirtualTextInfo VirtualTextInfo -highlight! link LspDiagVirtualTextHint VirtualTextHint -highlight! link LspInlayHintsParam InlayHints -highlight! link LspSigActiveParameter DiffAdd -" }}} -" ycm-core/YouCompleteMe {{{ -highlight! link YcmErrorSign RedSign -highlight! link YcmWarningSign YellowSign -highlight! link YcmErrorLine ErrorLine -highlight! link YcmWarningLine WarningLine -highlight! link YcmErrorSection ErrorText -highlight! link YcmWarningSection WarningText -highlight! link YcmInlayHint InlayHints -highlight! link YcmErrorText VirtualTextError -highlight! link YcmWarningText VirtualTextWarning -if !has('nvim') && has('textprop') && !exists('g:YCM_HIGHLIGHT_GROUP') - let g:YCM_HIGHLIGHT_GROUP = { - \ 'typeParameter': 'TSType', - \ 'parameter': 'TSParameter', - \ 'variable': 'TSVariable', - \ 'property': 'TSProperty', - \ 'enumMember': 'TSVariableBuiltin', - \ 'event': 'TSLabel', - \ 'member': 'TSVariable', - \ 'method': 'TSMethod', - \ 'class': 'TSType', - \ 'namespace': 'TSNamespace', - \ } - for tokenType in keys( g:YCM_HIGHLIGHT_GROUP ) - try - call prop_type_add( 'YCM_HL_' . tokenType, - \ { 'highlight': g:YCM_HIGHLIGHT_GROUP[ tokenType ] } ) - catch - endtry - endfor -endif -" }}} -" dense-analysis/ale {{{ -highlight! link ALEError ErrorText -highlight! link ALEWarning WarningText -highlight! link ALEInfo InfoText -highlight! link ALEErrorSign RedSign -highlight! link ALEWarningSign YellowSign -highlight! link ALEInfoSign BlueSign -highlight! link ALEErrorLine ErrorLine -highlight! link ALEWarningLine WarningLine -highlight! link ALEInfoLine InfoLine -highlight! link ALEVirtualTextError VirtualTextError -highlight! link ALEVirtualTextWarning VirtualTextWarning -highlight! link ALEVirtualTextInfo VirtualTextInfo -highlight! link ALEVirtualTextStyleError VirtualTextHint -highlight! link ALEVirtualTextStyleWarning VirtualTextHint -" }}} -" neomake/neomake {{{ -highlight! link NeomakeError ErrorText -highlight! link NeomakeWarning WarningText -highlight! link NeomakeInfo InfoText -highlight! link NeomakeMessage HintText -highlight! link NeomakeErrorSign RedSign -highlight! link NeomakeWarningSign YellowSign -highlight! link NeomakeInfoSign BlueSign -highlight! link NeomakeMessageSign AquaSign -highlight! link NeomakeVirtualtextError VirtualTextError -highlight! link NeomakeVirtualtextWarning VirtualTextWarning -highlight! link NeomakeVirtualtextInfo VirtualTextInfo -highlight! link NeomakeVirtualtextMessag VirtualTextHint -" }}} -" vim-syntastic/syntastic {{{ -highlight! link SyntasticError ErrorText -highlight! link SyntasticWarning WarningText -highlight! link SyntasticErrorSign RedSign -highlight! link SyntasticWarningSign YellowSign -highlight! link SyntasticErrorLine ErrorLine -highlight! link SyntasticWarningLine WarningLine -" }}} -" Yggdroot/LeaderF {{{ -if !exists('g:Lf_StlColorscheme') - let g:Lf_StlColorscheme = 'everforest' -endif -if !exists('g:Lf_PopupColorscheme') - let g:Lf_PopupColorscheme = 'everforest' -endif -call everforest#highlight('Lf_hl_match', s:palette.green, s:palette.none, 'bold') -call everforest#highlight('Lf_hl_match0', s:palette.green, s:palette.none, 'bold') -call everforest#highlight('Lf_hl_match1', s:palette.aqua, s:palette.none, 'bold') -call everforest#highlight('Lf_hl_match2', s:palette.blue, s:palette.none, 'bold') -call everforest#highlight('Lf_hl_match3', s:palette.purple, s:palette.none, 'bold') -call everforest#highlight('Lf_hl_match4', s:palette.orange, s:palette.none, 'bold') -call everforest#highlight('Lf_hl_matchRefine', s:palette.red, s:palette.none, 'bold') -call everforest#highlight('Lf_hl_popup_normalMode', s:palette.bg0, s:palette.red, 'bold') -call everforest#highlight('Lf_hl_popup_inputMode', s:palette.bg0, s:palette.green, 'bold') -call everforest#highlight('Lf_hl_popup_category', s:palette.fg, s:palette.bg4) -call everforest#highlight('Lf_hl_popup_nameOnlyMode', s:palette.fg, s:palette.bg3) -call everforest#highlight('Lf_hl_popup_fullPathMode', s:palette.fg, s:palette.bg3) -call everforest#highlight('Lf_hl_popup_fuzzyMode', s:palette.fg, s:palette.bg3) -call everforest#highlight('Lf_hl_popup_regexMode', s:palette.fg, s:palette.bg3) -call everforest#highlight('Lf_hl_popup_lineInfo', s:palette.yellow, s:palette.bg4) -call everforest#highlight('Lf_hl_popup_total', s:palette.bg0, s:palette.orange) -call everforest#highlight('Lf_hl_popup_cursor', s:palette.bg0, s:palette.green) -highlight! link Lf_hl_cursorline Fg -highlight! link Lf_hl_selection DiffAdd -highlight! link Lf_hl_rgHighlight Visual -highlight! link Lf_hl_gtagsHighlight Visual -highlight! link Lf_hl_popup_inputText Pmenu -highlight! link Lf_hl_popup_window Pmenu -highlight! link Lf_hl_popup_prompt Green -highlight! link Lf_hl_popup_cwd Pmenu -highlight! link Lf_hl_popup_blank Lf_hl_popup_window -highlight! link Lf_hl_popup_spin Red -" }}} -" liuchengxu/vim-clap {{{ -call everforest#highlight('ClapSelected', s:palette.red, s:palette.none, 'bold') -call everforest#highlight('ClapCurrentSelection', s:palette.none, s:palette.bg1, 'bold') -call everforest#highlight('ClapSpinner', s:palette.orange, s:palette.bg2, 'bold') -call everforest#highlight('ClapBlines', s:palette.fg, s:palette.none) -call everforest#highlight('ClapProviderId', s:palette.fg, s:palette.none, 'bold') -call everforest#highlight('ClapMatches1', s:palette.red, s:palette.none, 'bold') -call everforest#highlight('ClapMatches2', s:palette.orange, s:palette.none, 'bold') -call everforest#highlight('ClapMatches3', s:palette.yellow, s:palette.none, 'bold') -call everforest#highlight('ClapMatches4', s:palette.aqua, s:palette.none, 'bold') -call everforest#highlight('ClapMatches5', s:palette.blue, s:palette.none, 'bold') -call everforest#highlight('ClapMatches6', s:palette.purple, s:palette.none, 'bold') -call everforest#highlight('ClapFuzzyMatches', s:palette.green, s:palette.none, 'bold') -call everforest#highlight('ClapNoMatchesFound', s:palette.red, s:palette.none, 'bold') -highlight! link ClapInput Pmenu -highlight! link ClapDisplay Pmenu -highlight! link ClapPreview Pmenu -highlight! link ClapFuzzyMatches1 ClapFuzzyMatches -highlight! link ClapFuzzyMatches2 ClapFuzzyMatches -highlight! link ClapFuzzyMatches3 ClapFuzzyMatches -highlight! link ClapFuzzyMatches4 ClapFuzzyMatches -highlight! link ClapFuzzyMatches5 ClapFuzzyMatches -highlight! link ClapFuzzyMatches6 ClapFuzzyMatches -highlight! link ClapFuzzyMatches7 ClapFuzzyMatches -highlight! link ClapFuzzyMatches8 ClapFuzzyMatches -highlight! link ClapFuzzyMatches9 ClapFuzzyMatches -highlight! link ClapFuzzyMatches10 ClapFuzzyMatches -highlight! link ClapFuzzyMatches11 ClapFuzzyMatches -highlight! link ClapFuzzyMatches12 ClapFuzzyMatches -highlight! link ClapBlinesLineNr Grey -highlight! link ClapProviderColon ClapBlines -highlight! link ClapProviderAbout ClapBlines -highlight! link ClapFile Fg -highlight! link ClapSearchText ClapFuzzyMatches -" }}} -" junegunn/fzf.vim {{{ -let g:fzf_colors = { - \ 'fg': ['fg', 'Normal'], - \ 'bg': ['bg', 'Normal'], - \ 'hl': ['fg', 'Green'], - \ 'fg+': ['fg', 'CursorLine', 'CursorColumn', 'Normal'], - \ 'bg+': ['bg', 'CursorLine', 'CursorColumn'], - \ 'hl+': ['fg', 'Aqua'], - \ 'info': ['fg', 'Aqua'], - \ 'border': ['fg', 'Grey'], - \ 'prompt': ['fg', 'Orange'], - \ 'pointer': ['fg', 'Blue'], - \ 'marker': ['fg', 'Yellow'], - \ 'spinner': ['fg', 'Yellow'], - \ 'header': ['fg', 'Grey'] - \ } -" }}} -" Shougo/denite.nvim {{{ -call everforest#highlight('deniteMatchedChar', s:palette.green, s:palette.none, 'bold') -call everforest#highlight('deniteMatchedRange', s:palette.green, s:palette.none, 'bold,underline') -call everforest#highlight('deniteInput', s:palette.green, s:palette.bg3, 'bold') -call everforest#highlight('deniteStatusLineNumber', s:palette.purple, s:palette.bg3) -call everforest#highlight('deniteStatusLinePath', s:palette.fg, s:palette.bg3) -highlight! link deniteSelectedLin Green -" }}} -" kien/ctrlp.vim {{{ -call everforest#highlight('CtrlPMatch', s:palette.green, s:palette.none, 'bold') -call everforest#highlight('CtrlPPrtBase', s:palette.bg3, s:palette.none) -call everforest#highlight('CtrlPLinePre', s:palette.bg3, s:palette.none) -call everforest#highlight('CtrlPMode1', s:palette.blue, s:palette.bg3, 'bold') -call everforest#highlight('CtrlPMode2', s:palette.bg0, s:palette.blue, 'bold') -call everforest#highlight('CtrlPStats', s:palette.grey1, s:palette.bg3, 'bold') -highlight! link CtrlPNoEntries Red -highlight! link CtrlPPrtCursor Blue -" }}} -" airblade/vim-gitgutter {{{ -highlight! link GitGutterAdd GreenSign -highlight! link GitGutterChange BlueSign -highlight! link GitGutterDelete RedSign -highlight! link GitGutterChangeDelete PurpleSign -highlight! link GitGutterAddLine DiffAdd -highlight! link GitGutterChangeLine DiffChange -highlight! link GitGutterDeleteLine DiffDelete -highlight! link GitGutterChangeDeleteLine DiffChange -highlight! link GitGutterAddLineNr Green -highlight! link GitGutterChangeLineNr Blue -highlight! link GitGutterDeleteLineNr Red -highlight! link GitGutterChangeDeleteLineNr Purple -" }}} -" mhinz/vim-signify {{{ -highlight! link SignifySignAdd GreenSign -highlight! link SignifySignChange BlueSign -highlight! link SignifySignDelete RedSign -highlight! link SignifySignChangeDelete PurpleSign -highlight! link SignifyLineAdd DiffAdd -highlight! link SignifyLineChange DiffChange -highlight! link SignifyLineChangeDelete DiffChange -highlight! link SignifyLineDelete DiffDelete -" }}} -" andymass/vim-matchup {{{ -call everforest#highlight('MatchParenCur', s:palette.none, s:palette.none, 'bold') -call everforest#highlight('MatchWord', s:palette.none, s:palette.none, 'underline') -call everforest#highlight('MatchWordCur', s:palette.none, s:palette.none, 'underline') -" }}} -" easymotion/vim-easymotion {{{ -highlight! link EasyMotionTarget Search -highlight! link EasyMotionShade Grey -" }}} -" justinmk/vim-sneak {{{ -call everforest#highlight('SneakLabelMask', s:palette.orange, s:palette.orange) -highlight! link Sneak Search -highlight! link SneakLabel Search -highlight! link SneakScope DiffText -" }}} -" rhysd/clever-f.vim {{{ -highlight! link CleverFDefaultLabel Search -" }}} -" terryma/vim-multiple-cursors {{{ -highlight! link multiple_cursors_cursor Cursor -highlight! link multiple_cursors_visual Visual -" }}} -" mg979/vim-visual-multi {{{ -call everforest#highlight('VMCursor', s:palette.blue, s:palette.bg_blue) -let g:VM_Mono_hl = 'VMCursor' -let g:VM_Extend_hl = 'Visual' -let g:VM_Cursor_hl = 'VMCursor' -let g:VM_Insert_hl = 'VMCursor' -" }}} -" dominikduda/vim_current_word {{{ -highlight! link CurrentWordTwins CurrentWord -" }}} -" RRethy/vim-illuminate {{{ -highlight! link illuminatedWord CurrentWord -highlight! link IlluminatedWordText CurrentWord -highlight! link IlluminatedWordRead CurrentWord -highlight! link IlluminatedWordWrite CurrentWord -" }}} -" itchyny/vim-cursorword {{{ -highlight! link CursorWord0 CurrentWord -highlight! link CursorWord1 CurrentWord -" }}} -" Yggdroot/indentLine {{{ -if s:configuration.ui_contrast ==# 'low' - let g:indentLine_color_gui = s:palette.bg5[0] - let g:indentLine_color_term = s:palette.bg5[1] -else - let g:indentLine_color_gui = s:palette.grey0[0] - let g:indentLine_color_term = s:palette.grey0[1] -endif -" }}} -" nathanaelkane/vim-indent-guides {{{ -if get(g:, 'indent_guides_auto_colors', 1) == 0 - call everforest#highlight('IndentGuidesOdd', s:palette.bg0, s:palette.bg1) - call everforest#highlight('IndentGuidesEven', s:palette.bg0, s:palette.bg2) -endif -" }}} -" thiagoalessio/rainbow_levels.vim {{{ -highlight! link RainbowLevel0 Red -highlight! link RainbowLevel1 Orange -highlight! link RainbowLevel2 Yellow -highlight! link RainbowLevel3 Green -highlight! link RainbowLevel4 Aqua -highlight! link RainbowLevel5 Blue -highlight! link RainbowLevel6 Purple -highlight! link RainbowLevel7 Yellow -highlight! link RainbowLevel8 Green -" }}} -" luochen1990/rainbow {{{ -if !exists('g:rbpt_colorpairs') - let g:rbpt_colorpairs = [['blue', s:palette.blue[0]], ['magenta', s:palette.purple[0]], - \ ['red', s:palette.red[0]], ['166', s:palette.orange[0]]] -endif - -let g:rainbow_guifgs = [ s:palette.orange[0], s:palette.red[0], s:palette.purple[0], s:palette.blue[0] ] -let g:rainbow_ctermfgs = [ '166', 'red', 'magenta', 'blue' ] - -if !exists('g:rainbow_conf') - let g:rainbow_conf = {} -endif -if !has_key(g:rainbow_conf, 'guifgs') - let g:rainbow_conf['guifgs'] = g:rainbow_guifgs -endif -if !has_key(g:rainbow_conf, 'ctermfgs') - let g:rainbow_conf['ctermfgs'] = g:rainbow_ctermfgs -endif - -let g:niji_dark_colours = g:rbpt_colorpairs -let g:niji_light_colours = g:rbpt_colorpairs -" }}} -" kshenoy/vim-signature {{{ -highlight! link SignatureMarkText BlueSign -highlight! link SignatureMarkerText PurpleSign -" }}} -" ap/vim-buftabline {{{ -highlight! link BufTabLineCurrent TabLineSel -highlight! link BufTabLineActive TabLine -highlight! link BufTabLineHidden TabLineFill -highlight! link BufTabLineFill TabLineFill -" }}} -" liuchengxu/vim-which-key {{{ -highlight! link WhichKey Red -highlight! link WhichKeySeperator Green -highlight! link WhichKeyGroup Yellow -highlight! link WhichKeyDesc Blue -" }}} -" junegunn/limelight.vim {{{ -let g:limelight_conceal_ctermfg = s:palette.grey0[1] -let g:limelight_conceal_guifg = s:palette.grey0[0] -" }}} -" unblevable/quick-scope {{{ -call everforest#highlight('QuickScopePrimary', s:palette.aqua, s:palette.none, 'underline') -call everforest#highlight('QuickScopeSecondary', s:palette.blue, s:palette.none, 'underline') -" }}} -" APZelos/blamer.nvim {{{ -highlight! link Blamer Grey -" }}} -" cohama/agit.vim {{{ -highlight! link agitTree Grey -highlight! link agitDate Green -highlight! link agitRemote Red -highlight! link agitHead Orange -highlight! link agitRef Aqua -highlight! link agitTag Orange -highlight! link agitStatFile Blue -highlight! link agitStatRemoved Red -highlight! link agitStatAdded Green -highlight! link agitStatMessage Orange -highlight! link agitDiffRemove Red -highlight! link agitDiffAdd Green -highlight! link agitDiffHeader Purple -" }}} -" voldikss/vim-floaterm {{{ -highlight! link FloatermBorder Grey -" }}} -" MattesGroeger/vim-bookmarks {{{ -highlight! link BookmarkSign BlueSign -highlight! link BookmarkAnnotationSign GreenSign -highlight! link BookmarkLine DiffChange -highlight! link BookmarkAnnotationLine DiffAdd -" }}} if has('nvim') -" hrsh7th/nvim-cmp {{{ -call everforest#highlight('CmpItemAbbrMatch', s:palette.green, s:palette.none, 'bold') -call everforest#highlight('CmpItemAbbrMatchFuzzy', s:palette.green, s:palette.none, 'bold') -highlight! link CmpItemAbbr Fg -highlight! link CmpItemAbbrDeprecated Grey -highlight! link CmpItemMenu Fg -highlight! link CmpItemKind Yellow -for kind in g:everforest_lsp_kind_color - execute "highlight! link CmpItemKind" . kind[0] . " " . kind[1] -endfor -" }}} " Saghen/blink.cmp {{{ call everforest#highlight('BlinkCmpLabelMatch', s:palette.green, s:palette.none, 'bold') for kind in g:everforest_lsp_kind_color execute "highlight! link BlinkCmpKind" . kind[0] . " " . kind[1] endfor " }}} -" SmiteshP/nvim-navic {{{ -highlight! link NavicText Fg -highlight! link NavicSeparator Grey -for kind in g:everforest_lsp_kind_color - execute "highlight! link NavicIcons" . kind[0] . " " . kind[1] -endfor -" }}} " folke/trouble.nvim {{{ highlight! link TroubleText Fg highlight! link TroubleSource Grey @@ -1234,168 +751,6 @@ highlight! link TelescopeBorder Grey highlight! link TelescopePromptPrefix Orange highlight! link TelescopeSelection DiffAdd " }}} -" ibhagwan/fzf-lua {{{ -highlight! link FzfLuaBorder Grey -" }}} -" folke/snacks.nvim {{{ -highlight! link SnacksPicker Normal -highlight! link SnacksPickerBorder Grey -highlight! link SnacksPickerTitle Title -highlight! link SnacksPickerFooter SnacksPickerTitle -highlight! link SnacksPickerPrompt Orange -highlight! link SnacksPickerInputCursorLine Normal -highlight! link SnacksPickerListCursorLine DiffAdd -call everforest#highlight('SnacksPickerMatch', s:palette.green, s:palette.none, 'bold') -highlight! link SnacksPickerToggle CursorLine -highlight! link SnacksPickerDir Comment -highlight! link SnacksPickerBufFlags Grey -highlight! link SnacksPickerSelected Aqua -highlight! link SnacksPickerKeymapRhs Grey -" }}} -" lewis6991/gitsigns.nvim {{{ -highlight! link GitSignsAdd GreenSign -highlight! link GitSignsChange BlueSign -highlight! link GitSignsDelete RedSign -highlight! link GitSignsAddNr Green -highlight! link GitSignsChangeNr Blue -highlight! link GitSignsDeleteNr Red -highlight! link GitSignsAddLn DiffAdd -highlight! link GitSignsChangeLn DiffChange -highlight! link GitSignsDeleteLn DiffDelete -highlight! link GitSignsCurrentLineBlame Grey -" }}} -" phaazon/hop.nvim {{{ -call everforest#highlight('HopNextKey', s:palette.orange, s:palette.none, 'bold') -call everforest#highlight('HopNextKey1', s:palette.green, s:palette.none, 'bold') -highlight! link HopNextKey2 Green -highlight! link HopUnmatched Grey -" }}} -" lukas-reineke/indent-blankline.nvim {{{ -call everforest#highlight('IblScope', s:palette.grey1, s:palette.none, 'nocombine') -call everforest#highlight('IblIndent', s:palette.bg4, s:palette.none, 'nocombine') -call everforest#highlight('IndentBlanklineContextStart', s:palette.none, s:palette.bg2) -highlight! link IndentBlanklineContextChar IblScope -highlight! link IndentBlanklineChar IblIndent -highlight! link IndentBlanklineSpaceChar IndentBlanklineChar -highlight! link IndentBlanklineSpaceCharBlankline IndentBlanklineChar -" }}} -" HiPhish/rainbow-delimiters.nvim {{{ -highlight! link RainbowDelimiterRed Red -highlight! link RainbowDelimiterOrange Orange -highlight! link RainbowDelimiterYellow Yellow -highlight! link RainbowDelimiterGreen Green -highlight! link RainbowDelimiterCyan Aqua -highlight! link RainbowDelimiterBlue Blue -highlight! link RainbowDelimiterViolet Purple -" }}} -" romgrk/barbar.nvim {{{ -call everforest#highlight('BufferCurrent', s:palette.fg, s:palette.bg0) -call everforest#highlight('BufferCurrentIndex', s:palette.fg, s:palette.bg0) -call everforest#highlight('BufferCurrentMod', s:palette.blue, s:palette.bg0) -call everforest#highlight('BufferCurrentTarget', s:palette.red, s:palette.bg0, 'bold') -call everforest#highlight('BufferCurrentSign', s:palette.statusline1, s:palette.bg0) -call everforest#highlight('BufferCurrentADDED', s:palette.green, s:palette.bg0) -call everforest#highlight('BufferCurrentDELETED', s:palette.red, s:palette.bg0) -call everforest#highlight('BufferCurrentCHANGED', s:palette.blue, s:palette.bg0) -call everforest#highlight('BufferVisible', s:palette.fg, s:palette.bg_dim) -call everforest#highlight('BufferVisibleIndex', s:palette.fg, s:palette.bg_dim) -call everforest#highlight('BufferVisibleMod', s:palette.blue, s:palette.bg_dim) -call everforest#highlight('BufferVisibleSign', s:palette.statusline1, s:palette.bg_dim) -call everforest#highlight('BufferVisibleTarget', s:palette.yellow, s:palette.bg_dim, 'bold') -call everforest#highlight('BufferInactive', s:palette.grey1, s:palette.bg_dim) -call everforest#highlight('BufferInactiveIndex', s:palette.grey1, s:palette.bg_dim) -call everforest#highlight('BufferInactiveMod', s:palette.grey1, s:palette.bg_dim) -call everforest#highlight('BufferInactiveTarget', s:palette.yellow, s:palette.bg_dim, 'bold') -call everforest#highlight('BufferInactiveSign', s:palette.grey0, s:palette.bg_dim) -highlight! link BufferInactiveADDED BufferInactiveSign -highlight! link BufferInactiveDELETED BufferInactiveSign -highlight! link BufferInactiveCHANGED BufferInactiveSign -call everforest#highlight('BufferTabpages', s:palette.grey1, s:palette.bg_dim, 'bold') -call everforest#highlight('BufferTabpagesSep', s:palette.grey0, s:palette.bg_dim, 'bold') -call everforest#highlight('BufferTabpageFill', s:palette.bg_dim, s:palette.bg_dim) -" }}} -" rcarriga/nvim-notify {{{ -call everforest#highlight('NotifyBackground', s:palette.none, s:palette.bg0) -highlight! link NotifyERRORBorder Red -highlight! link NotifyWARNBorder Yellow -highlight! link NotifyINFOBorder Green -highlight! link NotifyDEBUGBorder Grey -highlight! link NotifyTRACEBorder Purple -highlight! link NotifyERRORIcon Red -highlight! link NotifyWARNIcon Yellow -highlight! link NotifyINFOIcon Green -highlight! link NotifyDEBUGIcon Grey -highlight! link NotifyTRACEIcon Purple -highlight! link NotifyERRORTitle Red -highlight! link NotifyWARNTitle Yellow -highlight! link NotifyINFOTitle Green -highlight! link NotifyDEBUGTitle Grey -highlight! link NotifyTRACETitle Purple -" }}} -" rcarriga/nvim-dap-ui {{{ -call everforest#highlight('DapUIModifiedValue', s:palette.blue, s:palette.none, 'bold') -call everforest#highlight('DapUIBreakpointsCurrentLine', s:palette.blue, s:palette.none, 'bold') -call everforest#highlight('DapUIPlayPause', s:palette.green, s:palette.bg2) -call everforest#highlight('DapUIRestart', s:palette.green, s:palette.bg2) -call everforest#highlight('DapUIStop', s:palette.red, s:palette.bg2) -call everforest#highlight('DapUIUnavailable', s:palette.grey1, s:palette.bg2) -call everforest#highlight('DapUIStepOver', s:palette.blue, s:palette.bg2) -call everforest#highlight('DapUIStepInto', s:palette.blue, s:palette.bg2) -call everforest#highlight('DapUIStepBack', s:palette.blue, s:palette.bg2) -call everforest#highlight('DapUIStepOut', s:palette.blue, s:palette.bg2) -highlight! link DapUIScope Blue -highlight! link DapUIType Purple -highlight! link DapUIDecoration Blue -highlight! link DapUIThread Green -highlight! link DapUIStoppedThread Blue -highlight! link DapUISource Purple -highlight! link DapUILineNumber Blue -highlight! link DapUIFloatBorder Blue -highlight! link DapUIWatchesEmpty Red -highlight! link DapUIWatchesValue Green -highlight! link DapUIWatchesError Red -highlight! link DapUIBreakpointsPath Blue -highlight! link DapUIBreakpointsInfo Green -" }}} -" glepnir/lspsaga.nvim {{{ -call everforest#highlight('LspFloatWinBorder', s:palette.bg0, s:palette.bg0) -call everforest#highlight('LspSagaDiagnosticHeader', s:palette.orange, s:palette.none, 'bold') -call everforest#highlight('LspSagaCodeActionTitle', s:palette.purple, s:palette.none, 'bold') -call everforest#highlight('DefinitionPreviewTitle', s:palette.blue, s:palette.none, 'bold') -highlight! link LspSagaDiagnosticError Red -highlight! link LspSagaDiagnosticWarn Yellow -highlight! link LspSagaDiagnosticInfo Blue -highlight! link LspSagaDiagnosticHint Green -highlight! link LspSagaErrorTrunCateLine LspSagaDiagnosticError -highlight! link LspSagaWarnTrunCateLine LspSagaDiagnosticWarn -highlight! link LspSagaInfoTrunCateLine LspSagaDiagnosticInfo -highlight! link LspSagaHintTrunCateLine LspSagaDiagnosticHint -highlight! link LspSagaDiagnosticSource Orange -highlight! link LspSagaDiagnosticBorder Orange -highlight! link LspSagaRenameBorder Purple -highlight! link LspSagaRenamePromptPrefix Blue -highlight! link LspSagaCodeActionBorder Purple -highlight! link LspSagaCodeActionTruncateLine Purple -highlight! link LspSagaCodeActionContent Green -highlight! link LspSagaHoverBorder Green -highlight! link LspSagaDocTruncateLine Green -highlight! link LspSagaSignatureHelpBorder Green -highlight! link LspSagaShTruncateLine Green -highlight! link LspSagaDefPreviewBorder Blue -highlight! link DefinitionIcon Blue -highlight! link LspLinesDiagBorder Yellow -highlight! link LineDiagTuncateLine Yellow -highlight! link LspSagaAutoPreview Green -highlight! link LspSagaFinderSelection Fg -highlight! link DiagnosticWarning DiagnosticWarn -highlight! link DiagnosticInformation DiagnosticInfo -highlight! link ReferencesCount Grey -highlight! link DefinitionCount Grey -highlight! link TargetFileName Grey -" }}} -" b0o/incline.nvim {{{ -call everforest#highlight('InclineNormalNC', s:palette.grey1, s:palette.bg2) -" }}} " echasnovski/mini.nvim {{{ call everforest#highlight('MiniAnimateCursor', s:palette.none, s:palette.none, 'reverse,nocombine') call everforest#highlight('MiniFilesFile', s:palette.fg, s:palette.none) @@ -1516,21 +871,6 @@ highlight! link MiniStatuslineInactive Grey highlight! link MiniSurround IncSearch highlight! link MiniTablineFill TabLineFill " }}} -" ggandor/lightspeed.nvim {{{ -call everforest#highlight('LightspeedLabel', s:palette.red, s:palette.none, 'bold,underline') -call everforest#highlight('LightspeedLabelDistant', s:palette.blue, s:palette.none, 'bold,underline') -call everforest#highlight('LightspeedShortcut', s:palette.bg0, s:palette.red, 'bold') -call everforest#highlight('LightspeedUnlabeledMatch', s:palette.fg, s:palette.none, 'bold') -call everforest#highlight('LightspeedPendingOpArea', s:palette.bg0, s:palette.green) -highlight! link LightspeedMaskedChar Purple -highlight! link LightspeedGreyWash Grey -" }}} -" nvim-neotest/neotest {{{ -highlight! link NeotestPassed GreenSign -highlight! link NeotestFailed RedSign -highlight! link NeotestRunning YellowSign -highlight! link NeotestSkipped BlueSign -" }}} endif " }}} " Extended File Types: {{{ @@ -1564,319 +904,6 @@ else finish endif endif -" syn_begin: vim-plug {{{ -" https://github.com/junegunn/vim-plug -call everforest#highlight('plug1', s:palette.orange, s:palette.none, 'bold') -call everforest#highlight('plugNumber', s:palette.yellow, s:palette.none, 'bold') -highlight! link plug2 Green -highlight! link plugBracket Grey -highlight! link plugName Aqua -highlight! link plugDash Orange -highlight! link plugError Red -highlight! link plugNotLoaded Grey -highlight! link plugRelDate Grey -highlight! link plugH2 Orange -highlight! link plugMessage Orange -highlight! link plugStar Red -highlight! link plugUpdate Blue -highlight! link plugDeleted Grey -highlight! link plugEdge Yellow -highlight! link plugSha Green -" syn_end }}} -" syn_begin: packer {{{ -" https://github.com/wbthomason/packer.nvim -highlight! link packerSuccess Aqua -highlight! link packerFail Red -highlight! link packerStatusSuccess Fg -highlight! link packerStatusFail Fg -highlight! link packerWorking Yellow -highlight! link packerString Yellow -highlight! link packerPackageNotLoaded Grey -highlight! link packerRelDate Grey -highlight! link packerPackageName Green -highlight! link packerOutput Orange -highlight! link packerHash Green -highlight! link packerTimeTrivial Blue -highlight! link packerTimeHigh Red -highlight! link packerTimeMedium Yellow -highlight! link packerTimeLow Green -" syn_end }}} -" syn_begin: coctree {{{ -" https://github.com/neoclide/coc.nvim -highlight! link CocTreeOpenClose Aqua -highlight! link CocTreeDescription Grey -for kind in g:everforest_lsp_kind_color - execute "highlight! link CocSymbol" . kind[0] . " " . kind[1] -endfor -" syn_end }}} -" syn_begin: coc-explorer {{{ -" https://github.com/weirongxu/coc-explorer -highlight! link CocExplorerBufferRoot Orange -highlight! link CocExplorerBufferExpandIcon Aqua -highlight! link CocExplorerBufferBufnr Purple -highlight! link CocExplorerBufferModified Yellow -highlight! link CocExplorerBufferReadonly Red -highlight! link CocExplorerBufferBufname Grey -highlight! link CocExplorerBufferFullpath Grey -highlight! link CocExplorerFileRoot Orange -highlight! link CocExplorerFileRootName Green -highlight! link CocExplorerFileExpandIcon Aqua -highlight! link CocExplorerFileFullpath Grey -highlight! link CocExplorerFileDirectory Green -highlight! link CocExplorerFileGitStaged Purple -highlight! link CocExplorerFileGitUnstaged Yellow -highlight! link CocExplorerFileGitRootStaged Purple -highlight! link CocExplorerFileGitRootUnstaged Yellow -highlight! link CocExplorerGitPathChange Fg -highlight! link CocExplorerGitContentChange Fg -highlight! link CocExplorerGitRenamed Purple -highlight! link CocExplorerGitCopied Fg -highlight! link CocExplorerGitAdded Green -highlight! link CocExplorerGitUntracked Blue -highlight! link CocExplorerGitUnmodified Fg -highlight! link CocExplorerGitUnmerged Orange -highlight! link CocExplorerGitMixed Aqua -highlight! link CocExplorerGitModified Yellow -highlight! link CocExplorerGitDeleted Red -highlight! link CocExplorerGitIgnored Grey -highlight! link CocExplorerFileSize Blue -highlight! link CocExplorerTimeAccessed Aqua -highlight! link CocExplorerTimeCreated Aqua -highlight! link CocExplorerTimeModified Aqua -highlight! link CocExplorerIndentLine Conceal -highlight! link CocExplorerHelpDescription Grey -highlight! link CocExplorerHelpHint Grey -highlight! link CocExplorerDiagnosticError Red -highlight! link CocExplorerDiagnosticWarning Yellow -highlight! link CocExplorerFileHidden Grey -" syn_end }}} -" syn_begin: tagbar {{{ -" https://github.com/majutsushi/tagbar -highlight! link TagbarFoldIcon Green -highlight! link TagbarSignature Green -highlight! link TagbarKind Red -highlight! link TagbarScope Orange -highlight! link TagbarNestedKind Aqua -highlight! link TagbarVisibilityPrivate Red -highlight! link TagbarVisibilityPublic Blue -" syn_end }}} -" syn_begin: vista/vista_kind/vista_markdown {{{ -" https://github.com/liuchengxu/vista.vim -highlight! link VistaBracket Grey -highlight! link VistaChildrenNr Orange -highlight! link VistaScope Red -highlight! link VistaTag Green -highlight! link VistaPrefix Grey -highlight! link VistaIcon Orange -highlight! link VistaScopeKind Yellow -highlight! link VistaColon Grey -highlight! link VistaLineNr Grey -highlight! link VistaHeadNr Fg -highlight! link VistaPublic Green -highlight! link VistaProtected Yellow -highlight! link VistaPrivate Red -" syn_end }}} -" syn_begin: Outline {{{ -" https://github.com/simrat39/symbols-outline.nvim -highlight! link FocusedSymbol NormalFloat -" syn_end }}} -" syn_begin: aerial {{{ -" https://github.com/stevearc/aerial.nvim -highlight! link AerialLine CursorLine -highlight! link AerialGuide LineNr -for kind in g:everforest_lsp_kind_color - execute "highlight! link Aerial" . kind[0] . "Icon " . kind[1] -endfor -" syn_end }}} -" syn_begin: nerdtree {{{ -" https://github.com/preservim/nerdtree -highlight! link NERDTreeDir Green -highlight! link NERDTreeDirSlash Aqua -highlight! link NERDTreeOpenable Orange -highlight! link NERDTreeClosable Orange -highlight! link NERDTreeFile Fg -highlight! link NERDTreeExecFile Yellow -highlight! link NERDTreeUp Grey -highlight! link NERDTreeCWD Aqua -highlight! link NERDTreeHelp LightGrey -highlight! link NERDTreeToggleOn Green -highlight! link NERDTreeToggleOff Red -highlight! link NERDTreeFlags Orange -highlight! link NERDTreeLinkFile Grey -highlight! link NERDTreeLinkTarget Green -" syn_end }}} -" syn_begin: dirvish {{{ -" https://github.com/justinmk/vim-dirvish -highlight! link DirvishPathTail Aqua -highlight! link DirvishArg Yellow -" syn_end }}} -" syn_begin: NvimTree {{{ -" https://github.com/kyazdani42/nvim-tree.lua -if !s:configuration.transparent_background - call everforest#highlight('NvimTreeNormal', s:palette.fg, s:palette.bg_dim) - call everforest#highlight('NvimTreeEndOfBuffer', s:palette.bg_dim, s:palette.bg_dim) - call everforest#highlight('NvimTreeVertSplit', s:palette.bg0, s:palette.bg0) - call everforest#highlight('NvimTreeCursorLine', s:palette.none, s:palette.bg0) -endif -highlight! link NvimTreeSymlink Fg -highlight! link NvimTreeFolderName Green -highlight! link NvimTreeRootFolder Grey -highlight! link NvimTreeFolderIcon Orange -highlight! link NvimTreeEmptyFolderName Green -highlight! link NvimTreeOpenedFolderName Green -highlight! link NvimTreeExecFile Fg -highlight! link NvimTreeOpenedFile Fg -highlight! link NvimTreeSpecialFile Fg -highlight! link NvimTreeImageFile Fg -highlight! link NvimTreeMarkdownFile Fg -highlight! link NvimTreeIndentMarker Grey -highlight! link NvimTreeGitDirty Yellow -highlight! link NvimTreeGitStaged Blue -highlight! link NvimTreeGitMerge Orange -highlight! link NvimTreeGitRenamed Purple -highlight! link NvimTreeGitNew Aqua -highlight! link NvimTreeGitDeleted Red -highlight! link NvimTreeLspDiagnosticsError RedSign -highlight! link NvimTreeLspDiagnosticsWarning YellowSign -highlight! link NvimTreeLspDiagnosticsInformation BlueSign -highlight! link NvimTreeLspDiagnosticsHint GreenSign -" syn_end }}} -" syn_begin: fern {{{ -" https://github.com/lambdalisue/fern.vim -highlight! link FernMarkedLine Purple -highlight! link FernMarkedText Purple -highlight! link FernRootSymbol FernRootText -highlight! link FernRootText Orange -highlight! link FernLeafSymbol FernLeafText -highlight! link FernLeafText Fg -highlight! link FernBranchSymbol FernBranchText -highlight! link FernBranchText Green -highlight! link FernWindowSelectIndicator TabLineSel -highlight! link FernWindowSelectStatusLine TabLine -" syn_end }}} -" syn_begin: neo-tree {{{ -" https://github.com/nvim-neo-tree/neo-tree.nvim -if !s:configuration.transparent_background - call everforest#highlight('NeoTreeNormal', s:palette.fg, s:palette.bg_dim) - call everforest#highlight('NeoTreeEndOfBuffer', s:palette.bg_dim, s:palette.bg_dim) - call everforest#highlight('NeoTreeVertSplit', s:palette.bg0, s:palette.bg0) -endif -highlight! link NeoTreeDirectoryIcon Orange -highlight! link NeoTreeGitAdded Green -highlight! link NeoTreeGitConflict Yellow -highlight! link NeoTreeGitDeleted Red -highlight! link NeoTreeGitIgnored Grey -highlight! link NeoTreeGitModified Blue -highlight! link NeoTreeGitUnstaged Purple -highlight! link NeoTreeGitUntracked Fg -highlight! link NeoTreeGitStaged Purple -highlight! link NeoTreeDimText Grey -highlight! link NeoTreeIndentMarker NonText -highlight! link NeoTreeNormalNC NeoTreeNormal -highlight! link NeoTreeSignColumn NeoTreeNormal -highlight! link NeoTreeRootName Title -if &background ==# 'light' - call everforest#highlight('NeoTreeCursorLine', s:palette.none, s:palette.bg0) -endif -" syn_end }}} -" syn_begin: octo {{{ -" https://github.com/pwntester/octo.nvim -call everforest#highlight('OctoViewer', s:palette.bg0, s:palette.blue) -call everforest#highlight('OctoGreenFloat', s:palette.green, s:palette.bg2) -call everforest#highlight('OctoRedFloat', s:palette.red, s:palette.bg2) -call everforest#highlight('OctoPurpleFloat', s:palette.purple, s:palette.bg2) -call everforest#highlight('OctoYellowFloat', s:palette.yellow, s:palette.bg2) -call everforest#highlight('OctoBlueFloat', s:palette.blue, s:palette.bg2) -call everforest#highlight('OctoGreyFloat', s:palette.grey1, s:palette.bg2) -call everforest#highlight('OctoBubbleGreen', s:palette.bg0, s:palette.green) -call everforest#highlight('OctoBubbleRed', s:palette.bg0, s:palette.red) -call everforest#highlight('OctoBubblePurple', s:palette.bg0, s:palette.purple) -call everforest#highlight('OctoBubbleYellow', s:palette.bg0, s:palette.yellow) -call everforest#highlight('OctoBubbleBlue', s:palette.bg0, s:palette.blue) -call everforest#highlight('OctoBubbleGrey', s:palette.bg0, s:palette.grey1) -highlight! link OctoGreen Green -highlight! link OctoRed Red -highlight! link OctoPurple Purple -highlight! link OctoYellow Yellow -highlight! link OctoBlue Blue -highlight! link OctoGrey Grey -highlight! link OctoBubbleDelimiterGreen Green -highlight! link OctoBubbleDelimiterRed Red -highlight! link OctoBubbleDelimiterPurple Purple -highlight! link OctoBubbleDelimiterYellow Yellow -highlight! link OctoBubbleDelimiterBlue Blue -highlight! link OctoBubbleDelimiterGrey Grey -" syn_end }}} -" syn_begin: netrw {{{ -" https://www.vim.org/scripts/script.php?script_id=1075 -highlight! link netrwDir Green -highlight! link netrwClassify Green -highlight! link netrwLink Grey -highlight! link netrwSymLink Fg -highlight! link netrwExe Yellow -highlight! link netrwComment Grey -highlight! link netrwList Aqua -highlight! link netrwHelpCmd Blue -highlight! link netrwCmdSep Grey -highlight! link netrwVersion Orange -" syn_end }}} -" syn_begin: startify/quickmenu {{{ -" https://github.com/mhinz/vim-startify -" https://github.com/skywind3000/quickmenu.vim -highlight! link StartifyBracket Grey -highlight! link StartifyFile Fg -highlight! link StartifyNumber Orange -highlight! link StartifyPath Green -highlight! link StartifySlash Green -highlight! link StartifySection Yellow -highlight! link StartifyHeader Aqua -highlight! link StartifySpecial Grey -highlight! link StartifyFooter Grey -" syn_end }}} -" syn_begin: quickmenu {{{ -" https://github.com/skywind3000/quickmenu.vim -highlight! link QuickmenuOption Green -highlight! link QuickmenuNumber Red -highlight! link QuickmenuBracket Grey -highlight! link QuickmenuHelp Green -highlight! link QuickmenuSpecial Purple -highlight! link QuickmenuHeader Orange -" syn_end }}} -" syn_begin: undotree {{{ -" https://github.com/mbbill/undotree -call everforest#highlight('UndotreeSavedBig', s:palette.purple, s:palette.none, 'bold') -highlight! link UndotreeNode Orange -highlight! link UndotreeNodeCurrent Red -highlight! link UndotreeSeq Green -highlight! link UndotreeNext Blue -highlight! link UndotreeTimeStamp Grey -highlight! link UndotreeHead Yellow -highlight! link UndotreeBranch Yellow -highlight! link UndotreeCurrent Aqua -highlight! link UndotreeSavedSmall Purple -" syn_end }}} -" syn_begin: NeogitStatus/NeogitCommitView {{{ -" https://github.com/TimUntersberger/neogit -highlight! link NeogitNotificationInfo Blue -highlight! link NeogitNotificationWarning Yellow -highlight! link NeogitNotificationError Red -highlight! link NeogitDiffAdd Green -highlight! link NeogitDiffDelete Red -highlight! link NeogitDiffContextHighlight CursorLine -highlight! link NeogitHunkHeaderHighlight TabLine -highlight! link NeogitHunkHeader TabLineFill -highlight! link NeogitCommandCodeNormal Green -highlight! link NeogitCommandCodeError Red -highlight! link NeogitCommitViewHeader diffIndexLine -highlight! link NeogitFilePath diffFile -" syn_end }}} -" syn_begin: dashboard {{{ -" https://github.com/glepnir/dashboard-nvim -highlight! link DashboardHeader Yellow -highlight! link DashboardCenter Green -highlight! link DashboardShortcut Red -highlight! link DashboardFooter Orange -" syn_end }}} " syn_begin: markdown {{{ " builtin: {{{ call everforest#highlight('markdownH1', s:palette.red, s:palette.none, 'bold') @@ -3202,19 +2229,6 @@ highlight! link NeotestMarked Orange highlight! link NeotestTarget Red endif " syn_end }}} -" syn_begin: mason {{{ -" https://github.com/williamboman/mason.nvim -call everforest#highlight('MasonHeader', s:palette.bg0, s:palette.green, 'bold') -call everforest#highlight('MasonHeaderSecondary', s:palette.bg0, s:palette.orange, 'bold') -highlight! link MasonHighlight Green -highlight! link MasonHighlightSecondary Yellow -call everforest#highlight('MasonHighlightBlock', s:palette.bg0, s:palette.aqua) -call everforest#highlight('MasonHighlightBlockBold', s:palette.bg0, s:palette.aqua, 'bold') -call everforest#highlight('MasonHighlightBlockSecondary', s:palette.bg0, s:palette.yellow) -call everforest#highlight('MasonHighlightBlockBoldSecondary', s:palette.bg0, s:palette.yellow, 'bold') -call everforest#highlight('MasonMuted', s:palette.grey0, s:palette.none) -call everforest#highlight('MasonMutedBlock', s:palette.bg0, s:palette.grey0) -" syn_end }}} " }}} " vim: set sw=2 ts=2 sts=2 et tw=80 ft=vim fdm=marker fmr={{{,}}}: diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 5054a5d..25a723e 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -1,64 +1,34 @@ --- Bootstrap lazy.nvim local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not (vim.uv or vim.loop).fs_stat(lazypath) then - local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", "https://github.com/folke/lazy.nvim.git", lazypath }) + local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", "https://github.com/folke/lazy.nvim.git", lazypath }) end vim.opt.rtp:prepend(lazypath) -vim.g.mapleader = " " require("lazy").setup({ - spec = { - "neovim/nvim-lspconfig", - "nvim-treesitter/nvim-treesitter", - "cohama/lexima.vim", - "DarthMoomancer/Polydev", - "nvim-telescope/telescope.nvim", - "nvim-lua/plenary.nvim", - { "saghen/blink.cmp", version = "v1.*", opts = { - completion = { - ghost_text = { - enabled = true - } - } - } - }, - checker = { enabled = true }, - }, + spec = { + "cohama/lexima.vim", + { "echasnovski/mini.pick", version = '*' }, + { "saghen/blink.cmp", version = "v1.*", opts = {} }, + } }) -vim.opt.mouse = "" -vim.opt.completeopt = "noselect" -vim.opt.termguicolors = true -vim.opt.wrap = false -vim.opt.relativenumber = true -vim.opt.scrolloff = 8 -vim.opt.sidescrolloff = 8 -vim.opt.hlsearch = false -vim.opt.swapfile = false -vim.opt.clipboard = unnamedplus +require('mini.pick').setup() + +vim.g.mapleader = " " +vim.o.termguicolors = true +vim.o.number = true +vim.o.relativenumber = true +vim.o.wrap = false +vim.o.swapfile = false +vim.o.signcolumn = "yes" +vim.o.scrolloff = 8 +vim.o.sidescrolloff = 8 +vim.o.hlsearch = false +vim.o.completeopt = { "menuone", "noselect", "popup" } + +vim.lsp.enable({ "lua_ls", "clangd" }) +vim.cmd.colorscheme('everforest') vim.keymap.set("v", "J", ":m '>+1gv=gv") vim.keymap.set("v", "K", ":m '<-2gv=gv") -vim.keymap.set("x", "p", [["_dP]]) -vim.keymap.set("n", "ff", "gg=G") -vim.keymap.set('n', '', ":Telescope find_files", { desc = 'Telescope find files' }) -vim.keymap.set('n', 'xg', ":Telescope live_grep", { desc = 'Telescope live grep' }) -vim.keymap.set('n', 'xh', ":Telescope help_tags", { desc = 'Telescope help tags' }) -vim.keymap.set("n", "xc", "cclose") -vim.keymap.set("n", "xx", function() - vim.diagnostic.setqflist({ open = true }) -end, { desc = "Show diagnostics in quickfix" }) - -vim.cmd.colorscheme('everforest') -vim.lsp.enable({ "lua_ls", "clangd" }) - -vim.api.nvim_create_autocmd("FileType", { - pattern = "qf", - callback = function() - vim.api.nvim_buf_set_keymap(0, "n", "", ":cclose", { noremap = true, silent = true }) - end, -}) - -require("nvim-treesitter.configs").setup({ - highlight = { enable = true }, - indent = { enable = true } -}) +vim.keymap.set("n", "ff", "ggVG=") +vim.keymap.set('n', '', ":Pick files") diff --git a/.config/nvim/lsp/clangd.lua b/.config/nvim/lsp/clangd.lua new file mode 100644 index 0000000..8dac457 --- /dev/null +++ b/.config/nvim/lsp/clangd.lua @@ -0,0 +1,99 @@ +---@brief +--- +--- https://clangd.llvm.org/installation.html +--- +--- - **NOTE:** Clang >= 11 is recommended! See [#23](https://github.com/neovim/nvim-lspconfig/issues/23). +--- - If `compile_commands.json` lives in a build directory, you should +--- symlink it to the root of your source tree. +--- ``` +--- ln -s /path/to/myproject/build/compile_commands.json /path/to/myproject/ +--- ``` +--- - clangd relies on a [JSON compilation database](https://clang.llvm.org/docs/JSONCompilationDatabase.html) +--- specified as compile_commands.json, see https://clangd.llvm.org/installation#compile_commandsjson + +-- https://clangd.llvm.org/extensions.html#switch-between-sourceheader +local function switch_source_header(bufnr) + local method_name = 'textDocument/switchSourceHeader' + local client = vim.lsp.get_clients({ bufnr = bufnr, name = 'clangd' })[1] + if not client then + return vim.notify(('method %s is not supported by any servers active on the current buffer'):format(method_name)) + end + local params = vim.lsp.util.make_text_document_params(bufnr) + client.request(method_name, params, function(err, result) + if err then + error(tostring(err)) + end + if not result then + vim.notify('corresponding file cannot be determined') + return + end + vim.cmd.edit(vim.uri_to_fname(result)) + end, bufnr) +end + +local function symbol_info() + local bufnr = vim.api.nvim_get_current_buf() + local clangd_client = vim.lsp.get_clients({ bufnr = bufnr, name = 'clangd' })[1] + if not clangd_client or not clangd_client.supports_method 'textDocument/symbolInfo' then + return vim.notify('Clangd client not found', vim.log.levels.ERROR) + end + local win = vim.api.nvim_get_current_win() + local params = vim.lsp.util.make_position_params(win, clangd_client.offset_encoding) + clangd_client.request('textDocument/symbolInfo', params, function(err, res) + if err or #res == 0 then + -- Clangd always returns an error, there is not reason to parse it + return + end + local container = string.format('container: %s', res[1].containerName) ---@type string + local name = string.format('name: %s', res[1].name) ---@type string + vim.lsp.util.open_floating_preview({ name, container }, '', { + height = 2, + width = math.max(string.len(name), string.len(container)), + focusable = false, + focus = false, + border = 'single', + title = 'Symbol Info', + }) + end, bufnr) +end + +---@class ClangdInitializeResult: lsp.InitializeResult +---@field offsetEncoding? string + +return { + cmd = { 'clangd' }, + filetypes = { 'c', 'cpp', 'objc', 'objcpp', 'cuda' }, + root_markers = { + '.clangd', + '.clang-tidy', + '.clang-format', + 'compile_commands.json', + 'compile_flags.txt', + 'configure.ac', -- AutoTools + '.git', + }, + capabilities = { + textDocument = { + completion = { + editsNearCursor = true, + }, + }, + offsetEncoding = { 'utf-8', 'utf-16' }, + }, + ---@param client vim.lsp.Client + ---@param init_result ClangdInitializeResult + on_init = function(client, init_result) + if init_result.offsetEncoding then + client.offset_encoding = init_result.offsetEncoding + end + end, + on_attach = function(_, bufnr) + vim.api.nvim_buf_create_user_command(bufnr, 'LspClangdSwitchSourceHeader', function() + switch_source_header(bufnr) + end, { desc = 'Switch between source/header' }) + + vim.api.nvim_buf_create_user_command(bufnr, 'LspClangdShowSymbolInfo', function() + symbol_info() + end, { desc = 'Show symbol info' }) + end, +} diff --git a/.config/nvim/lsp/lua_ls.lua b/.config/nvim/lsp/lua_ls.lua new file mode 100644 index 0000000..b8dc67c --- /dev/null +++ b/.config/nvim/lsp/lua_ls.lua @@ -0,0 +1,21 @@ +return { + cmd = { 'lua-language-server' }, + filetypes = { 'lua' }, + settings = { + Lua = { + diagnostics = { + globals = { "vim" } + } + } + }, + root_markers = { + '.luarc.json', + '.luarc.jsonc', + '.luacheckrc', + '.stylua.toml', + 'stylua.toml', + 'selene.toml', + 'selene.yml', + '.git', + }, +} diff --git a/.config/suckless/dmenu/Makefile b/.config/suckless/dmenu/Makefile index 458c524..2509063 100644 --- a/.config/suckless/dmenu/Makefile +++ b/.config/suckless/dmenu/Makefile @@ -1,58 +1,31 @@ -# dmenu - dynamic menu -# See LICENSE file for copyright and license details. - include config.mk -SRC = drw.c dmenu.c stest.c util.c +SRC = drw.c dmenu.c util.c OBJ = $(SRC:.c=.o) -all: dmenu stest +all: dmenu .c.o: $(CC) -c $(CFLAGS) $< -config.h: - cp config.def.h $@ - $(OBJ): arg.h config.h config.mk drw.h dmenu: dmenu.o drw.o util.o $(CC) -o $@ dmenu.o drw.o util.o $(LDFLAGS) -stest: stest.o - $(CC) -o $@ stest.o $(LDFLAGS) - clean: - rm -f dmenu stest $(OBJ) dmenu-$(VERSION).tar.gz - -dist: clean - mkdir -p dmenu-$(VERSION) - cp LICENSE Makefile README arg.h config.def.h config.mk dmenu.1\ - drw.h util.h dmenu_path dmenu_run stest.1 $(SRC)\ - dmenu-$(VERSION) - tar -cf dmenu-$(VERSION).tar dmenu-$(VERSION) - gzip dmenu-$(VERSION).tar - rm -rf dmenu-$(VERSION) + rm -f dmenu stest $(OBJ) install: all mkdir -p $(DESTDIR)$(PREFIX)/bin - cp -f dmenu dmenu_path dmenu_run stest $(DESTDIR)$(PREFIX)/bin + cp -f dmenu dmenu_path dmenu_run $(DESTDIR)$(PREFIX)/bin chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu_path chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu_run - chmod 755 $(DESTDIR)$(PREFIX)/bin/stest - mkdir -p $(DESTDIR)$(MANPREFIX)/man1 - sed "s/VERSION/$(VERSION)/g" < dmenu.1 > $(DESTDIR)$(MANPREFIX)/man1/dmenu.1 - sed "s/VERSION/$(VERSION)/g" < stest.1 > $(DESTDIR)$(MANPREFIX)/man1/stest.1 - chmod 644 $(DESTDIR)$(MANPREFIX)/man1/dmenu.1 - chmod 644 $(DESTDIR)$(MANPREFIX)/man1/stest.1 uninstall: rm -f $(DESTDIR)$(PREFIX)/bin/dmenu\ $(DESTDIR)$(PREFIX)/bin/dmenu_path\ $(DESTDIR)$(PREFIX)/bin/dmenu_run\ - $(DESTDIR)$(PREFIX)/bin/stest\ - $(DESTDIR)$(MANPREFIX)/man1/dmenu.1\ - $(DESTDIR)$(MANPREFIX)/man1/stest.1 -.PHONY: all clean dist install uninstall +.PHONY: all clean install uninstall diff --git a/.config/suckless/dmenu/config.def.h b/.config/suckless/dmenu/config.def.h deleted file mode 100644 index b0dcf68..0000000 --- a/.config/suckless/dmenu/config.def.h +++ /dev/null @@ -1,15 +0,0 @@ -#include "/home/andrew/.config/suckless/dwm/themes/everforest.h" -static int topbar = 1; /* -b option; if 0, dmenu appears at bottom */ -static const char *fonts[] = { - "CaskaydiaCove NFM style:SemiBold:size=11" -}; -static const char *prompt = NULL; /* -p option; prompt to the left of input field */ -static const char *colors[SchemeLast][2] = { - [SchemeNorm] = { foreground, background }, - [SchemeSel] = { background, yellow }, - [SchemeOut] = { red, background }, -}; - -static unsigned int lines = 0; -static unsigned int columns = 0; -static const char worddelimiters[] = " "; diff --git a/.config/suckless/dmenu/config.h b/.config/suckless/dmenu/config.h index b0dcf68..8bb8e77 100644 --- a/.config/suckless/dmenu/config.h +++ b/.config/suckless/dmenu/config.h @@ -1,13 +1,12 @@ -#include "/home/andrew/.config/suckless/dwm/themes/everforest.h" static int topbar = 1; /* -b option; if 0, dmenu appears at bottom */ static const char *fonts[] = { "CaskaydiaCove NFM style:SemiBold:size=11" }; static const char *prompt = NULL; /* -p option; prompt to the left of input field */ static const char *colors[SchemeLast][2] = { - [SchemeNorm] = { foreground, background }, - [SchemeSel] = { background, yellow }, - [SchemeOut] = { red, background }, + [SchemeNorm] = { "#D3C6AA", "#272E33" }, + [SchemeSel] = { "#272E33", "#DBBC7F" }, + [SchemeOut] = { "#E67E80", "#272E33" }, }; static unsigned int lines = 0; diff --git a/.config/suckless/dmenu/config.mk b/.config/suckless/dmenu/config.mk index 137f7c8..a6b7536 100644 --- a/.config/suckless/dmenu/config.mk +++ b/.config/suckless/dmenu/config.mk @@ -1,32 +1,18 @@ -# dmenu version VERSION = 5.3 -# paths PREFIX = /usr/local -MANPREFIX = $(PREFIX)/share/man X11INC = /usr/X11R6/include X11LIB = /usr/X11R6/lib -# Xinerama, comment if you don't want it -XINERAMALIBS = -lXinerama -XINERAMAFLAGS = -DXINERAMA - -# freetype FREETYPELIBS = -lfontconfig -lXft FREETYPEINC = /usr/include/freetype2 -# OpenBSD (uncomment) -#FREETYPEINC = $(X11INC)/freetype2 -#MANPREFIX = ${PREFIX}/man -# includes and libs INCS = -I$(X11INC) -I$(FREETYPEINC) -LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS) +LIBS = -L$(X11LIB) -lX11 $(FREETYPELIBS) -# flags -CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS) +CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" CFLAGS = -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS) LDFLAGS = $(LIBS) -# compiler and linker -CC = cc +CC = gcc diff --git a/.config/suckless/dmenu/dmenu b/.config/suckless/dmenu/dmenu deleted file mode 100755 index 072a8f3..0000000 Binary files a/.config/suckless/dmenu/dmenu and /dev/null differ diff --git a/.config/suckless/dmenu/dmenu.1 b/.config/suckless/dmenu/dmenu.1 deleted file mode 100644 index d0a734a..0000000 --- a/.config/suckless/dmenu/dmenu.1 +++ /dev/null @@ -1,199 +0,0 @@ -.TH DMENU 1 dmenu\-VERSION -.SH NAME -dmenu \- dynamic menu -.SH SYNOPSIS -.B dmenu -.RB [ \-bfiv ] -.RB [ \-g -.IR columns ] -.RB [ \-l -.IR lines ] -.RB [ \-m -.IR monitor ] -.RB [ \-p -.IR prompt ] -.RB [ \-fn -.IR font ] -.RB [ \-nb -.IR color ] -.RB [ \-nf -.IR color ] -.RB [ \-sb -.IR color ] -.RB [ \-sf -.IR color ] -.RB [ \-w -.IR windowid ] -.P -.BR dmenu_run " ..." -.SH DESCRIPTION -.B dmenu -is a dynamic menu for X, which reads a list of newline\-separated items from -stdin. When the user selects an item and presses Return, their choice is printed -to stdout and dmenu terminates. Entering text will narrow the items to those -matching the tokens in the input. -.P -.B dmenu_run -is a script used by -.IR dwm (1) -which lists programs in the user's $PATH and runs the result in their $SHELL. -.SH OPTIONS -.TP -.B \-b -dmenu appears at the bottom of the screen. -.TP -.B \-f -dmenu grabs the keyboard before reading stdin if not reading from a tty. This -is faster, but will lock up X until stdin reaches end\-of\-file. -.TP -.B \-i -dmenu matches menu items case insensitively. -.TP -.BI \-g " columns" -dmenu lists items in a grid with the given number of columns. -.TP -.BI \-l " lines" -dmenu lists items in a grid with the given number of lines. -.TP -.BI \-m " monitor" -dmenu is displayed on the monitor number supplied. Monitor numbers are starting -from 0. -.TP -.BI \-p " prompt" -defines the prompt to be displayed to the left of the input field. -.TP -.BI \-fn " font" -defines the font or font set used. -.TP -.BI \-nb " color" -defines the normal background color. -.IR #RGB , -.IR #RRGGBB , -and X color names are supported. -.TP -.BI \-nf " color" -defines the normal foreground color. -.TP -.BI \-sb " color" -defines the selected background color. -.TP -.BI \-sf " color" -defines the selected foreground color. -.TP -.B \-v -prints version information to stdout, then exits. -.TP -.BI \-w " windowid" -embed into windowid. -.SH USAGE -dmenu is completely controlled by the keyboard. Items are selected using the -arrow keys, page up, page down, home, and end. -.TP -.B Tab -Copy the selected item to the input field. -.TP -.B Return -Confirm selection. Prints the selected item to stdout and exits, returning -success. -.TP -.B Ctrl-Return -Confirm selection. Prints the selected item to stdout and continues. -.TP -.B Shift\-Return -Confirm input. Prints the input text to stdout and exits, returning success. -.TP -.B Escape -Exit without selecting an item, returning failure. -.TP -.B Ctrl-Left -Move cursor to the start of the current word -.TP -.B Ctrl-Right -Move cursor to the end of the current word -.TP -.B C\-a -Home -.TP -.B C\-b -Left -.TP -.B C\-c -Escape -.TP -.B C\-d -Delete -.TP -.B C\-e -End -.TP -.B C\-f -Right -.TP -.B C\-g -Escape -.TP -.B C\-h -Backspace -.TP -.B C\-i -Tab -.TP -.B C\-j -Return -.TP -.B C\-J -Shift-Return -.TP -.B C\-k -Delete line right -.TP -.B C\-m -Return -.TP -.B C\-M -Shift-Return -.TP -.B C\-n -Down -.TP -.B C\-p -Up -.TP -.B C\-u -Delete line left -.TP -.B C\-w -Delete word left -.TP -.B C\-y -Paste from primary X selection -.TP -.B C\-Y -Paste from X clipboard -.TP -.B M\-b -Move cursor to the start of the current word -.TP -.B M\-f -Move cursor to the end of the current word -.TP -.B M\-g -Home -.TP -.B M\-G -End -.TP -.B M\-h -Up -.TP -.B M\-j -Page down -.TP -.B M\-k -Page up -.TP -.B M\-l -Down -.SH SEE ALSO -.IR dwm (1), -.IR stest (1) diff --git a/.config/suckless/dmenu/dmenu.c b/.config/suckless/dmenu/dmenu.c index abf3c63..3bb03e8 100644 --- a/.config/suckless/dmenu/dmenu.c +++ b/.config/suckless/dmenu/dmenu.c @@ -1,4 +1,3 @@ -/* See LICENSE file for copyright and license details. */ #include #include #include @@ -11,9 +10,6 @@ #include #include #include -#ifdef XINERAMA -#include -#endif #include #include "drw.h" @@ -670,11 +666,6 @@ setup(void) Window w, dw, *dws; XWindowAttributes wa; XClassHint ch = {"dmenu", "dmenu"}; -#ifdef XINERAMA - XineramaScreenInfo *info; - Window pw; - int a, di, n, area = 0; -#endif /* init appearance */ for (j = 0; j < SchemeLast; j++) scheme[j] = drw_scm_create(drw, colors[j], 2); @@ -686,38 +677,6 @@ setup(void) bh = drw->fonts->h + 2; lines = MAX(lines, 0); mh = (lines + 1) * bh; -#ifdef XINERAMA - i = 0; - if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) { - XGetInputFocus(dpy, &w, &di); - if (mon >= 0 && mon < n) - i = mon; - else if (w != root && w != PointerRoot && w != None) { - /* find top-level window containing current input focus */ - do { - if (XQueryTree(dpy, (pw = w), &dw, &w, &dws, &du) && dws) - XFree(dws); - } while (w != root && w != pw); - /* find xinerama screen with which the window intersects most */ - if (XGetWindowAttributes(dpy, pw, &wa)) - for (j = 0; j < n; j++) - if ((a = INTERSECT(wa.x, wa.y, wa.width, wa.height, info[j])) > area) { - area = a; - i = j; - } - } - /* no focused window is on screen, so use pointer location instead */ - if (mon < 0 && !area && XQueryPointer(dpy, root, &dw, &dw, &x, &y, &di, &di, &du)) - for (i = 0; i < n; i++) - if (INTERSECT(x, y, 1, 1, info[i]) != 0) - break; - - x = info[i].x_org; - y = info[i].y_org + (topbar ? 0 : info[i].height - mh); - mw = info[i].width; - XFree(info); - } else -#endif { if (!XGetWindowAttributes(dpy, parentwin, &wa)) die("could not get embedding window attributes: 0x%lx", @@ -830,11 +789,6 @@ main(int argc, char *argv[]) die("no fonts could be loaded."); lrpad = drw->fonts->h; -#ifdef __OpenBSD__ - if (pledge("stdio rpath", NULL) == -1) - die("pledge"); -#endif - if (fast && !isatty(0)) { grabkeyboard(); readstdin(); diff --git a/.config/suckless/dmenu/dmenu.o b/.config/suckless/dmenu/dmenu.o deleted file mode 100644 index 4ca0b32..0000000 Binary files a/.config/suckless/dmenu/dmenu.o and /dev/null differ diff --git a/.config/suckless/dmenu/dmenu_path b/.config/suckless/dmenu/dmenu_path index 3a7cda7..b17bf21 100755 --- a/.config/suckless/dmenu/dmenu_path +++ b/.config/suckless/dmenu/dmenu_path @@ -6,8 +6,4 @@ cache="$cachedir/dmenu_run" [ ! -e "$cachedir" ] && mkdir -p "$cachedir" IFS=: -if stest -dqr -n "$cache" $PATH; then - stest -flx $PATH | sort -u | tee "$cache" -else - cat "$cache" -fi +cat "$cache" diff --git a/.config/suckless/dmenu/drw.o b/.config/suckless/dmenu/drw.o deleted file mode 100644 index 69dbfa9..0000000 Binary files a/.config/suckless/dmenu/drw.o and /dev/null differ diff --git a/.config/suckless/dmenu/patches/dmenu-grid-4.9.diff b/.config/suckless/dmenu/patches/dmenu-grid-4.9.diff deleted file mode 100644 index 5f7c02b..0000000 --- a/.config/suckless/dmenu/patches/dmenu-grid-4.9.diff +++ /dev/null @@ -1,108 +0,0 @@ -From 39ab9676914bd0d8105d0f96bbd7611a53077438 Mon Sep 17 00:00:00 2001 -From: Miles Alan -Date: Sat, 4 Jul 2020 11:19:04 -0500 -Subject: [PATCH] Add -g option to display entries in the given number of grid - columns - -This option can be used in conjunction with -l to format dmenu's options in -arbitrary size grids. For example, to create a 4 column by 6 line grid, you -could use: dmenu -g 4 -l 6 ---- - config.def.h | 3 ++- - dmenu.1 | 7 ++++++- - dmenu.c | 22 ++++++++++++++++------ - 3 files changed, 24 insertions(+), 8 deletions(-) - -diff --git a/config.def.h b/config.def.h -index 1edb647..96cf3c9 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -13,8 +13,9 @@ static const char *colors[SchemeLast][2] = { - [SchemeSel] = { "#eeeeee", "#005577" }, - [SchemeOut] = { "#000000", "#00ffff" }, - }; --/* -l option; if nonzero, dmenu uses vertical list with given number of lines */ -+/* -l and -g options; controls number of lines and columns in grid if > 0 */ - static unsigned int lines = 0; -+static unsigned int columns = 0; - - /* - * Characters not considered part of a word while deleting words -diff --git a/dmenu.1 b/dmenu.1 -index 323f93c..d0a734a 100644 ---- a/dmenu.1 -+++ b/dmenu.1 -@@ -4,6 +4,8 @@ dmenu \- dynamic menu - .SH SYNOPSIS - .B dmenu - .RB [ \-bfiv ] -+.RB [ \-g -+.IR columns ] - .RB [ \-l - .IR lines ] - .RB [ \-m -@@ -47,8 +49,11 @@ is faster, but will lock up X until stdin reaches end\-of\-file. - .B \-i - dmenu matches menu items case insensitively. - .TP -+.BI \-g " columns" -+dmenu lists items in a grid with the given number of columns. -+.TP - .BI \-l " lines" --dmenu lists items vertically, with the given number of lines. -+dmenu lists items in a grid with the given number of lines. - .TP - .BI \-m " monitor" - dmenu is displayed on the monitor number supplied. Monitor numbers are starting -diff --git a/dmenu.c b/dmenu.c -index 6b8f51b..d79b6bb 100644 ---- a/dmenu.c -+++ b/dmenu.c -@@ -77,7 +77,7 @@ calcoffsets(void) - int i, n; - - if (lines > 0) -- n = lines * bh; -+ n = lines * columns * bh; - else - n = mw - (promptw + inputw + TEXTW("<") + TEXTW(">")); - /* calculate which items will begin the next page and previous page */ -@@ -152,9 +152,15 @@ drawmenu(void) - } - - if (lines > 0) { -- /* draw vertical list */ -- for (item = curr; item != next; item = item->right) -- drawitem(item, x, y += bh, mw - x); -+ /* draw grid */ -+ int i = 0; -+ for (item = curr; item != next; item = item->right, i++) -+ drawitem( -+ item, -+ x + ((i / lines) * ((mw - x) / columns)), -+ y + (((i % lines) + 1) * bh), -+ (mw - x) / columns -+ ); - } else if (matches) { - /* draw horizontal list */ - x += inputw; -@@ -708,9 +714,13 @@ main(int argc, char *argv[]) - } else if (i + 1 == argc) - usage(); - /* these options take one argument */ -- else if (!strcmp(argv[i], "-l")) /* number of lines in vertical list */ -+ else if (!strcmp(argv[i], "-g")) { /* number of columns in grid */ -+ columns = atoi(argv[++i]); -+ if (lines == 0) lines = 1; -+ } else if (!strcmp(argv[i], "-l")) { /* number of lines in grid */ - lines = atoi(argv[++i]); -- else if (!strcmp(argv[i], "-m")) -+ if (columns == 0) columns = 1; -+ } else if (!strcmp(argv[i], "-m")) - mon = atoi(argv[++i]); - else if (!strcmp(argv[i], "-p")) /* adds prompt to left of input field */ - prompt = argv[++i]; --- -2.23.1 - - diff --git a/.config/suckless/dmenu/patches/dmenu-gridnav-5.2.diff b/.config/suckless/dmenu/patches/dmenu-gridnav-5.2.diff deleted file mode 100644 index 7adc36f..0000000 --- a/.config/suckless/dmenu/patches/dmenu-gridnav-5.2.diff +++ /dev/null @@ -1,69 +0,0 @@ -diff --git a/dmenu.c b/dmenu.c -index 027dddb..0b92f1f 100644 ---- a/dmenu.c -+++ b/dmenu.c -@@ -334,6 +334,8 @@ keypress(XKeyEvent *ev) - int len; - KeySym ksym = NoSymbol; - Status status; -+ int i, offscreen = 0; -+ struct item *tmpsel; - - len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status); - switch (status) { -@@ -465,6 +467,27 @@ insert: - calcoffsets(); - break; - case XK_Left: -+ if (columns > 1) { -+ if (!sel) -+ return; -+ tmpsel = sel; -+ for (i = 0; i < lines; i++) { -+ if (!tmpsel->left || tmpsel->left->right != tmpsel) { -+ if (offscreen) -+ break; -+ return; -+ } -+ if (tmpsel == curr) -+ offscreen = 1; -+ tmpsel = tmpsel->left; -+ } -+ sel = tmpsel; -+ if (offscreen) { -+ curr = prev; -+ calcoffsets(); -+ } -+ break; -+ } - case XK_KP_Left: - if (cursor > 0 && (!sel || !sel->left || lines > 0)) { - cursor = nextrune(-1); -@@ -505,6 +528,27 @@ insert: - sel->out = 1; - break; - case XK_Right: -+ if (columns > 1) { -+ if (!sel) -+ return; -+ tmpsel = sel; -+ for (i = 0; i < lines; i++) { -+ if (!tmpsel->right || tmpsel->right->left != tmpsel) { -+ if (offscreen) -+ break; -+ return; -+ } -+ tmpsel = tmpsel->right; -+ if (tmpsel == next) -+ offscreen = 1; -+ } -+ sel = tmpsel; -+ if (offscreen) { -+ curr = next; -+ calcoffsets(); -+ } -+ break; -+ } - case XK_KP_Right: - if (text[cursor] != '\0') { - cursor = nextrune(+1); diff --git a/.config/suckless/dmenu/stest b/.config/suckless/dmenu/stest deleted file mode 100755 index 047c186..0000000 Binary files a/.config/suckless/dmenu/stest and /dev/null differ diff --git a/.config/suckless/dmenu/stest.1 b/.config/suckless/dmenu/stest.1 deleted file mode 100644 index 2667d8a..0000000 --- a/.config/suckless/dmenu/stest.1 +++ /dev/null @@ -1,90 +0,0 @@ -.TH STEST 1 dmenu\-VERSION -.SH NAME -stest \- filter a list of files by properties -.SH SYNOPSIS -.B stest -.RB [ -abcdefghlpqrsuwx ] -.RB [ -n -.IR file ] -.RB [ -o -.IR file ] -.RI [ file ...] -.SH DESCRIPTION -.B stest -takes a list of files and filters by the files' properties, analogous to -.IR test (1). -Files which pass all tests are printed to stdout. If no files are given, stest -reads files from stdin. -.SH OPTIONS -.TP -.B \-a -Test hidden files. -.TP -.B \-b -Test that files are block specials. -.TP -.B \-c -Test that files are character specials. -.TP -.B \-d -Test that files are directories. -.TP -.B \-e -Test that files exist. -.TP -.B \-f -Test that files are regular files. -.TP -.B \-g -Test that files have their set-group-ID flag set. -.TP -.B \-h -Test that files are symbolic links. -.TP -.B \-l -Test the contents of a directory given as an argument. -.TP -.BI \-n " file" -Test that files are newer than -.IR file . -.TP -.BI \-o " file" -Test that files are older than -.IR file . -.TP -.B \-p -Test that files are named pipes. -.TP -.B \-q -No files are printed, only the exit status is returned. -.TP -.B \-r -Test that files are readable. -.TP -.B \-s -Test that files are not empty. -.TP -.B \-u -Test that files have their set-user-ID flag set. -.TP -.B \-v -Invert the sense of tests, only failing files pass. -.TP -.B \-w -Test that files are writable. -.TP -.B \-x -Test that files are executable. -.SH EXIT STATUS -.TP -.B 0 -At least one file passed all tests. -.TP -.B 1 -No files passed all tests. -.TP -.B 2 -An error occurred. -.SH SEE ALSO -.IR dmenu (1), -.IR test (1) diff --git a/.config/suckless/dmenu/stest.c b/.config/suckless/dmenu/stest.c deleted file mode 100644 index e27d3a5..0000000 --- a/.config/suckless/dmenu/stest.c +++ /dev/null @@ -1,109 +0,0 @@ -/* See LICENSE file for copyright and license details. */ -#include - -#include -#include -#include -#include -#include -#include - -#include "arg.h" -char *argv0; - -#define FLAG(x) (flag[(x)-'a']) - -static void test(const char *, const char *); -static void usage(void); - -static int match = 0; -static int flag[26]; -static struct stat old, new; - -static void -test(const char *path, const char *name) -{ - struct stat st, ln; - - if ((!stat(path, &st) && (FLAG('a') || name[0] != '.') /* hidden files */ - && (!FLAG('b') || S_ISBLK(st.st_mode)) /* block special */ - && (!FLAG('c') || S_ISCHR(st.st_mode)) /* character special */ - && (!FLAG('d') || S_ISDIR(st.st_mode)) /* directory */ - && (!FLAG('e') || access(path, F_OK) == 0) /* exists */ - && (!FLAG('f') || S_ISREG(st.st_mode)) /* regular file */ - && (!FLAG('g') || st.st_mode & S_ISGID) /* set-group-id flag */ - && (!FLAG('h') || (!lstat(path, &ln) && S_ISLNK(ln.st_mode))) /* symbolic link */ - && (!FLAG('n') || st.st_mtime > new.st_mtime) /* newer than file */ - && (!FLAG('o') || st.st_mtime < old.st_mtime) /* older than file */ - && (!FLAG('p') || S_ISFIFO(st.st_mode)) /* named pipe */ - && (!FLAG('r') || access(path, R_OK) == 0) /* readable */ - && (!FLAG('s') || st.st_size > 0) /* not empty */ - && (!FLAG('u') || st.st_mode & S_ISUID) /* set-user-id flag */ - && (!FLAG('w') || access(path, W_OK) == 0) /* writable */ - && (!FLAG('x') || access(path, X_OK) == 0)) != FLAG('v')) { /* executable */ - if (FLAG('q')) - exit(0); - match = 1; - puts(name); - } -} - -static void -usage(void) -{ - fprintf(stderr, "usage: %s [-abcdefghlpqrsuvwx] " - "[-n file] [-o file] [file...]\n", argv0); - exit(2); /* like test(1) return > 1 on error */ -} - -int -main(int argc, char *argv[]) -{ - struct dirent *d; - char path[PATH_MAX], *line = NULL, *file; - size_t linesiz = 0; - ssize_t n; - DIR *dir; - int r; - - ARGBEGIN { - case 'n': /* newer than file */ - case 'o': /* older than file */ - file = EARGF(usage()); - if (!(FLAG(ARGC()) = !stat(file, (ARGC() == 'n' ? &new : &old)))) - perror(file); - break; - default: - /* miscellaneous operators */ - if (strchr("abcdefghlpqrsuvwx", ARGC())) - FLAG(ARGC()) = 1; - else - usage(); /* unknown flag */ - } ARGEND; - - if (!argc) { - /* read list from stdin */ - while ((n = getline(&line, &linesiz, stdin)) > 0) { - if (line[n - 1] == '\n') - line[n - 1] = '\0'; - test(line, line); - } - free(line); - } else { - for (; argc; argc--, argv++) { - if (FLAG('l') && (dir = opendir(*argv))) { - /* test directory contents */ - while ((d = readdir(dir))) { - r = snprintf(path, sizeof path, "%s/%s", - *argv, d->d_name); - if (r >= 0 && (size_t)r < sizeof path) - test(path, d->d_name); - } - closedir(dir); - } else { - test(*argv, *argv); - } - } - } - return match ? 0 : 1; -} diff --git a/.config/suckless/dmenu/stest.o b/.config/suckless/dmenu/stest.o deleted file mode 100644 index 3d5045e..0000000 Binary files a/.config/suckless/dmenu/stest.o and /dev/null differ diff --git a/.config/suckless/dmenu/themes/everforest.h b/.config/suckless/dmenu/themes/everforest.h deleted file mode 100644 index bd17837..0000000 --- a/.config/suckless/dmenu/themes/everforest.h +++ /dev/null @@ -1,12 +0,0 @@ -static const char red[] = "#E67E80"; -static const char green[] = "#A7C080"; -static const char yellow[] = "#DBBC7F"; -static const char blue[] = "#7FBBB3"; -static const char pink[] = "#D699B6"; -static const char aqua[] = "#83C092"; -static const char white[] = "#9DA9A0"; -static const char light_gray[] = "#859289"; -static const char gray[] = "#7A8478"; -static const char dark_gray[] = "#374145"; -static const char background[] = "#272E33"; -static const char foreground[] = "#D3C6AA"; diff --git a/.config/suckless/dmenu/util.o b/.config/suckless/dmenu/util.o deleted file mode 100644 index 5dd48bf..0000000 Binary files a/.config/suckless/dmenu/util.o and /dev/null differ diff --git a/.config/suckless/dwm/Makefile b/.config/suckless/dwm/Makefile index ea12a06..f3d514e 100644 --- a/.config/suckless/dwm/Makefile +++ b/.config/suckless/dwm/Makefile @@ -1,6 +1,3 @@ -# dwm - dynamic window manager -# See LICENSE file for copyright and license details. - include config.mk SRC = drw.c dwm.c util.c @@ -13,22 +10,11 @@ all: dwm ${OBJ}: config.h config.mk -config.h: - cp config.def.h $@ - dwm: ${OBJ} ${CC} -o $@ ${OBJ} ${LDFLAGS} clean: - rm -f dwm ${OBJ} dwm-${VERSION}.tar.gz - -dist: clean - mkdir -p dwm-${VERSION} - cp -R LICENSE Makefile README config.def.h config.mk\ - dwm.1 drw.h util.h ${SRC} dwm.png transient.c dwm-${VERSION} - tar -cf dwm-${VERSION}.tar dwm-${VERSION} - gzip dwm-${VERSION}.tar - rm -rf dwm-${VERSION} + rm -f dwm ${OBJ} install: all mkdir -p ${DESTDIR}${PREFIX}/bin @@ -37,6 +23,5 @@ install: all uninstall: rm -f ${DESTDIR}${PREFIX}/bin/dwm\ - ${DESTDIR}${MANPREFIX}/man1/dwm.1 -.PHONY: all clean dist install uninstall +.PHONY: all install clean uninstall diff --git a/.config/suckless/dwm/config.h b/.config/suckless/dwm/config.h index fd422e5..236857a 100644 --- a/.config/suckless/dwm/config.h +++ b/.config/suckless/dwm/config.h @@ -13,11 +13,10 @@ static const char *colors[][3] = { static const char *tags[] = { "1", "2", "3", "4" }; static const Rule rules[] = { - /* class instance title tags mask isfloating monitor */ - { "PrismLauncher", "prismlauncher", NULL, 1 << 2, 0, -1 }, - { "mercury-default", "Navigator", NULL, 1 << 1, 0, -1 }, - { "steam", "steamwebhelper", NULL, 1 << 2, 0, -1 }, - { "st-256color", "st-256color", NULL, 1, 0, -1 }, + { "PrismLauncher", "prismlauncher", NULL, 1 << 2, 0, -1 }, + { "librewolf", "Navigator", NULL, 1 << 1, 0, -1 }, + { "steam", "steamwebhelper", NULL, 1 << 2, 0, -1 }, + { "st-256color", "st-256color", NULL, 1, 0, -1 }, }; static const float mfact = 0.55; @@ -25,7 +24,10 @@ static const int nmaster = 1; static const int resizehints = 1; static const int lockfullscreen = 1; -static const Layout layouts[] = { { "[]=", tile } }; +static const Layout layouts[] = { + { "[]=", tile }, + { "><>", NULL }, /* no layout function means floating behavior */ +}; #define MODKEY Mod1Mask #define TAGKEYS(KEY,TAG) \ @@ -39,12 +41,13 @@ static const Layout layouts[] = { { "[]=", tile } }; static char dmenumon[2] = "0"; static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, NULL }; static const char *termcmd[] = { "st", NULL }; +static const char *browsercmd[] = { "librewolf", NULL }; #include "X11/XF86keysym.h" static const Key keys[] = { { MODKEY, XK_Return, spawn, {.v = termcmd } }, { MODKEY, XK_space, spawn, {.v = dmenucmd } }, - { MODKEY, XK_f, spawn, SHCMD("cd /home/andrew/mercury-browser/ && ./MERCURY_PORTABLE") }, + { MODKEY, XK_f, spawn, {.v = browsercmd } }, { MODKEY, XK_h, focusstack, {.i = +1 } }, { MODKEY, XK_l, focusstack, {.i = -1 } }, { MODKEY, XK_j, setmfact, {.f = -0.05} }, @@ -64,9 +67,9 @@ static const Key keys[] = { { 0, XF86XK_AudioMute, spawn, SHCMD("pactl set-sink-mute @DEFAULT_SINK@ toggle") }, TAGKEYS( XK_1, 0 ) - TAGKEYS( XK_2, 1 ) - TAGKEYS( XK_3, 2 ) - TAGKEYS( XK_4, 3 ) + TAGKEYS( XK_2, 1 ) + TAGKEYS( XK_3, 2 ) + TAGKEYS( XK_4, 3 ) }; static const Button buttons[] = { diff --git a/.config/suckless/dwm/config.mk b/.config/suckless/dwm/config.mk index 32f666a..bda5dc7 100644 --- a/.config/suckless/dwm/config.mk +++ b/.config/suckless/dwm/config.mk @@ -1,14 +1,13 @@ VERSION = 6.5 -# paths PREFIX = /usr/local X11INC = /usr/X11R6/include X11LIB = /usr/X11R6/lib # Xinerama, comment if you don't want it -XINERAMALIBS = -lXinerama -XINERAMAFLAGS = -DXINERAMA +# XINERAMALIBS = -lXinerama +# XINERAMAFLAGS = -DXINERAMA # freetype FREETYPELIBS = -lfontconfig -lXft @@ -16,14 +15,13 @@ FREETYPEINC = /usr/include/freetype2 # includes and libs INCS = -I${X11INC} -I${FREETYPEINC} -LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} +LIBS = -L${X11LIB} -lX11 ${FREETYPELIBS} # flags -CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} +CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700L -DVERSION=\"${VERSION}\" #CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS} CFLAGS = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS} LDFLAGS = ${LIBS} -# compiler and linker CC = gcc diff --git a/.config/suckless/dwm/dwm.c b/.config/suckless/dwm/dwm.c index b8accb0..58e9bff 100644 --- a/.config/suckless/dwm/dwm.c +++ b/.config/suckless/dwm/dwm.c @@ -14,9 +14,6 @@ #include #include #include -#ifdef XINERAMA -#include -#endif /* XINERAMA */ #include #include "drw.h" @@ -128,7 +125,6 @@ static void arrangemon(Monitor *m); static void attach(Client *c); static void attachstack(Client *c); static void buttonpress(XEvent *e); -static void checkotherwm(void); static void cleanup(void); static void cleanupmon(Monitor *mon); static void clientmessage(XEvent *e); @@ -206,7 +202,6 @@ static Client *wintoclient(Window w); static Monitor *wintomon(Window w); static int xerror(Display *dpy, XErrorEvent *ee); static int xerrordummy(Display *dpy, XErrorEvent *ee); -static int xerrorstart(Display *dpy, XErrorEvent *ee); static void zoom(const Arg *arg); /* variables */ @@ -432,17 +427,6 @@ buttonpress(XEvent *e) buttons[i].func(click == ClkTagBar && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg); } -void -checkotherwm(void) -{ - xerrorxlib = XSetErrorHandler(xerrorstart); - /* this causes an error if some other window manager is running */ - XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask); - XSync(dpy, False); - XSetErrorHandler(xerror); - XSync(dpy, False); -} - void cleanup(void) { @@ -992,18 +976,6 @@ incnmaster(const Arg *arg) arrange(selmon); } -#ifdef XINERAMA -static int -isuniquegeom(XineramaScreenInfo *unique, size_t n, XineramaScreenInfo *info) -{ - while (n--) - if (unique[n].x_org == info->x_org && unique[n].y_org == info->y_org - && unique[n].width == info->width && unique[n].height == info->height) - return 0; - return 1; -} -#endif /* XINERAMA */ - void keypress(XEvent *e) { @@ -1855,62 +1827,6 @@ updategeom(void) { int dirty = 0; -#ifdef XINERAMA - if (XineramaIsActive(dpy)) { - int i, j, n, nn; - Client *c; - Monitor *m; - XineramaScreenInfo *info = XineramaQueryScreens(dpy, &nn); - XineramaScreenInfo *unique = NULL; - - for (n = 0, m = mons; m; m = m->next, n++); - /* only consider unique geometries as separate screens */ - unique = ecalloc(nn, sizeof(XineramaScreenInfo)); - for (i = 0, j = 0; i < nn; i++) - if (isuniquegeom(unique, j, &info[i])) - memcpy(&unique[j++], &info[i], sizeof(XineramaScreenInfo)); - XFree(info); - nn = j; - - /* new monitors if nn > n */ - for (i = n; i < nn; i++) { - for (m = mons; m && m->next; m = m->next); - if (m) - m->next = createmon(); - else - mons = createmon(); - } - for (i = 0, m = mons; i < nn && m; m = m->next, i++) - if (i >= n - || unique[i].x_org != m->mx || unique[i].y_org != m->my - || unique[i].width != m->mw || unique[i].height != m->mh) - { - dirty = 1; - m->num = i; - m->mx = m->wx = unique[i].x_org; - m->my = m->wy = unique[i].y_org; - m->mw = m->ww = unique[i].width; - m->mh = m->wh = unique[i].height; - updatebarpos(m); - } - /* removed monitors if n > nn */ - for (i = nn; i < n; i++) { - for (m = mons; m && m->next; m = m->next); - while ((c = m->clients)) { - dirty = 1; - m->clients = c->next; - detachstack(c); - c->mon = mons; - attach(c); - attachstack(c); - } - if (m == selmon) - selmon = mons; - cleanupmon(m); - } - free(unique); - } else -#endif /* XINERAMA */ { /* default monitor setup */ if (!mons) mons = createmon(); @@ -2105,15 +2021,6 @@ xerrordummy(Display *dpy, XErrorEvent *ee) return 0; } -/* Startup Error handler to check if another window manager - * is already running. */ -int -xerrorstart(Display *dpy, XErrorEvent *ee) -{ - die("dwm: another window manager is already running"); - return -1; -} - void zoom(const Arg *arg) { @@ -2129,15 +2036,8 @@ zoom(const Arg *arg) int main(int argc, char *argv[]) { - if (argc == 2 && !strcmp("-v", argv[1])) - die("dwm-"VERSION); - if (argc != 1) - die("usage: dwm [-v]"); - if (!setlocale(LC_CTYPE, "") || !XSupportsLocale()) - fputs("warning: no locale support\n", stderr); if (!(dpy = XOpenDisplay(NULL))) die("dwm: cannot open display"); - checkotherwm(); setup(); scan(); run(); diff --git a/.config/suckless/dwm/transient.c b/.config/suckless/dwm/transient.c deleted file mode 100644 index 040adb5..0000000 --- a/.config/suckless/dwm/transient.c +++ /dev/null @@ -1,42 +0,0 @@ -/* cc transient.c -o transient -lX11 */ - -#include -#include -#include -#include - -int main(void) { - Display *d; - Window r, f, t = None; - XSizeHints h; - XEvent e; - - d = XOpenDisplay(NULL); - if (!d) - exit(1); - r = DefaultRootWindow(d); - - f = XCreateSimpleWindow(d, r, 100, 100, 400, 400, 0, 0, 0); - h.min_width = h.max_width = h.min_height = h.max_height = 400; - h.flags = PMinSize | PMaxSize; - XSetWMNormalHints(d, f, &h); - XStoreName(d, f, "floating"); - XMapWindow(d, f); - - XSelectInput(d, f, ExposureMask); - while (1) { - XNextEvent(d, &e); - - if (t == None) { - sleep(5); - t = XCreateSimpleWindow(d, r, 50, 50, 100, 100, 0, 0, 0); - XSetTransientForHint(d, t, f); - XStoreName(d, t, "transient"); - XMapWindow(d, t); - XSelectInput(d, t, ExposureMask); - } - } - - XCloseDisplay(d); - exit(0); -} diff --git a/.config/suckless/dwm/util.c b/.config/suckless/dwm/util.c index 96b82c9..8e57190 100644 --- a/.config/suckless/dwm/util.c +++ b/.config/suckless/dwm/util.c @@ -1,4 +1,3 @@ -/* See LICENSE file for copyright and license details. */ #include #include #include diff --git a/.config/suckless/dwm/util.h b/.config/suckless/dwm/util.h index f633b51..62b49cb 100644 --- a/.config/suckless/dwm/util.h +++ b/.config/suckless/dwm/util.h @@ -1,5 +1,3 @@ -/* See LICENSE file for copyright and license details. */ - #define MAX(A, B) ((A) > (B) ? (A) : (B)) #define MIN(A, B) ((A) < (B) ? (A) : (B)) #define BETWEEN(X, A, B) ((A) <= (X) && (X) <= (B)) diff --git a/.config/suckless/slstatus/Makefile b/.config/suckless/slstatus/Makefile index 13472f1..0a9fb0e 100644 --- a/.config/suckless/slstatus/Makefile +++ b/.config/suckless/slstatus/Makefile @@ -3,7 +3,7 @@ include config.mk REQ = util -COM = components/run_command +COM = run_command all: slstatus @@ -13,24 +13,11 @@ slstatus.o: slstatus.c slstatus.h arg.h config.h config.mk $(REQ:=.h) .c.o: $(CC) -o $@ -c $(CPPFLAGS) $(CFLAGS) $< -config.h: - cp config.def.h $@ - slstatus: slstatus.o $(COM:=.o) $(REQ:=.o) $(CC) -o $@ $(LDFLAGS) $(COM:=.o) $(REQ:=.o) slstatus.o $(LDLIBS) clean: - rm -f slstatus slstatus.o $(COM:=.o) $(REQ:=.o) slstatus-${VERSION}.tar.gz - -dist: - rm -rf "slstatus-$(VERSION)" - mkdir -p "slstatus-$(VERSION)/components" - cp -R LICENSE Makefile README config.mk config.def.h \ - arg.h slstatus.h slstatus.c $(REQ:=.c) $(REQ:=.h) \ - slstatus.1 "slstatus-$(VERSION)" - cp -R $(COM:=.c) "slstatus-$(VERSION)/components" - tar -cf - "slstatus-$(VERSION)" | gzip -c > "slstatus-$(VERSION).tar.gz" - rm -rf "slstatus-$(VERSION)" + rm -f slstatus slstatus.o $(COM:=.o) $(REQ:=.o) install: all mkdir -p "$(DESTDIR)$(PREFIX)/bin" diff --git a/.config/suckless/slstatus/components/run_command.c b/.config/suckless/slstatus/run_command.c similarity index 90% rename from .config/suckless/slstatus/components/run_command.c rename to .config/suckless/slstatus/run_command.c index 93bf6da..a69bac5 100644 --- a/.config/suckless/slstatus/components/run_command.c +++ b/.config/suckless/slstatus/run_command.c @@ -2,8 +2,8 @@ #include #include -#include "../slstatus.h" -#include "../util.h" +#include "slstatus.h" +#include "util.h" const char * run_command(const char *cmd) diff --git a/.config/suckless/st/config.h b/.config/suckless/st/config.h index 2a95352..30cb3d8 100644 --- a/.config/suckless/st/config.h +++ b/.config/suckless/st/config.h @@ -67,7 +67,7 @@ static unsigned int cursorthickness = 2; static int bellvolume = 0; // char *termname = "st-256color"; -char *termname = "st"; +char *termname = "st-256color"; unsigned int tabspaces = 8; static const char *colorname[] = {