font/terminal update

This commit is contained in:
Michael Chalupiak 2025-03-18 16:25:28 -04:00
parent bc435f0f38
commit 3ea525b653
6 changed files with 165 additions and 141 deletions

View File

@ -19,29 +19,28 @@ plug "kak-lsp/kak-lsp" do %{
cargo install --locked --force --path . cargo install --locked --force --path .
} }
# plug "gustavo-hms/luar" %{ plug "gustavo-hms/luar" %{
# plug "gustavo-hms/peneira" %{ plug "gustavo-hms/peneira" %{
# require-module peneira require-module peneira
# } }
# } }
# # Color Themes # # Color Themes
plug "tinted-theming/base16-kakoune" plug "tinted-theming/base16-kakoune"
### End Of Plugins ### ### End Of Plugins ###
# set-option global luar_interpreter luajit set-option global luar_interpreter luajit
## Treesitter ## ## Treesitter ##
#eval %sh{ kak-tree-sitter -dksv --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 } # 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"
} # }
## Highlighting ## ## Highlighting ##
hook global WinCreate .* %{ add-highlighter window/number-lines number-lines -relative -hlcursor} hook global WinCreate .* %{ add-highlighter window/number-lines number-lines -relative -hlcursor}
add-highlighter global/ show-matching add-highlighter global/ show-matching
@ -52,78 +51,78 @@ add-highlighter global/ show-whitespaces
add-highlighter global/ wrap -word -indent add-highlighter global/ wrap -word -indent
## Formatting ## ## Formatting ##
define-command enable-autofmt -docstring 'enable autoformatting of buffer' %{ # define-command enable-autofmt -docstring 'enable autoformatting of buffer' %{
#
#
hook global -group autofmt BufSetOption filetype=(zig) %{ # hook global -group autofmt BufSetOption filetype=(zig) %{
set-option buffer formatcmd 'zig fmt --stdin' # set-option buffer formatcmd 'zig fmt --stdin'
#
hook -group autofmt buffer BufOpenFile .* %{ # hook -group autofmt buffer BufOpenFile .* %{
format # format
} # }
#
hook -group autofmt buffer BufWritePre .* %{ # hook -group autofmt buffer BufWritePre .* %{
format # format
} # }
} # }
#
hook global -group autofmt BufSetOption filetype=(html) %{ # hook global -group autofmt BufSetOption filetype=(html) %{
set-option buffer formatcmd 'prettier --tab-width 4 --parser html' # set-option buffer formatcmd 'prettier --tab-width 4 --parser html'
#
hook -group autofmt buffer BufOpenFile .* %{ # hook -group autofmt buffer BufOpenFile .* %{
format # format
} # }
#
hook -group autofmt buffer BufWritePre .* %{ # hook -group autofmt buffer BufWritePre .* %{
format # format
} # }
} # }
#
hook global -group autofmt BufSetOption filetype=(css) %{ # hook global -group autofmt BufSetOption filetype=(css) %{
set-option buffer formatcmd 'prettier --tab-width 4 --parser css' # set-option buffer formatcmd 'prettier --tab-width 4 --parser css'
#
hook -group autofmt buffer BufOpenFile .* %{ # hook -group autofmt buffer BufOpenFile .* %{
format # format
} # }
#
hook -group autofmt buffer BufWritePre .* %{ # hook -group autofmt buffer BufWritePre .* %{
format # format
} # }
} # }
#
hook global -group autofmt BufSetOption filetype=(javascript) %{ # hook global -group autofmt BufSetOption filetype=(javascript) %{
set-option buffer formatcmd 'prettier --tab-width 4 --parser typescript' # set-option buffer formatcmd 'prettier --tab-width 4 --parser typescript'
#
hook -group autofmt buffer BufOpenFile .* %{ # hook -group autofmt buffer BufOpenFile .* %{
format # format
} # }
#
hook -group autofmt buffer BufWritePre .* %{ # hook -group autofmt buffer BufWritePre .* %{
format # format
} # }
} # }
#
hook global -group autofmt BufSetOption filetype=(go) %{ # hook global -group autofmt BufSetOption filetype=(go) %{
set-option buffer formatcmd 'gofmt' # set-option buffer formatcmd 'gofmt'
#
hook -group autofmt buffer BufOpenFile .* %{ # hook -group autofmt buffer BufOpenFile .* %{
format # format
} # }
#
hook -group autofmt buffer BufWritePre .* %{ # hook -group autofmt buffer BufWritePre .* %{
format # format
} # }
} # }
} # }
#
define-command disable-autofmt -docstring 'disable autoformatting of buffer' %{ # define-command disable-autofmt -docstring 'disable autoformatting of buffer' %{
remove-hooks global autofmt # remove-hooks global autofmt
} # }
#
enable-autofmt # enable-autofmt
#
#
## Indentation ## # ## Indentation ##
set global tabstop 4 set global tabstop 4
set global indentwidth 4 set global indentwidth 4
hook global WinSetOption filetype=.* expandtab hook global WinSetOption filetype=.* expandtab
@ -132,57 +131,57 @@ hook global BufCreate .* %{
editorconfig-load editorconfig-load
autoconfigtab autoconfigtab
} }
#
define-command sleuth -docstring 'Heuristically set buffer options' %{ # define-command sleuth -docstring 'Heuristically set buffer options' %{
try %{ # try %{
evaluate-commands -draft %{ # evaluate-commands -draft %{
# Search the first indent level # # Search the first indent level
execute-keys 'gg' '/' '^\h+' '<ret>' # execute-keys 'gg' '/' '^\h+' '<ret>'
#
# Tab vs. Space # # Tab vs. Space
# https://youtu.be/V7PLxL8jIl8 # # https://youtu.be/V7PLxL8jIl8
try %{ # try %{
execute-keys '<a-k>' '\t' '<ret>' # execute-keys '<a-k>' '\t' '<ret>'
#set-option buffer indentwidth 0 # #set-option buffer indentwidth 0
noexpandtab # noexpandtab
} catch %{ # } catch %{
set-option buffer indentwidth %val{selection_length} # set-option buffer indentwidth %val{selection_length}
expandtab # expandtab
} # }
} # }
} # }
} # }
#
define-command git-status -docstring 'Show git diff' %{ # define-command git-status -docstring 'Show git diff' %{
hook -group git-status global BufOpenFile .* %{ # hook -group git-status global BufOpenFile .* %{
git show-diff # git show-diff
} # }
#
hook -group git-status global BufWritePost .* %{ # hook -group git-status global BufWritePost .* %{
git show-diff # git show-diff
} # }
} # }
#
define-command disable-git-status -docstring 'Disable git diff gutter' %{ # define-command disable-git-status -docstring 'Disable git diff gutter' %{
remove-hooks global git-status # remove-hooks global git-status
} # }
#
define-command sleuth-enable -docstring 'Enable sleuth' %{ # define-command sleuth-enable -docstring 'Enable sleuth' %{
# Run sleuth when opening and saving files. # # Run sleuth when opening and saving files.
hook -group sleuth global BufOpenFile .* %{ # hook -group sleuth global BufOpenFile .* %{
sleuth # sleuth
} # }
#
hook -group sleuth global BufWritePost .* %{ # hook -group sleuth global BufWritePost .* %{
sleuth # sleuth
} # }
} # }
#
define-command sleuth-disable -docstring 'Disable sleuth' %{ # define-command sleuth-disable -docstring 'Disable sleuth' %{
remove-hooks global sleuth # remove-hooks global sleuth
} # }
#
## LSP ## # ## LSP ##
lsp-enable lsp-enable
lsp-auto-hover-enable lsp-auto-hover-enable
@ -424,3 +423,5 @@ map -docstring 'clipboard paste' global user p ':xpaste<ret>'
map -docstring 'quit kakoune' global user q ':q<ret>' map -docstring 'quit kakoune' global user q ':q<ret>'
map -docstring 'toggle comments' global user c ':comment-line<ret>' map -docstring 'toggle comments' global user c ':comment-line<ret>'
colorscheme base16-gruvbox-dark-medium

