From 1dc809a6f8d09a02343cbacbc4633d8d7f192a1e Mon Sep 17 00:00:00 2001 From: Michael Chalupiak Date: Fri, 1 Nov 2024 16:12:16 -0400 Subject: [PATCH] switch back to vim --- config/.bashrc | 4 +- config/.config/kak-tree-sitter/config.toml | 20 +++++++++- config/.config/kak/kakrc | 4 +- config/.config/nvim/after/plugin/colors.lua | 7 +++- config/.config/nvim/lua/config/set.lua | 6 +-- config/.config/qutebrowser/autoconfig.yml | 2 +- .../.config/tinted-theming/tinty/config.toml | 3 +- config/.config/zathura/zathurarc | 39 ++----------------- config/.doom.d/config.el | 4 +- config/.gitconfig | 2 +- config/.xinitrc | 1 + 11 files changed, 41 insertions(+), 51 deletions(-) diff --git a/config/.bashrc b/config/.bashrc index 0fbae43..4dc2db7 100644 --- a/config/.bashrc +++ b/config/.bashrc @@ -125,7 +125,7 @@ fi # You may want to put all your additions into a separate file like # ~/.bash_aliases, instead of adding them here directly. # See /usr/share/doc/bash-doc/examples in the bash-doc package. -export EDITOR='kak' +export EDITOR='nvim' if [ -f ~/.bash_aliases ]; then . ~/.bash_aliases @@ -171,4 +171,4 @@ alias ssh='TERM="xterm-256color" ssh' export DISABLE_TELEMETRY=YES -[ -f "/home/mikec/.ghcup/env" ] && . "/home/mikec/.ghcup/env" # ghcup-env \ No newline at end of file +[ -f "/home/mikec/.ghcup/env" ] && . "/home/mikec/.ghcup/env" # ghcup-env diff --git a/config/.config/kak-tree-sitter/config.toml b/config/.config/kak-tree-sitter/config.toml index c4108a2..a703584 100644 --- a/config/.config/kak-tree-sitter/config.toml +++ b/config/.config/kak-tree-sitter/config.toml @@ -805,7 +805,25 @@ path = "runtime/queries/llvm" # TODO # 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 [language.make.grammar.source.git] diff --git a/config/.config/kak/kakrc b/config/.config/kak/kakrc index 888e4a0..92c440c 100644 --- a/config/.config/kak/kakrc +++ b/config/.config/kak/kakrc @@ -34,10 +34,10 @@ plug "tinted-theming/base16-kakoune" ## 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-highlighting --session $kak_session } - +eval %sh{ kak-tree-sitter -dks --init $kak_session } evaluate-commands %sh{ echo "colorscheme base16-$BASE16_THEME" } diff --git a/config/.config/nvim/after/plugin/colors.lua b/config/.config/nvim/after/plugin/colors.lua index 9b35a4e..3a9d719 100755 --- a/config/.config/nvim/after/plugin/colors.lua +++ b/config/.config/nvim/after/plugin/colors.lua @@ -1,5 +1,6 @@ function colors(color) - color = color or 'vscode' + color = os.getenv("BASE16_THEME") + alt_color = 'rose-pine' or color -- Available values: `'hard'`, `'medium'`, `'soft'` vim.g.gruvbox_material_background = 'medium' -- Available values: `'material'`, `'mix'`, `'original'` @@ -8,7 +9,9 @@ function colors(color) vim.g.everforest_background = 'hard' vim.g.gruvbox_material_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 colors() diff --git a/config/.config/nvim/lua/config/set.lua b/config/.config/nvim/lua/config/set.lua index c24aa82..db08190 100755 --- a/config/.config/nvim/lua/config/set.lua +++ b/config/.config/nvim/lua/config/set.lua @@ -1,6 +1,9 @@ vim.opt.nu = true vim.opt.relativenumber = true +vim.opt.wrap = true +vim.opt.linebreak = true + vim.opt.tabstop = 4 vim.opt.softtabstop = 4 vim.opt.shiftwidth = 4 @@ -10,9 +13,6 @@ vim.opt.showmode = false vim.opt.smartindent = true -vim.opt.wrap = false - - vim.opt.swapfile = false vim.opt.backup = false vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir" diff --git a/config/.config/qutebrowser/autoconfig.yml b/config/.config/qutebrowser/autoconfig.yml index afe91c1..1e4154b 100644 --- a/config/.config/qutebrowser/autoconfig.yml +++ b/config/.config/qutebrowser/autoconfig.yml @@ -20,7 +20,7 @@ settings: https://outlook.live.com?mailtouri=%25s: true https://outlook.office.com?mailtouri=%25s: true fonts.default_family: - global: Cascadia Code + global: Olympe Mono Hacked fonts.default_size: global: 12pt url.default_page: diff --git a/config/.config/tinted-theming/tinty/config.toml b/config/.config/tinted-theming/tinty/config.toml index 6c562b0..59afdbd 100644 --- a/config/.config/tinted-theming/tinty/config.toml +++ b/config/.config/tinted-theming/tinty/config.toml @@ -27,7 +27,8 @@ theme-file-extension = ".config.py" path = "https://github.com/HaoZeke/base16-zathura" name = "tinted-zathura" 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]] path = "https://github.com/tinted-theming/base16-xresources" diff --git a/config/.config/zathura/zathurarc b/config/.config/zathura/zathurarc index 749dc22..4df5e3f 100644 --- a/config/.config/zathura/zathurarc +++ b/config/.config/zathura/zathurarc @@ -1,36 +1,3 @@ -set font "Cascadia Code 12" -# Base16 Gruvbox dark, hard -# Author: Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox) - -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" +include colors +set font "Olympe Mono Hacked 12" +set database "sqlite" diff --git a/config/.doom.d/config.el b/config/.doom.d/config.el index a8e4cf3..ce1b375 100644 --- a/config/.doom.d/config.el +++ b/config/.doom.d/config.el @@ -19,8 +19,8 @@ ;; ;; They all accept either a font-spec, font string ("Input Mono-12"), or xlfd ;; font string. You generally only need these two: -(setq doom-font (font-spec :family "Cascadia Code" :size 15 ) - doom-variable-pitch-font (font-spec :family "Cantarell" :size 16 :weight 'bold)) +(setq doom-font (font-spec :family "Olympe Mono Hacked" :size 15 ) + 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 ;; available. You can either set `doom-theme' or manually load a theme with the diff --git a/config/.gitconfig b/config/.gitconfig index 013d369..f7c81e2 100644 --- a/config/.gitconfig +++ b/config/.gitconfig @@ -7,7 +7,7 @@ process = git-lfs filter-process required = true [core] - editor = kak + editor = nvim [init] defaultBranch = master [sendemail] diff --git a/config/.xinitrc b/config/.xinitrc index dbbfa45..65be4cf 100755 --- a/config/.xinitrc +++ b/config/.xinitrc @@ -1,3 +1,4 @@ xrdb -merge ~/.Xresources /home/mikec/.scripts/startup.sh exec dwm +# exec bspwm