switch back to vim

This commit is contained in:
Michael Chalupiak 2024-11-01 16:12:16 -04:00
parent f9603880e0
commit 1dc809a6f8
11 changed files with 41 additions and 51 deletions

View File

@ -125,7 +125,7 @@ fi
# You may want to put all your additions into a separate file like # You may want to put all your additions into a separate file like
# ~/.bash_aliases, instead of adding them here directly. # ~/.bash_aliases, instead of adding them here directly.
# See /usr/share/doc/bash-doc/examples in the bash-doc package. # See /usr/share/doc/bash-doc/examples in the bash-doc package.
export EDITOR='kak' export EDITOR='nvim'
if [ -f ~/.bash_aliases ]; then if [ -f ~/.bash_aliases ]; then
. ~/.bash_aliases . ~/.bash_aliases
@ -171,4 +171,4 @@ alias ssh='TERM="xterm-256color" ssh'
export DISABLE_TELEMETRY=YES export DISABLE_TELEMETRY=YES
[ -f "/home/mikec/.ghcup/env" ] && . "/home/mikec/.ghcup/env" # ghcup-env [ -f "/home/mikec/.ghcup/env" ] && . "/home/mikec/.ghcup/env" # ghcup-env

View File

@ -805,7 +805,25 @@ path = "runtime/queries/llvm"
# TODO # TODO
# lua # lua
# TODO # [language.lua.grammar.source.git]
# url = "https://github.com/tree-sitter-grammars/tree-sitter-lua"
# pin = "88e446476a1e97a8724dff7a23e2d709855077f2"
# [language.lua.grammar]
# path = "src"
# compile = "cc"
# compile_args = ["-c", "-fpic", "../scanner.c", "../parser.c", "-I", ".."]
# compile_flags = ["-O3"]
# link = "cc"
# link_args = ["-shared", "-fpic", "scanner.o", "parser.o", "-o", "lua.so"]
# link_flags = ["-O3"]
# [language.lua.queries.source.git]
# url = "https://github.com/helix-editor/helix"
# pin = "e76020ddb93eeb051de606c24f92189c3fc55547"
# [language.lua.gueries]
# path = "runtime/queries/lua"
# make # make
[language.make.grammar.source.git] [language.make.grammar.source.git]

View File

@ -34,10 +34,10 @@ plug "tinted-theming/base16-kakoune"
## Treesitter ## ## Treesitter ##
eval %sh{ kak-tree-sitter -dks --with-highlighting --with-text-objects --init $kak_session } #eval %sh{ kak-tree-sitter -dksv --with-highlighting --with-text-objects --init $kak_session }
#eval %sh{ kak-tree-sitter -dks --with-text-objects --session $kak_session } #eval %sh{ kak-tree-sitter -dks --with-text-objects --session $kak_session }
#eval %sh{ kak-tree-sitter -dks --with-highlighting --session $kak_session } #eval %sh{ kak-tree-sitter -dks --with-highlighting --session $kak_session }
eval %sh{ kak-tree-sitter -dks --init $kak_session }
evaluate-commands %sh{ evaluate-commands %sh{
echo "colorscheme base16-$BASE16_THEME" echo "colorscheme base16-$BASE16_THEME"
} }

View File

@ -1,5 +1,6 @@
function colors(color) function colors(color)
color = color or 'vscode' color = os.getenv("BASE16_THEME")
alt_color = 'rose-pine' or color
-- Available values: `'hard'`, `'medium'`, `'soft'` -- Available values: `'hard'`, `'medium'`, `'soft'`
vim.g.gruvbox_material_background = 'medium' vim.g.gruvbox_material_background = 'medium'
-- Available values: `'material'`, `'mix'`, `'original'` -- Available values: `'material'`, `'mix'`, `'original'`
@ -8,7 +9,9 @@ function colors(color)
vim.g.everforest_background = 'hard' vim.g.everforest_background = 'hard'
vim.g.gruvbox_material_better_performance = 1 vim.g.gruvbox_material_better_performance = 1
vim.g.everforest_better_performance = 1 vim.g.everforest_better_performance = 1
vim.cmd.colorscheme(color) if not pcall(vim.cmd.colorscheme, color) then
vim.cmd.colorscheme(alt_color)
end
end end
colors() colors()

View File

