Compare commits

...

3 commits

Author SHA1 Message Date
4d5f716d75 dots: misc 2024-01-04 00:22:32 +02:00
dc41382ccf nvim: add treesitter 2024-01-04 00:22:08 +02:00
0cc52cf8cc foot: adjust colors 2024-01-04 00:21:13 +02:00
6 changed files with 26 additions and 262 deletions

View file

@ -8,8 +8,8 @@ font=monospace:size=10
launch=linkhandler ${url}
[colors]
foreground=f2f0ec
background=1a1a1a
foreground=f2f0ec
regular0=1a1a1a # black
regular1=f2777a # red
regular2=99cc99 # green
@ -25,7 +25,13 @@ bright3=ffcc66 # bright yellow
bright4=a09f93 # bright blue
bright5=e8e6df # bright magenta
bright6=d27b53 # bright cyan
bright7=ffffff # bright white
bright7=f2f0ec # bright white
selection-background=f2f0ec
selection-foreground=1a1a1a
urls=a09f93
jump-labels=2d2d2d ffcc66
scrollback-indicator=2d2d2d a09f93
[key-bindings]
clipboard-copy=Mod1+c

View file

@ -1,244 +0,0 @@
" vi:syntax=vim
" Terminal color definitions
let s:cterm00 = "00"
let s:cterm01 = "10"
let s:cterm02 = "11"
let s:cterm03 = "08"
let s:cterm04 = "12"
let s:cterm05 = "07"
let s:cterm06 = "13"
let s:cterm07 = "15"
let s:cterm08 = "01"
let s:cterm09 = "09"
let s:cterm0A = "03"
let s:cterm0B = "02"
let s:cterm0C = "06"
let s:cterm0D = "04"
let s:cterm0E = "05"
let s:cterm0F = "14"
" Theme setup
hi clear
syntax reset
let g:colors_name = "eighties"
" Highlighting function
" Optional variables are attributes and guisp
function! g:Base16hi(group, ctermfg, ctermbg, ...)
let l:attr = get(a:, 1, "")
let l:guisp = get(a:, 2, "")
if a:ctermfg != ""
exec "hi " . a:group . " ctermfg=" . a:ctermfg
endif
if a:ctermbg != ""
exec "hi " . a:group . " ctermbg=" . a:ctermbg
endif
if l:attr != ""
exec "hi " . a:group . " gui=" . l:attr . " cterm=" . l:attr
endif
endfunction
fun <sid>hi(group, ctermfg, ctermbg, attr, guisp)
call g:Base16hi(a:group, a:ctermfg, a:ctermbg, a:attr, a:guisp)
endfun
" Vim editor colors
call <sid>hi("Normal", s:cterm05, s:cterm00, "", "")
call <sid>hi("Bold", "", "", "bold", "")
call <sid>hi("Debug", s:cterm08, "", "", "")
call <sid>hi("Directory", s:cterm0D, "", "", "")
call <sid>hi("Error", s:cterm00, s:cterm08, "", "")
call <sid>hi("ErrorMsg", s:cterm08, s:cterm00, "", "")
call <sid>hi("Exception", s:cterm08, "", "", "")
call <sid>hi("FoldColumn", s:cterm0C, s:cterm01, "", "")
call <sid>hi("Folded", s:cterm03, s:cterm01, "", "")
call <sid>hi("IncSearch", s:cterm01, s:cterm09, "none", "")
call <sid>hi("Italic", "", "", "none", "")
call <sid>hi("Macro", s:cterm08, "", "", "")
call <sid>hi("MatchParen", "", s:cterm03, "", "")
call <sid>hi("ModeMsg", s:cterm0B, "", "", "")
call <sid>hi("MoreMsg", s:cterm0B, "", "", "")
call <sid>hi("Question", s:cterm0D, "", "", "")
call <sid>hi("Search", s:cterm01, s:cterm0A, "", "")
call <sid>hi("Substitute", s:cterm01, s:cterm0A, "none", "")
call <sid>hi("SpecialKey", s:cterm03, "", "", "")
call <sid>hi("TooLong", s:cterm08, "", "", "")
call <sid>hi("Underlined", s:cterm08, "", "", "")
call <sid>hi("Visual", "", "", "", "reverse")
call <sid>hi("VisualNOS", s:cterm08, "", "", "")
call <sid>hi("WarningMsg", s:cterm08, "", "", "")
call <sid>hi("WildMenu", s:cterm08, "", "", "")
call <sid>hi("Title", s:cterm0D, "", "none", "")
call <sid>hi("Conceal", s:cterm0D, s:cterm00, "", "")
call <sid>hi("Cursor", s:cterm00, s:cterm05, "", "")
call <sid>hi("NonText", s:cterm03, "", "", "")
call <sid>hi("LineNr", s:cterm03, "", "", "")
call <sid>hi("SignColumn", s:cterm03, s:cterm01, "", "")
call <sid>hi("StatusLine", s:cterm05, 235, "none", "")
call <sid>hi("StatusLineNC", s:cterm03, s:cterm01, "none", "")
call <sid>hi("VertSplit", "", "", "none", "")
call <sid>hi("ColorColumn", "", s:cterm01, "none", "")
call <sid>hi("CursorColumn", "", s:cterm01, "none", "")
call <sid>hi("CursorLine", "", s:cterm01, "none", "")
call <sid>hi("CursorLineNr", s:cterm04, s:cterm01, "", "")
call <sid>hi("QuickFixLine", "", s:cterm01, "none", "")
call <sid>hi("PMenu", s:cterm05, s:cterm01, "none", "")
call <sid>hi("PMenuSel", s:cterm01, s:cterm05, "", "")
call <sid>hi("TabLine", s:cterm0D, 235, "none", "")
call <sid>hi("TabLineFill", s:cterm0D, 235, "none", "")
call <sid>hi("TabLineSel", s:cterm02, 235, "none", "")
" Standard syntax highlighting
call <sid>hi("Boolean", s:cterm09, "", "", "")
call <sid>hi("Character", s:cterm08, "", "", "")
call <sid>hi("Comment", s:cterm03, "", "", "")
call <sid>hi("Conditional", s:cterm0E, "", "", "")
call <sid>hi("Constant", s:cterm09, "", "", "")
call <sid>hi("Define", s:cterm0E, "", "none", "")
call <sid>hi("Delimiter", s:cterm0F, "", "", "")
call <sid>hi("Float", s:cterm09, "", "", "")
call <sid>hi("Function", s:cterm0D, "", "", "")
call <sid>hi("Identifier", s:cterm08, "", "none", "")
call <sid>hi("Include", s:cterm0D, "", "", "")
call <sid>hi("Keyword", s:cterm0E, "", "", "")
call <sid>hi("Label", s:cterm0A, "", "", "")
call <sid>hi("Number", s:cterm09, "", "", "")
call <sid>hi("Operator", s:cterm05, "", "none", "")
call <sid>hi("PreProc", s:cterm0A, "", "", "")
call <sid>hi("Repeat", s:cterm0A, "", "", "")
call <sid>hi("Special", s:cterm0C, "", "", "")
call <sid>hi("SpecialChar", s:cterm0F, "", "", "")
call <sid>hi("Statement", s:cterm08, "", "", "")
call <sid>hi("StorageClass", s:cterm0A, "", "", "")
call <sid>hi("String", s:cterm0B, "", "", "")
call <sid>hi("Structure", s:cterm0E, "", "", "")
call <sid>hi("Tag", s:cterm0A, "", "", "")
call <sid>hi("Todo", s:cterm0A, s:cterm01, "", "")
call <sid>hi("Type", s:cterm0A, "", "none", "")
call <sid>hi("Typedef", s:cterm0A, "", "", "")
" C highlighting
call <sid>hi("cOperator", s:cterm0C, "", "", "")
call <sid>hi("cPreCondit", s:cterm0E, "", "", "")
" C# highlighting
call <sid>hi("csClass", s:cterm0A, "", "", "")
call <sid>hi("csAttribute", s:cterm0A, "", "", "")
call <sid>hi("csModifier", s:cterm0E, "", "", "")
call <sid>hi("csType", s:cterm08, "", "", "")
call <sid>hi("csUnspecifiedStatement", s:cterm0D, "", "", "")
call <sid>hi("csContextualStatement", s:cterm0E, "", "", "")
call <sid>hi("csNewDecleration", s:cterm08, "", "", "")
" CSS highlighting
call <sid>hi("cssBraces", s:cterm05, "", "", "")
call <sid>hi("cssClassName", s:cterm0E, "", "", "")
call <sid>hi("cssColor", s:cterm0C, "", "", "")
" Diff highlighting
call <sid>hi("DiffAdd", s:cterm0B, s:cterm01, "", "")
call <sid>hi("DiffChange", s:cterm03, s:cterm01, "", "")
call <sid>hi("DiffDelete", s:cterm08, s:cterm01, "", "")
call <sid>hi("DiffText", s:cterm0D, s:cterm01, "", "")
call <sid>hi("DiffAdded", s:cterm0B, s:cterm00, "", "")
call <sid>hi("DiffFile", s:cterm08, s:cterm00, "", "")
call <sid>hi("DiffNewFile", s:cterm0B, s:cterm00, "", "")
call <sid>hi("DiffLine", s:cterm0D, s:cterm00, "", "")
call <sid>hi("DiffRemoved", s:cterm08, s:cterm00, "", "")
" Git highlighting
call <sid>hi("gitcommitOverflow", s:cterm08, "", "", "")
call <sid>hi("gitcommitSummary", s:cterm0B, "", "", "")
call <sid>hi("gitcommitComment", s:cterm03, "", "", "")
call <sid>hi("gitcommitUntracked", s:cterm03, "", "", "")
call <sid>hi("gitcommitDiscarded", s:cterm03, "", "", "")
call <sid>hi("gitcommitSelected", s:cterm03, "", "", "")
call <sid>hi("gitcommitHeader", s:cterm0E, "", "", "")
call <sid>hi("gitcommitSelectedType", s:cterm0D, "", "", "")
call <sid>hi("gitcommitUnmergedType", s:cterm0D, "", "", "")
call <sid>hi("gitcommitDiscardedType", s:cterm0D, "", "", "")
call <sid>hi("gitcommitBranch", s:cterm09, "", "bold", "")
call <sid>hi("gitcommitUntrackedFile", s:cterm0A, "", "", "")
call <sid>hi("gitcommitUnmergedFile", s:cterm08, "", "bold", "")
call <sid>hi("gitcommitDiscardedFile", s:cterm08, "", "bold", "")
call <sid>hi("gitcommitSelectedFile", s:cterm0B, "", "bold", "")
" HTML highlighting
call <sid>hi("htmlBold", s:cterm0A, "", "", "")
call <sid>hi("htmlItalic", s:cterm0E, "", "", "")
call <sid>hi("htmlEndTag", s:cterm05, "", "", "")
call <sid>hi("htmlTag", s:cterm05, "", "", "")
" JavaScript highlighting
call <sid>hi("javaScript", s:cterm05, "", "", "")
call <sid>hi("javaScriptBraces", s:cterm05, "", "", "")
call <sid>hi("javaScriptNumber", s:cterm09, "", "", "")
" Mail highlighting
call <sid>hi("mailQuoted1", s:cterm0A, "", "", "")
call <sid>hi("mailQuoted2", s:cterm0B, "", "", "")
call <sid>hi("mailQuoted3", s:cterm0E, "", "", "")
call <sid>hi("mailQuoted4", s:cterm0C, "", "", "")
call <sid>hi("mailQuoted5", s:cterm0D, "", "", "")
call <sid>hi("mailQuoted6", s:cterm0A, "", "", "")
call <sid>hi("mailURL", s:cterm0D, "", "", "")
call <sid>hi("mailEmail", s:cterm0D, "", "", "")
" Markdown highlighting
call <sid>hi("markdownCode", s:cterm0B, "", "", "")
call <sid>hi("markdownError", s:cterm05, s:cterm00, "", "")
call <sid>hi("markdownCodeBlock", s:cterm0B, "", "", "")
call <sid>hi("markdownHeadingDelimiter", s:cterm0D, "", "", "")
" PHP highlighting
call <sid>hi("phpMemberSelector", s:cterm05, "", "", "")
call <sid>hi("phpComparison", s:cterm05, "", "", "")
call <sid>hi("phpParent", s:cterm05, "", "", "")
call <sid>hi("phpMethodsVar", s:cterm0C, "", "", "")
" Python highlighting
call <sid>hi("pythonOperator", s:cterm0E, "", "", "")
call <sid>hi("pythonRepeat", s:cterm0E, "", "", "")
call <sid>hi("pythonInclude", s:cterm0E, "", "", "")
call <sid>hi("pythonStatement", s:cterm0E, "", "", "")
" Ruby highlighting
call <sid>hi("rubyAttribute", s:cterm0D, "", "", "")
call <sid>hi("rubyConstant", s:cterm0A, "", "", "")
call <sid>hi("rubyInterpolationDelimiter", s:cterm0F, "", "", "")
call <sid>hi("rubyRegexp", s:cterm0C, "", "", "")
call <sid>hi("rubySymbol", s:cterm0B, "", "", "")
call <sid>hi("rubyStringDelimiter", s:cterm0B, "", "", "")
" SASS highlighting
call <sid>hi("sassidChar", s:cterm08, "", "", "")
call <sid>hi("sassClassChar", s:cterm09, "", "", "")
call <sid>hi("sassInclude", s:cterm0E, "", "", "")
call <sid>hi("sassMixing", s:cterm0E, "", "", "")
call <sid>hi("sassMixinName", s:cterm0D, "", "", "")
" Spelling highlighting
call <sid>hi("SpellBad", "", s:cterm00, "underline", "")
call <sid>hi("SpellLocal", "", s:cterm00, "underline", "")
call <sid>hi("SpellCap", "", s:cterm00, "underline", "")
call <sid>hi("SpellRare", "", s:cterm00, "underline", "")
" Java highlighting
call <sid>hi("javaOperator", s:cterm0D, "", "", "")
" Telescope highlighting
call <sid>hi("TelescopeMatching", s:cterm07, "", "", "")
call <sid>hi("TelescopePreviewLine", s:cterm0A, "", "bold", "")
call <sid>hi("TelescopePromptPrefix", "", "", "none", "")
call <sid>hi("TelescopeSelection", s:cterm07, "", "bold", "")
" Remove functions
delf <sid>hi
" Remove color variables
unlet s:cterm00 s:cterm01 s:cterm02 s:cterm03 s:cterm04 s:cterm05 s:cterm06 s:cterm07 s:cterm08 s:cterm09 s:cterm0A s:cterm0B s:cterm0C s:cterm0D s:cterm0E s:cterm0F

