diff --git a/config/.config/kak/kakrc b/config/.config/kak/kakrc index 92c440c..5c5bd3d 100644 --- a/config/.config/kak/kakrc +++ b/config/.config/kak/kakrc @@ -19,29 +19,28 @@ plug "kak-lsp/kak-lsp" do %{ cargo install --locked --force --path . } -# plug "gustavo-hms/luar" %{ -# plug "gustavo-hms/peneira" %{ -# require-module peneira -# } -# } +plug "gustavo-hms/luar" %{ + plug "gustavo-hms/peneira" %{ + require-module peneira + } +} # # Color Themes plug "tinted-theming/base16-kakoune" ### End Of Plugins ### -# set-option global luar_interpreter luajit +set-option global luar_interpreter luajit ## Treesitter ## #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" -} - +# eval %sh{ kak-tree-sitter -dks --init $kak_session } +# evaluate-commands %sh{ +# echo "colorscheme base16-$BASE16_THEME" +# } ## Highlighting ## hook global WinCreate .* %{ add-highlighter window/number-lines number-lines -relative -hlcursor} add-highlighter global/ show-matching @@ -52,78 +51,78 @@ add-highlighter global/ show-whitespaces add-highlighter global/ wrap -word -indent ## Formatting ## -define-command enable-autofmt -docstring 'enable autoformatting of buffer' %{ - - - hook global -group autofmt BufSetOption filetype=(zig) %{ - set-option buffer formatcmd 'zig fmt --stdin' - - hook -group autofmt buffer BufOpenFile .* %{ - format - } - - hook -group autofmt buffer BufWritePre .* %{ - format - } - } - - hook global -group autofmt BufSetOption filetype=(html) %{ - set-option buffer formatcmd 'prettier --tab-width 4 --parser html' - - hook -group autofmt buffer BufOpenFile .* %{ - format - } - - hook -group autofmt buffer BufWritePre .* %{ - format - } - } - - hook global -group autofmt BufSetOption filetype=(css) %{ - set-option buffer formatcmd 'prettier --tab-width 4 --parser css' - - hook -group autofmt buffer BufOpenFile .* %{ - format - } - - hook -group autofmt buffer BufWritePre .* %{ - format - } - } - - hook global -group autofmt BufSetOption filetype=(javascript) %{ - set-option buffer formatcmd 'prettier --tab-width 4 --parser typescript' - - hook -group autofmt buffer BufOpenFile .* %{ - format - } - - hook -group autofmt buffer BufWritePre .* %{ - format - } - } - - hook global -group autofmt BufSetOption filetype=(go) %{ - set-option buffer formatcmd 'gofmt' - - hook -group autofmt buffer BufOpenFile .* %{ - format - } - - hook -group autofmt buffer BufWritePre .* %{ - format - } - } -} - -define-command disable-autofmt -docstring 'disable autoformatting of buffer' %{ - remove-hooks global autofmt -} - -enable-autofmt - - -## Indentation ## +# define-command enable-autofmt -docstring 'enable autoformatting of buffer' %{ +# +# +# hook global -group autofmt BufSetOption filetype=(zig) %{ +# set-option buffer formatcmd 'zig fmt --stdin' +# +# hook -group autofmt buffer BufOpenFile .* %{ +# format +# } +# +# hook -group autofmt buffer BufWritePre .* %{ +# format +# } +# } +# +# hook global -group autofmt BufSetOption filetype=(html) %{ +# set-option buffer formatcmd 'prettier --tab-width 4 --parser html' +# +# hook -group autofmt buffer BufOpenFile .* %{ +# format +# } +# +# hook -group autofmt buffer BufWritePre .* %{ +# format +# } +# } +# +# hook global -group autofmt BufSetOption filetype=(css) %{ +# set-option buffer formatcmd 'prettier --tab-width 4 --parser css' +# +# hook -group autofmt buffer BufOpenFile .* %{ +# format +# } +# +# hook -group autofmt buffer BufWritePre .* %{ +# format +# } +# } +# +# hook global -group autofmt BufSetOption filetype=(javascript) %{ +# set-option buffer formatcmd 'prettier --tab-width 4 --parser typescript' +# +# hook -group autofmt buffer BufOpenFile .* %{ +# format +# } +# +# hook -group autofmt buffer BufWritePre .* %{ +# format +# } +# } +# +# hook global -group autofmt BufSetOption filetype=(go) %{ +# set-option buffer formatcmd 'gofmt' +# +# hook -group autofmt buffer BufOpenFile .* %{ +# format +# } +# +# hook -group autofmt buffer BufWritePre .* %{ +# format +# } +# } +# } +# +# define-command disable-autofmt -docstring 'disable autoformatting of buffer' %{ +# remove-hooks global autofmt +# } +# +# enable-autofmt +# +# +# ## Indentation ## set global tabstop 4 set global indentwidth 4 hook global WinSetOption filetype=.* expandtab @@ -132,57 +131,57 @@ hook global BufCreate .* %{ editorconfig-load autoconfigtab } - -define-command sleuth -docstring 'Heuristically set buffer options' %{ - try %{ - evaluate-commands -draft %{ - # Search the first indent level - execute-keys 'gg' '/' '^\h+' '' - - # Tab vs. Space - # https://youtu.be/V7PLxL8jIl8 - try %{ - execute-keys '' '\t' '' - #set-option buffer indentwidth 0 - noexpandtab - } catch %{ - set-option buffer indentwidth %val{selection_length} - expandtab - } - } - } -} - -define-command git-status -docstring 'Show git diff' %{ - hook -group git-status global BufOpenFile .* %{ - git show-diff - } - - hook -group git-status global BufWritePost .* %{ - git show-diff - } -} - -define-command disable-git-status -docstring 'Disable git diff gutter' %{ - remove-hooks global git-status -} - -define-command sleuth-enable -docstring 'Enable sleuth' %{ - # Run sleuth when opening and saving files. - hook -group sleuth global BufOpenFile .* %{ - sleuth - } - - hook -group sleuth global BufWritePost .* %{ - sleuth - } -} - -define-command sleuth-disable -docstring 'Disable sleuth' %{ - remove-hooks global sleuth -} - -## LSP ## +# +# define-command sleuth -docstring 'Heuristically set buffer options' %{ +# try %{ +# evaluate-commands -draft %{ +# # Search the first indent level +# execute-keys 'gg' '/' '^\h+' '' +# +# # Tab vs. Space +# # https://youtu.be/V7PLxL8jIl8 +# try %{ +# execute-keys '' '\t' '' +# #set-option buffer indentwidth 0 +# noexpandtab +# } catch %{ +# set-option buffer indentwidth %val{selection_length} +# expandtab +# } +# } +# } +# } +# +# define-command git-status -docstring 'Show git diff' %{ +# hook -group git-status global BufOpenFile .* %{ +# git show-diff +# } +# +# hook -group git-status global BufWritePost .* %{ +# git show-diff +# } +# } +# +# define-command disable-git-status -docstring 'Disable git diff gutter' %{ +# remove-hooks global git-status +# } +# +# define-command sleuth-enable -docstring 'Enable sleuth' %{ +# # Run sleuth when opening and saving files. +# hook -group sleuth global BufOpenFile .* %{ +# sleuth +# } +# +# hook -group sleuth global BufWritePost .* %{ +# sleuth +# } +# } +# +# define-command sleuth-disable -docstring 'Disable sleuth' %{ +# remove-hooks global sleuth +# } +# +# ## LSP ## lsp-enable lsp-auto-hover-enable @@ -424,3 +423,5 @@ map -docstring 'clipboard paste' global user p ':xpaste' map -docstring 'quit kakoune' global user q ':q' map -docstring 'toggle comments' global user c ':comment-line' + +colorscheme base16-gruvbox-dark-medium diff --git a/config/.config/nvim/lua/config/packer.lua b/config/.config/nvim/lua/config/packer.lua index da4f698..004be5c 100755 --- a/config/.config/nvim/lua/config/packer.lua +++ b/config/.config/nvim/lua/config/packer.lua @@ -202,6 +202,26 @@ return require('packer').startup(function(use) } use 'ollykel/v-vim' + use { + 'nvim-orgmode/orgmode', + config = function() + require('orgmode').setup({ + highlight = { + enable = true, + additional_vim_regex_highlighting = { 'org' }, + }, + }) + end + } + + use { + "lukas-reineke/headlines.nvim", + after = "nvim-treesitter", + config = function() + require("headlines").setup() + end, + } + use { 'windwp/nvim-ts-autotag', config = function() diff --git a/config/.config/river/init b/config/.config/river/init index 4eff4c5..b6f4a12 100755 --- a/config/.config/river/init +++ b/config/.config/river/init @@ -11,7 +11,7 @@ # Note: the "Super" modifier is also known as Logo, GUI, Windows, Mod4, etc. # Super+Shift+Return to start an instance of foot (https://codeberg.org/dnkl/foot) -riverctl map normal Super Return spawn ghostty +riverctl map normal Super Return spawn alacritty riverctl map normal Super D spawn 'bemenu-run --fn "Iosevka Term SS12 14"' # Super+Q to close the focused view @@ -173,4 +173,5 @@ riverctl map normal Super Escape spawn 'swaylock -f -c 000000' swaybg -m fill -i $HOME/Pictures/wallpapers/wallpaper & # pgrep creek || ( while $HOME/.config/river/bar.sh; do sleep 1; done ) | creek -fn 'Ubuntu:size=14' -nf 0xb8b8b8 -nb 0x282828 -ff 0x181818 -fb 0x7cafc2 waybar & -wlr-randr --output DP-2 --adaptive-sync enabled --mode 2560x1440@165Hz +# wlr-randr --output DP-2 --adaptive-sync enabled --mode 2560x1440@165Hz +wlr-randr --output eDP-1 --scale 1.5 diff --git a/config/.config/sway/config b/config/.config/sway/config index b64570c..fb21dc5 100644 --- a/config/.config/sway/config +++ b/config/.config/sway/config @@ -15,7 +15,7 @@ set $up k set $right l # Your preferred terminal emulator #set $term foot -f Fairfax\ Hax\ HD:size=14 -set $term ghostty +set $term alacritty # Your preferred application launcher # Note: pass the final command to swaymsg so that the resulting window can be opened # on the original workspace that the command was run on. diff --git a/config/.doom.d/config.el b/config/.doom.d/config.el index c43958d..e91c00c 100644 --- a/config/.doom.d/config.el +++ b/config/.doom.d/config.el @@ -19,13 +19,13 @@ ;; ;; 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 "Iosevka Term SS12" :size 28) - doom-variable-pitch-font (font-spec :family "Cantarell" :size 28 :weight 'bold)) +(setq doom-font (font-spec :family "Iosevka Term SS12" :size 18) + doom-variable-pitch-font (font-spec :family "Cantarell" :size 18 :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 ;; `load-theme' function. This is the default: -(setq doom-theme 'doom-rose-pine) +(setq doom-theme 'doom-gruvbox) ;; If you use `org' and don't want your org files in the default location below, ;; change `org-directory'. It must be set before org loads! @@ -155,3 +155,5 @@ (setq dime-dylan-implementations '((opendylan ("/home/mikec/Documents/suckless/dylan/opendylan-2024.1/bin/dswank") :env ("OPEN_DYLAN_USER_REGISTRIES=/tmp/dime-test/registry")))) + +(setq doc-view-mupdf-use-svg t) diff --git a/config/.doom.d/init.el b/config/.doom.d/init.el index 17ba487..3436c13 100644 --- a/config/.doom.d/init.el +++ b/config/.doom.d/init.el @@ -100,7 +100,7 @@ magit ; a git porcelain for Emacs ;;make ; run make tasks from Emacs ;;pass ; password manager for nerds - pdf ; pdf enhancements + ;; pdf ; pdf enhancements ;;prodigy ; FIXME managing external services & code builders ;;rgb ; creating color strings ;;taskrunner ; taskrunner for all your projects