@ -1,6 +1,9 @@
vim.opt.nu = true vim.opt.nu = true
vim.opt.relativenumber = true vim.opt.relativenumber = true
vim.opt.wrap = true
vim.opt.linebreak = true
vim.opt.tabstop = 4 vim.opt.tabstop = 4
vim.opt.softtabstop = 4 vim.opt.softtabstop = 4
vim.opt.shiftwidth = 4 vim.opt.shiftwidth = 4
@ -10,9 +13,6 @@ vim.opt.showmode = false
vim.opt.smartindent = true vim.opt.smartindent = true
vim.opt.wrap = false
vim.opt.swapfile = false vim.opt.swapfile = false
vim.opt.backup = false vim.opt.backup = false
vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir" vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir"

View File

@ -20,7 +20,7 @@ settings:
https://outlook.live.com?mailtouri=%25s: true https://outlook.live.com?mailtouri=%25s: true
https://outlook.office.com?mailtouri=%25s: true https://outlook.office.com?mailtouri=%25s: true
fonts.default_family: fonts.default_family:
global: Cascadia Code global: Olympe Mono Hacked
fonts.default_size: fonts.default_size:
global: 12pt global: 12pt
url.default_page: url.default_page:

View File

@ -27,7 +27,8 @@ theme-file-extension = ".config.py"
path = "https://github.com/HaoZeke/base16-zathura" path = "https://github.com/HaoZeke/base16-zathura"
name = "tinted-zathura" name = "tinted-zathura"
themes-dir = "build_schemes/colors" themes-dir = "build_schemes/colors"
hook = "cat ~/.config/zathura/config > ~/.config/zathura/zathurarc && cat %f >> ~/.config/zathura/zathurarc" # hook = "cat ~/.config/zathura/config > ~/.config/zathura/zathurarc && cat %f >> ~/.config/zathura/zathurarc"
hook = "cp -f %f ~/.config/zathura/colors"
[[items]] [[items]]
path = "https://github.com/tinted-theming/base16-xresources" path = "https://github.com/tinted-theming/base16-xresources"

View File

@ -1,36 +1,3 @@
set font "Cascadia Code 12" include colors
# Base16 Gruvbox dark, hard set font "Olympe Mono Hacked 12"
# Author: Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox) set database "sqlite"
set default-bg "#1d2021"
set default-fg "#3c3836"
set statusbar-fg "#bdae93"
set statusbar-bg "#504945"
set inputbar-bg "#1d2021"
set inputbar-fg "#fbf1c7"
set notification-bg "#1d2021"
set notification-fg "#fbf1c7"
set notification-error-bg "#1d2021"
set notification-error-fg "#fb4934"
set notification-warning-bg "#1d2021"
set notification-warning-fg "#fb4934"
set highlight-color "#fabd2f"
set highlight-active-color "#83a598"
set completion-bg "#3c3836"
set completion-fg "#83a598"
set completion-highlight-fg "#fbf1c7"
set completion-highlight-bg "#83a598"
set recolor-lightcolor "#1d2021"
set recolor-darkcolor "#ebdbb2"
set recolor "false"
set recolor-keephue "false"

View File

@ -19,8 +19,8 @@
;; ;;
;; They all accept either a font-spec, font string ("Input Mono-12"), or xlfd ;; They all accept either a font-spec, font string ("Input Mono-12"), or xlfd
;; font string. You generally only need these two: ;; font string. You generally only need these two:
(setq doom-font (font-spec :family "Cascadia Code" :size 15 ) (setq doom-font (font-spec :family "Olympe Mono Hacked" :size 15 )
doom-variable-pitch-font (font-spec :family "Cantarell" :size 16 :weight 'bold)) doom-variable-pitch-font (font-spec :family "Cantarell" :size 15 :weight 'bold))
;; There are two ways to load a theme. Both assume the theme is installed and ;; There are two ways to load a theme. Both assume the theme is installed and
;; available. You can either set `doom-theme' or manually load a theme with the ;; available. You can either set `doom-theme' or manually load a theme with the

View File

@ -7,7 +7,7 @@
process = git-lfs filter-process process = git-lfs filter-process
required = true required = true
[core] [core]
editor = kak editor = nvim
[init] [init]
defaultBranch = master defaultBranch = master
[sendemail] [sendemail]

View File

@ -1,3 +1,4 @@
xrdb -merge ~/.Xresources xrdb -merge ~/.Xresources
/home/mikec/.scripts/startup.sh /home/mikec/.scripts/startup.sh
exec dwm exec dwm
# exec bspwm