View file

@ -1,15 +1,17 @@
require 'paq' {
'hrsh7th/cmp-buffer';
'hrsh7th/cmp-nvim-lsp';
'hrsh7th/nvim-cmp';
'neovim/nvim-lspconfig';
'nvim-lua/plenary.nvim';
'nvim-telescope/telescope.nvim'
'RRethy/nvim-base16',
'hrsh7th/cmp-buffer',
'hrsh7th/cmp-nvim-lsp',
'hrsh7th/nvim-cmp',
'neovim/nvim-lspconfig',
'nvim-lua/plenary.nvim',
'nvim-telescope/telescope.nvim',
{ 'nvim-treesitter/nvim-treesitter', build = ':TSUpdate' }
}
require('colors')
require('sets')
require('maps')
require('lsp')
require('tlp')
vim.cmd('colorscheme eighties')
require('trs')

View file

@ -20,7 +20,8 @@ map('n', '<C-p>', ':bnext<CR>')
map('n', '<C-x>', ':bdelete<CR>')
map('n', '<leader>f', builtin.find_files, {})
map('n', '<leader>d', builtin.buffers, {})
map('n', '<leader>d', ':Vexplore<CR>')
map('n', '<leader>b', builtin.buffers, {})
map('n', '<leader>g', builtin.live_grep, {})
map('', '<leader>c', ':w! | !compiler "<c-r>%"<CR>')
map('', '<leader>p', ':!opout <c-r>%<CR><CR>')