View File

@ -202,6 +202,26 @@ return require('packer').startup(function(use)
} }
use 'ollykel/v-vim' 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 { use {
'windwp/nvim-ts-autotag', 'windwp/nvim-ts-autotag',
config = function() config = function()

View File

@ -11,7 +11,7 @@
# Note: the "Super" modifier is also known as Logo, GUI, Windows, Mod4, etc. # 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) # 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"' riverctl map normal Super D spawn 'bemenu-run --fn "Iosevka Term SS12 14"'
# Super+Q to close the focused view # 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 & 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 # 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 & 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

View File

@ -15,7 +15,7 @@ set $up k
set $right l set $right l
# Your preferred terminal emulator # Your preferred terminal emulator
#set $term foot -f Fairfax\ Hax\ HD:size=14 #set $term foot -f Fairfax\ Hax\ HD:size=14
set $term ghostty set $term alacritty
# Your preferred application launcher # Your preferred application launcher
# Note: pass the final command to swaymsg so that the resulting window can be opened # 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. # on the original workspace that the command was run on.

View File

@ -19,13 +19,13 @@
;; ;;
;; 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 "Iosevka Term SS12" :size 28) (setq doom-font (font-spec :family "Iosevka Term SS12" :size 18)
doom-variable-pitch-font (font-spec :family "Cantarell" :size 28 :weight 'bold)) 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 ;; 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
;; `load-theme' function. This is the default: ;; `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, ;; 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! ;; change `org-directory'. It must be set before org loads!
@ -155,3 +155,5 @@
(setq dime-dylan-implementations (setq dime-dylan-implementations
'((opendylan ("/home/mikec/Documents/suckless/dylan/opendylan-2024.1/bin/dswank") '((opendylan ("/home/mikec/Documents/suckless/dylan/opendylan-2024.1/bin/dswank")
:env ("OPEN_DYLAN_USER_REGISTRIES=/tmp/dime-test/registry")))) :env ("OPEN_DYLAN_USER_REGISTRIES=/tmp/dime-test/registry"))))
(setq doc-view-mupdf-use-svg t)

View File

@ -100,7 +100,7 @@
magit ; a git porcelain for Emacs magit ; a git porcelain for Emacs
;;make ; run make tasks from Emacs ;;make ; run make tasks from Emacs
;;pass ; password manager for nerds ;;pass ; password manager for nerds
pdf ; pdf enhancements ;; pdf ; pdf enhancements
;;prodigy ; FIXME managing external services & code builders ;;prodigy ; FIXME managing external services & code builders
;;rgb ; creating color strings ;;rgb ; creating color strings
;;taskrunner ; taskrunner for all your projects ;;taskrunner ; taskrunner for all your projects