commit 94cd8c6e75562dc5592544bad233f54f1a759d1a parent bc05ea97d37cc23e2ead0b8f154d3bcf86eb9841 Author: mtmn <miro@haravara.org> Date: Fri, 19 Jun 2026 17:45:21 +0200 foot switch font hack, helix cleanup, etc. Diffstat:
19 files changed, 111 insertions(+), 392 deletions(-)
diff --git a/modules/mixins/dotfiles/bin/footf b/modules/mixins/dotfiles/bin/footf @@ -0,0 +1,5 @@ +#!/bin/sh +set -eu +dir="${XDG_CONFIG_HOME:-$HOME/.config}/foot" +ls -l "$dir/fonts" +ln -sf "fonts/$1.ini" "$dir/foot.ini" diff --git a/modules/mixins/dotfiles/config/foot/common.ini b/modules/mixins/dotfiles/config/foot/common.ini @@ -0,0 +1,50 @@ +[scrollback] +lines=10000 + +[mouse] +hide-when-typing=yes + +[cursor] +style=block +blink=no + +[colors-dark] +cursor=000000 ef1e20 + +background=000000 +foreground=ffffff + +selection-background=ef1e20 +selection-foreground=000000 + +regular0=000000 +regular1=ff0033 +regular2=00ff5f +regular3=ffe600 +regular4=00b3ff +regular5=ff00cc +regular6=00ffff +regular7=e6e6e6 + +bright0=555555 +bright1=ff5577 +bright2=5fff87 +bright3=ffff33 +bright4=5fc8ff +bright5=ff5fff +bright6=5fffff +bright7=ffffff + +[key-bindings] +clipboard-copy=Control+Shift+c +clipboard-paste=Control+Shift+v +primary-paste=Shift+Insert +search-start=Control+Shift+r +font-increase=Control+plus Control+equal +font-decrease=Control+minus +font-reset=Control+0 +spawn-terminal=Control+Shift+n +show-urls-launch=Alt+Control+o + +[csd] +preferred=none diff --git a/modules/mixins/dotfiles/config/foot/fonts/cc.ini b/modules/mixins/dotfiles/config/foot/fonts/cc.ini @@ -0,0 +1,7 @@ +include=~/.config/foot/common.ini + +[main] +font=Comic Code:style=Regular:size=12 +font-bold=Comic Code:style=Regular:size=12 +font-italic=Comic Code:style=Regular:size=12 +font-bold-italic=Comic Code:style=Regular:size=12 diff --git a/modules/mixins/dotfiles/config/foot/fonts/cl.ini b/modules/mixins/dotfiles/config/foot/fonts/cl.ini @@ -0,0 +1,7 @@ +include=~/.config/foot/common.ini + +[main] +font=Codelia:style=Regular:size=12 +font-bold=Codelia:style=Regular:size=12 +font-italic=Codelia:style=Regular:size=12 +font-bold-italic=Codelia:style=Regular:size=12 diff --git a/modules/mixins/dotfiles/config/foot/fonts/pp.ini b/modules/mixins/dotfiles/config/foot/fonts/pp.ini @@ -0,0 +1,7 @@ +include=~/.config/foot/common.ini + +[main] +font=PragmataPro:style=Regular:size=14 +font-bold=PragmataPro:style=Regular:size=14 +font-italic=PragmataPro:style=Regular:size=14 +font-bold-italic=PragmataPro:style=Regular:size=14 diff --git a/modules/mixins/dotfiles/config/foot/fonts/uw.ini b/modules/mixins/dotfiles/config/foot/fonts/uw.ini @@ -0,0 +1,7 @@ +include=~/.config/foot/common.ini + +[main] +font=Ttyp0 OTB:style=Regular:size=13 +font-bold=Ttyp0 OTB:style=Regular:size=13 +font-italic=Ttyp0 OTB:style=Regular:size=13 +font-bold-italic=Ttyp0 OTB:style=Regular:size=13 diff --git a/modules/mixins/dotfiles/config/foot/foot_cc.ini b/modules/mixins/dotfiles/config/foot/foot_cc.ini @@ -1,57 +0,0 @@ -[main] -font=Comic Code:style=Regular:size=12 -font-bold=Comic Code:style=Regular:size=12 -font-italic=Comic Code:style=Regular:size=12 -font-bold-italic=Comic Code:style=Regular:size=12 - -[scrollback] -lines=10000 - -[mouse] -hide-when-typing=yes - -[cursor] -style=block -blink=no - -[colors-dark] -alpha = 0.935 -cursor=000000 ff00cc - -background=000000 -foreground=ffffff - -selection-background=ff00cc -selection-foreground=000000 - -regular0=000000 -regular1=ff0033 -regular2=00ff5f -regular3=ffe600 -regular4=00b3ff -regular5=ff00cc -regular6=00ffff -regular7=e6e6e6 - -bright0=555555 -bright1=ff5577 -bright2=5fff87 -bright3=ffff33 -bright4=5fc8ff -bright5=ff5fff -bright6=5fffff -bright7=ffffff - -[key-bindings] -clipboard-copy=Control+Shift+c -clipboard-paste=Control+Shift+v -primary-paste=Shift+Insert -search-start=Control+Shift+r -font-increase=Control+plus Control+equal -font-decrease=Control+minus -font-reset=Control+0 -spawn-terminal=Control+Shift+n -show-urls-launch=Alt+Control+o - -[csd] -preferred=none diff --git a/modules/mixins/dotfiles/config/foot/foot_cl.ini b/modules/mixins/dotfiles/config/foot/foot_cl.ini @@ -1,57 +0,0 @@ -[main] -font=Codelia:style=Regular:size=12 -font-bold=Codelia:style=Regular:size=12 -font-italic=Codelia:style=Regular:size=12 -font-bold-italic=Codelia:style=Regular:size=12 - -[scrollback] -lines=10000 - -[mouse] -hide-when-typing=yes - -[cursor] -style=block -blink=no - -[colors-dark] -alpha = 0.935 -cursor=000000 ff00cc - -background=000000 -foreground=ffffff - -selection-background=ff00cc -selection-foreground=000000 - -regular0=000000 -regular1=ff0033 -regular2=00ff5f -regular3=ffe600 -regular4=00b3ff -regular5=ff00cc -regular6=00ffff -regular7=e6e6e6 - -bright0=555555 -bright1=ff5577 -bright2=5fff87 -bright3=ffff33 -bright4=5fc8ff -bright5=ff5fff -bright6=5fffff -bright7=ffffff - -[key-bindings] -clipboard-copy=Control+Shift+c -clipboard-paste=Control+Shift+v -primary-paste=Shift+Insert -search-start=Control+Shift+r -font-increase=Control+plus Control+equal -font-decrease=Control+minus -font-reset=Control+0 -spawn-terminal=Control+Shift+n -show-urls-launch=Alt+Control+o - -[csd] -preferred=none diff --git a/modules/mixins/dotfiles/config/foot/foot_pp.ini b/modules/mixins/dotfiles/config/foot/foot_pp.ini @@ -1,57 +0,0 @@ -[main] -font=PragmataPro:style=Regular:size=14 -font-bold=PragmataPro:style=Regular:size=14 -font-italic=PragmataPro:style=Regular:size=14 -font-bold-italic=PragmataPro:style=Regular:size=14 - -[scrollback] -lines=10000 - -[mouse] -hide-when-typing=yes - -[cursor] -style=block -blink=no - -[colors-dark] -alpha = 0.935 -cursor=000000 ff00cc - -background=000000 -foreground=ffffff - -selection-background=ff00cc -selection-foreground=000000 - -regular0=000000 -regular1=ff0033 -regular2=00ff5f -regular3=ffe600 -regular4=00b3ff -regular5=ff00cc -regular6=00ffff -regular7=e6e6e6 - -bright0=555555 -bright1=ff5577 -bright2=5fff87 -bright3=ffff33 -bright4=5fc8ff -bright5=ff5fff -bright6=5fffff -bright7=ffffff - -[key-bindings] -clipboard-copy=Control+Shift+c -clipboard-paste=Control+Shift+v -primary-paste=Shift+Insert -search-start=Control+Shift+r -font-increase=Control+plus Control+equal -font-decrease=Control+minus -font-reset=Control+0 -spawn-terminal=Control+Shift+n -show-urls-launch=Alt+Control+o - -[csd] -preferred=none diff --git a/modules/mixins/dotfiles/config/foot/foot_uw.ini b/modules/mixins/dotfiles/config/foot/foot_uw.ini @@ -1,57 +0,0 @@ -[main] -font=Ttyp0 OTB:style=Regular:size=13 -font-bold=Ttyp0 OTB:style=Regular:size=13 -font-italic=Ttyp0 OTB:style=Regular:size=13 -font-bold-italic=Ttyp0 OTB:style=Regular:size=13 - -[scrollback] -lines=10000 - -[mouse] -hide-when-typing=yes - -[cursor] -style=block -blink=no - -[colors-dark] -alpha = 0.935 -cursor=000000 ff00cc - -background=000000 -foreground=ffffff - -selection-background=ff00cc -selection-foreground=000000 - -regular0=000000 -regular1=ff0033 -regular2=00ff5f -regular3=ffe600 -regular4=00b3ff -regular5=ff00cc -regular6=00ffff -regular7=e6e6e6 - -bright0=555555 -bright1=ff5577 -bright2=5fff87 -bright3=ffff33 -bright4=5fc8ff -bright5=ff5fff -bright6=5fffff -bright7=ffffff - -[key-bindings] -clipboard-copy=Control+Shift+c -clipboard-paste=Control+Shift+v -primary-paste=Shift+Insert -search-start=Control+Shift+r -font-increase=Control+plus Control+equal -font-decrease=Control+minus -font-reset=Control+0 -spawn-terminal=Control+Shift+n -show-urls-launch=Alt+Control+o - -[csd] -preferred=none diff --git a/modules/mixins/dotfiles/config/helix/config.toml b/modules/mixins/dotfiles/config/helix/config.toml @@ -1,77 +0,0 @@ -theme = "mtmn" - -[editor] -line-number = "relative" -mouse = false -cursorline = true -true-color = true -bufferline = "never" -auto-pairs = true -idle-timeout = 50 -auto-info = false -completion-trigger-len = 2 - -default-yank-register = "+" - -gutters = ["line-numbers", "diagnostics"] - -[editor.file-picker] -hidden = false - -[editor.statusline] -left = ["mode", "spinner", "file-name", "file-modification-indicator"] -center = [] -right = ["diagnostics", "selections", "position", "file-encoding", "file-line-ending", "file-type"] -separator = "│" - -[editor.lsp] -display-messages = true -display-inlay-hints = true - -[keys.normal] -"#" = "toggle_comments" -"^" = "goto_first_nonwhitespace" -"$" = "goto_line_end" -";" = "command_mode" - -[keys.normal.space] -"space" = "file_picker" -"b" = "buffer_picker" -"w" = ":write" - -[keys.normal.space.f] -"f" = "file_picker" -"h" = "last_picker" -"g" = "global_search" - -[keys.normal.space.g] -"g" = "hover" -"d" = "goto_definition" -"D" = "goto_declaration" -"i" = "goto_implementation" -"t" = "goto_type_definition" -"r" = "goto_reference" -"s" = "signature_help" -"l" = ":reflow" -"p" = "goto_prev_diag" -"n" = "goto_next_diag" -"a" = "code_action" -"f" = "format_selections" - -[keys.normal.space.r] -"r" = "rename_symbol" - -[keys.normal.space.t] -"r" = "symbol_picker" - -[keys.insert] -"C-space" = "completion" - -[keys.select] -"f" = "select_regex" -"^" = "goto_first_nonwhitespace" -"$" = "goto_line_end" -";" = "command_mode" - -[keys.select.space.g] -"f" = "format_selections" diff --git a/modules/mixins/dotfiles/config/helix/languages.toml b/modules/mixins/dotfiles/config/helix/languages.toml @@ -1,62 +0,0 @@ -[[language]] -name = "python" -language-servers = ["basedpyright"] - -[language-server.basedpyright] -command = "basedpyright-langserver" -args = ["--stdio"] - -[[language]] -name = "go" -auto-format = true -language-servers = [ "gopls" ] - -[language-server.gopls] -command = "gopls" -config = { "analyses" = { "unusedparams" = true }, "staticcheck" = true, "gofumpt" = true } - -[[language]] -name = "zig" -auto-format = true - -[[language]] -name = "rust" -auto-format = true - -[[language]] -name = "cpp" -auto-format = true - -[[language]] -name = "c" -auto-format = true - -[[language]] -name = "php" -language-servers = ["intelephense"] - -[language-server.intelephense] -command = "intelephense" -args = ["--stdio"] - -[[language]] -name = "gleam" -auto-format = true - -[[language]] -name = "markdown" - -[language-server.tofu-ls] -command = "tofu-ls" -args = ["serve"] - -[[language]] -name = "hcl" -language-id = "opentofu" -scope = "source.hcl" -file-types = ["tf", "tofu", "tfvars"] -auto-format = true -comment-token = "#" -block-comment-tokens = { start = "/*", end = "*/" } -indent = { tab-width = 2, unit = " " } -language-servers = [ "tofu-ls" ] diff --git a/modules/mixins/dotfiles/config/helix/themes/mtmn.toml b/modules/mixins/dotfiles/config/helix/themes/mtmn.toml @@ -1,2 +0,0 @@ -inherits = "modus_vivendi_tritanopia" -"ui.background" = {} diff --git a/modules/mixins/dotfiles/config/nvim/fnl/init.fnl b/modules/mixins/dotfiles/config/nvim/fnl/init.fnl @@ -37,7 +37,7 @@ {:src (gh :saghen/blink.cmp) :version (vim.version.range "^1")}] {:load true}) - ((. (require :neomodern) :load) :iceclimber) + ((. (require :neomodern) :load) :gyokuro) (vim.api.nvim_set_hl 0 :Normal {:bg :NONE}) (vim.api.nvim_set_hl 0 :NormalFloat {:bg :NONE}) (vim.api.nvim_set_hl 0 :NormalNC {:bg :NONE}) diff --git a/modules/mixins/dotfiles/config/offpunk/offpunkrc b/modules/mixins/dotfiles/config/offpunk/offpunkrc @@ -1,4 +0,0 @@ -set ftr_site_config /home/miro/src/github.com/fivefilters/ftr-site-config -set images_size 40 -cookies import /home/miro/misc/www/cookies/ashmann.txt https://ashmann.co -cookies import /home/miro/misc/www/cookies/firstfloor.txt https://firstfloor.substack.com diff --git a/modules/mixins/dotfiles/config/shell/rc/aliased-short-names b/modules/mixins/dotfiles/config/shell/rc/aliased-short-names @@ -146,9 +146,4 @@ alias bak='backup' alias bakg='backup -t git' alias bakm='backup -t mobius' -alias foot_cc='\ln -sf $HOME/.config/foot/foot_cc.ini $HOME/.config/foot/foot.ini' -alias foot_cl='\ln -sf $HOME/.config/foot/foot_cl.ini $HOME/.config/foot/foot.ini' -alias foot_pp='\ln -sf $HOME/.config/foot/foot_pp.ini $HOME/.config/foot/foot.ini' -alias foot_uw='\ln -sf $HOME/.config/foot/foot_uw.ini $HOME/.config/foot/foot.ini' - alias chav='cha --visual' diff --git a/modules/mixins/dotfiles/home/SciTEUser.properties b/modules/mixins/dotfiles/home/SciTEUser.properties @@ -0,0 +1,6 @@ +font.base=font:!Fira Mono,size:12 +style.*.32=$(font.base) + +tabbar.visible=0 +toolbar.visible=0 +statusbar.visible=0 diff --git a/modules/mixins/dotfiles/home/local/share/applications/scite.desktop b/modules/mixins/dotfiles/home/local/share/applications/scite.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Name=SciTE +Exec=/bin/scite %f +Categories=Other; +NoDisplay=true +MimeType=text/plain +Terminal=false diff --git a/modules/mixins/dotfiles/home/tmux.conf b/modules/mixins/dotfiles/home/tmux.conf @@ -13,25 +13,25 @@ set -g status-interval 30 set -g status-left '' set -g status-right '#(test -f /tmp/pracomer.log && cat /tmp/pracomer.log) #(plants) %a %h-%d %H:%M #(cat /sys/class/power_supply/BAT*/capacity 2>/dev/null)%% ' -set -g status-style "fg=#ebebeb" -set -g message-style "fg=#ebebeb" -set -g message-command-style "fg=#ebebeb" -set -g mode-style "fg=#ebebeb" - -set -g menu-style "fg=#ebebeb" -set -g menu-selected-style "fg=#101010" -set -g menu-border-style "fg=default" +set -g status-style "fg=#ebebeb,bg=default" +set -g message-style "fg=#ebebeb,bg=#373737" +set -g message-command-style "fg=#ebebeb,bg=#373737" +set -g mode-style "fg=#ebebeb,bg=#373737" + +set -g menu-style "fg=#ebebeb,bg=default" +set -g menu-selected-style "fg=#101010,bg=#ebebeb" +set -g menu-border-style "fg=default,bg=default" set -g menu-border-lines "none" set -g pane-border-style "fg=#373737" set -g pane-active-border-style "fg=#808080" -set -g window-status-style "fg=#808080" -set -g window-status-current-style "fg=#ebebeb,bold" -set -g window-status-bell-style "fg=#ebebeb,bold" +set -g window-status-style "fg=#808080,bg=default" +set -g window-status-current-style "fg=#ebebeb,bg=default,bold" +set -g window-status-bell-style "fg=#ebebeb,bg=default,bold" -set -g status-left-style "fg=#ebebeb" -set -g status-right-style "fg=#ebebeb" +set -g status-left-style "fg=#ebebeb,bg=default" +set -g status-right-style "fg=#ebebeb,bg=default" setw -g xterm-keys on set -ga terminal-overrides ',xterm*:XT'