View file

@ -33,12 +33,12 @@ riverctl map normal Super+Shift X spawn "sysact shut"
# Volume and MPD
for mode in normal locked
do
riverctl map $mode None XF86AudioMute spawn "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle; kill -45 $(pidof someblocks)"
riverctl map $mode Super BackSpace spawn "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle; kill -45 $(pidof someblocks)"
riverctl map -repeat $mode None XF86AudioLowerVolume spawn "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-; kill -45 $(pidof someblocks)"
riverctl map -repeat $mode None XF86AudioRaiseVolume spawn "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+; kill -45 $(pidof someblocks)"
riverctl map -repeat $mode Super Equal spawn "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+; kill -45 $(pidof someblocks)"
riverctl map -repeat $mode Super Minus spawn "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-; kill -45 $(pidof someblocks)"
riverctl map $mode None XF86AudioMute spawn "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
riverctl map $mode Super BackSpace spawn "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
riverctl map -repeat $mode None XF86AudioLowerVolume spawn "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
riverctl map -repeat $mode None XF86AudioRaiseVolume spawn "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
riverctl map -repeat $mode Super Equal spawn "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
riverctl map -repeat $mode Super Minus spawn "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
riverctl map $mode Super Comma spawn "mpc prev"
riverctl map $mode Super P spawn "mpc toggle"
riverctl map $mode Super Period spawn "mpc next"

View file

@ -21,7 +21,6 @@ cfa="$EDITOR $XDG_CONFIG_HOME/shell/aliases" \
cfz="$EDITOR $XDG_CONFIG_HOME/zsh/.zshrc" \
cfp="$EDITOR $XDG_CONFIG_HOME/zsh/.zprofile" \
cfq="$EDITOR $XDG_CONFIG_HOME/qutebrowser/config.py" \
cfu="$EDITOR $XDG_CONFIG_HOME/newsboat/urls" \
cfv="$EDITOR $XDG_CONFIG_HOME/nvim/init.lua" \
hist="$EDITOR $XDG_CACHE_HOME/history"