~wintershadows/dotfiles

d3f485660cb149f4308e63f7df61b3238353be02 — No Man's Slave a month ago 74b8a4b + 356fb9c
Merge branch 'master' of git.sr.ht:~wintershadows/dotfiles
M .config/envrc.d/10_rust.sh => .config/envrc.d/10_rust.sh +2 -1
@@ 1,2 1,3 @@
export CARGO_HOME="$HOME/.local/share/cargo"
export RUSTUP_HOME="$HOME/.rustup"
export CARGO_HOME="$HOME/.cargo"
prepend_to_path "$CARGO_HOME/bin"

A .config/herbstluftwm/.gitignore => .config/herbstluftwm/.gitignore +1 -0
@@ 0,0 1,1 @@
gen-sys-info.venv/

M .config/nvim/autoload/local/gui.vim => .config/nvim/autoload/local/gui.vim +10 -6
@@ 81,31 81,35 @@ function! local#gui#set_font(name, options)

  let l:w = get(a:options, 'weight', 0)
  if l:w
    let l:val_parts += ['w'.l:h]
    let l:val_parts += ['w'.l:w]
  endif

  let l:i = get(a:options, 'italic', 0)
  if l:i
    let l:val_parts += ['i'.l:h]
    let l:val_parts += ['i'.l:i]
  endif

  let l:b = get(a:options, 'bold', 0)
  if l:b
    let l:val_parts += ['b'.l:h]
    let l:val_parts += ['b'.l:b]
  endif

  let l:sb = get(a:options, 'semibold', 0)
  if l:sb
    let l:val_parts += ['sb'.l:h]
    let l:val_parts += ['sb'.l:sb]
  endif

  let l:l = get(a:options, 'light', 0)
  if l:l
    let l:val_parts += ['l'.l:h]
    let l:val_parts += ['l'.l:l]
  endif

  let l:val = join(l:val_parts, ':')

  let &guifont = l:val
  if exists(':Guifont')
    execute 'Guifont! '.l:val
  else
    let &guifont = l:val
  endif
endfunction
" }}}

M .config/nvim/ginit.vim => .config/nvim/ginit.vim +1 -1
@@ 16,7 16,7 @@ if has('mac')
elseif hostname() == 'freedombox'
  " For some reason it's 'ypn envypn' on Suse, but 'envypn' on Debian...
  let g:gui_default_font_name = 'Iosevka SS01'
  let g:gui_default_font_opts = {'size': 11, 'weight': 60}
  let g:gui_default_font_opts = {'size': 10, 'weight': 60}
elseif hostname() == 'freedom-slab'
  let g:gui_default_font_spec = 'envypn'
  let g:gui_default_font_opts = {'size': 8}

M .config/nvim/lua/plugin-config.lua => .config/nvim/lua/plugin-config.lua +6 -0
@@ 325,6 325,12 @@ lspconfig.sqlls.setup({
  on_attach = lspconfig_on_attach,
})

-- TODO: Use Vlime mappings + some REPL integration
-- raco pkg install racket-langserver
lspconfig.racket_langserver.setup({
  on_attach = lspconfig_on_attach,
})

-- :LspInstall sumneko_lua
--lspconfig.sumneko_lua.setup({
--  settings = {

M .config/qterminal.org/qterminal.ini => .config/qterminal.org/qterminal.ini +3 -3
@@ 56,9 56,9 @@ Width=70
[MainWindow]
ApplicationTransparency=0
fixedSize=@Size(600 400)
pos=@Point(6 27)
size=@Size(1906 1165)
state=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\xfc\x2\0\0\0\x1\xfb\0\0\0&\0\x42\0o\0o\0k\0m\0\x61\0r\0k\0s\0\x44\0o\0\x63\0k\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x8b\0\xff\xff\xff\0\0\ar\0\0\x4\x8d\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\0)
pos=@Point(963 613)
size=@Size(949 579)
state=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\xfc\x2\0\0\0\x1\xfb\0\0\0&\0\x42\0o\0o\0k\0m\0\x61\0r\0k\0s\0\x44\0o\0\x63\0k\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x8b\0\xff\xff\xff\0\0\x3\xb5\0\0\x2\x43\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\0)

[Sessions]
size=0

M .gitignore => .gitignore +2 -3
@@ 2,9 2,8 @@
/bin/keystatus
/bin/xftwidth
/lib/zsh/*.zwc
/.config/herbstluftwm/gen-sys-info.venv/
/.zcompdump
/.zcompcache
.zcompdump
.zcompcache

# Log files
/.config/herbstluftwm/autostart.log

M .profile => .profile +0 -1
@@ 2,4 2,3 @@ if [ -r ~/.config/envrc ]
then
	. ~/.config/envrc
fi


A .racket/racket-prefs.rktd => .racket/racket-prefs.rktd +55 -0
@@ 0,0 1,55 @@
(
 (plt:framework-pref:framework:exit-when-no-frames #t)
 (|plt:DrRacket 7.8-splash-max-width| 995)
 (plt:framework-pref:plt:debug-tool:stack/variable-area 9/10)
 (plt:framework-pref:drracket:unit-window-size-percentage 1/2)
 (plt:framework-pref:drracket:recent-language-names (("Determine language from source" #6(#t print mixed-fraction-e #f #t debug) (default) #0() #f #t #t ((test) (main)) #t)))
 (plt:framework-pref:drracket:language-settings ((-32768) (#6(#t print mixed-fraction-e #f #t debug) (default) #0() #f #t #t ((test) (main)) #t)))
 (plt:framework-pref:drracket:window-position #hash((#f . (0 7 614)) (((0 0 1920 1200)) . (0 7 614))))
 (plt:framework-pref:framework:standard-style-list:font-size #2(#hash((((1920 1200)) . 10)) 10))
 (plt:framework-pref:framework:standard-style-list:font-name "Iosevka SS01")
 (plt:framework-pref:framework:standard-style-list:weight normal)
 (external-browser xdg-open)
 (plt:framework-pref:external-browser xdg-open)
 (plt:framework-pref:framework:white-on-black? #t)
 (plt:framework-pref:framework:delegatee-overview-color (62 67 155 1.0))
 (plt:framework-pref:framework:color-scheme white-on-black)
 (plt:framework-pref:framework:paren-color-scheme shades-of-gray)
 (plt:framework-pref:drracket:show-line-numbers? #t)
 (plt:framework-pref:framework:anchored-search #t)
 (plt:framework-pref:framework:automatic-parens #t)
 (plt:framework-pref:framework:fixup-open-parens #t)
 (plt:framework-pref:drracket:defs/ints-horizontal #f)
 (plt:framework-pref:drracket:dont-ask-about-saving-files-on-tab-switch? #t)
 (plt:framework-pref:drracket:profile:scale sqrt)
 (plt:framework-pref:drracket:tools-configuration
  (
   (((lib "lazy") ("lazy-tool.rkt")) skip)
   (((lib "slideshow") ("tool.rkt")) load)
   (((lib "xml") ("text-box-tool.rkt")) load)
   (((lib "lang") "htdp-langs.rkt") skip)
   (((lib "frtime" "tool") "frtime-tool.rkt") skip)
   (((lib "deinprogramm") "sdp/private/sdp-langs.rkt") skip)
   (((lib "deinprogramm") "DMdA/private/DMdA-langs.rkt") skip)
   (((lib "algol60") ("tool.rkt")) skip)
  ))
 (plt:framework-pref:color-scheme-entry:framework:basic-canvas-background #hash((white-on-black . #4(5 5 5 1.0))))
 (plt:framework-pref:color-scheme-entry:framework:default-text-color #hash((white-on-black . #4(231 231 231 1.0))))
 (plt:framework-pref:color-scheme-entry:framework:misspelled-text-color #hash((white-on-black . #4(172 138 140 1.0))))
 (plt:framework-pref:color-scheme-entry:framework:syntax-color:scheme:text #hash((white-on-black . (base base (0 0 0) (1 1 1) #f base (138 172 139) (0.0 0.0 0.0) 0 1 italic base #t #f base base))))
 (plt:framework-pref:color-scheme-entry:framework:paren-match-color #hash((white-on-black . #4(76 76 76 1.0))))
 (plt:framework-pref:drracket:window-size #hash((#f . (#f 949 579)) (((0 0 1920 1200)) . (#f 949 579))))
 (plt:framework-pref:color-scheme-entry:drracket:read-eval-print-loop:value-color #hash((white-on-black . (base base (0 0 0) (1 1 1) #f base (143 138 172) (0.0 0.0 0.0) 0 1 italic base #f #f base normal))))
 (plt:framework-pref:color-scheme-entry:drracket:read-eval-print-loop:error-color #hash((white-on-black . (base base (0 0 0) (1 1 1) #f base (172 138 140) (0.0 0.0 0.0) 0 1 base italic #f #f base base))))
 (plt:framework-pref:color-scheme-entry:drracket:read-eval-print-loop:out-color #hash((white-on-black . (base base (0 0 0) (1 1 1) #f base (231 231 231) (0.0 0.0 0.0) 0 1 italic base #f #f base base))))
 (plt:framework-pref:color-scheme-entry:framework:syntax-color:scheme:hash-colon-keyword #hash((white-on-black . (base base (0 0 0) (1 1 1) #f base (138 171 172) (0.0 0.0 0.0) 0 1 base normal #t #f base base))))
 (plt:framework-pref:color-scheme-entry:framework:syntax-color:scheme:string #hash((white-on-black . (base base (0 0 0) (1 1 1) #f base (138 172 139) (0.0 0.0 0.0) 0 1 base normal #t #f base base))))
 (plt:framework-pref:drracket:most-recent-lang-line "#lang racket\n")
 (plt:framework-pref:color-scheme-entry:framework:syntax-color:scheme:comment #hash((white-on-black . (base base (0 0 0) (1 1 1) #f base (76 76 76) (0.0 0.0 0.0) 0 1 base normal #t #f base base))))
 (plt:framework-pref:color-scheme-entry:framework:syntax-color:scheme:other #hash((white-on-black . (base base (0 0 0) (1 1 1) #f base (171 137 171) (0.0 0.0 0.0) 0 1 base normal #t #f base base))))
 (plt:framework-pref:color-scheme-entry:framework:syntax-color:scheme:keyword #hash((white-on-black . (base base (0 0 0) (1 1 1) #f base (231 231 231) (0.0 0.0 0.0) 0 1 base normal #f #f base bold))))
 (plt:framework-pref:color-scheme-entry:framework:syntax-color:scheme:symbol #hash((white-on-black . (base base (0 0 0) (1 1 1) #f base (231 231 231) (0.0 0.0 0.0) 0 1 base normal #f #f base normal))))
 (plt:framework-pref:color-scheme-entry:framework:syntax-color:scheme:constant #hash((white-on-black . (base base (0 0 0) (1 1 1) #f base (170 136 170) (0.0 0.0 0.0) 0 1 base normal #t #f base normal))))
 (plt:framework-pref:color-scheme-entry:framework:syntax-color:scheme:parenthesis #hash((white-on-black . (base base (0 0 0) (1 1 1) #f base (76 76 76) (0.0 0.0 0.0) 0 1 base normal #t #f base normal))))
 (plt:framework-pref:color-scheme-entry:framework:syntax-color:scheme:error #hash((white-on-black . (base base (0 0 0) (1 1 1) #f base (232 74 83) (0.0 0.0 0.0) 0 1 base italic #t #f base bold))))
)

M .zshrc => .zshrc +4 -0
@@ 237,6 237,10 @@ else
	~/bin/rebuild-dircolors && source "${XDG_DATA_HOME}/dircolors.sh"
fi

if [[ -r "${XDG_DATA_HOME}/pipx-completions.zsh" ]]; then
	source "${XDG_DATA_HOME}/pipx-completions.zsh"
fi

init_conda() {
	_log 'Loading Conda integration...'
	local init_script="$XDG_DATA_HOME/conda-init.zsh"

M bin/rebuild => bin/rebuild +1 -1
@@ 1,6 1,6 @@
#!/usr/bin/env zsh

source ~/lib/zsh/strict-mode.zsh
# source ~/lib/zsh/strict-mode.zsh
setopt xtrace
setopt null_glob


A bin/rebuild-pipx-completions => bin/rebuild-pipx-completions +25 -0
@@ 0,0 1,25 @@
#!/usr/bin/env zsh

source ~/lib/zsh/strict-mode.zsh

main() {
	local xdg_data_home="${XDG_DATA_HOME:-$HOME/.local/share}"

	local target="${xdg_data_home}/pipx-completions.zsh"

	local pipx_exe
	pipx_exe=$( where -p pipx 2>/dev/null )
	if [[ $? -ne 0 ]]; then
		print -u2 -- "Pipx not found, removing scripts."
		rm -fv "$target"
		return 0
	fi

	if mkdir -p "$xdg_data_home"; then
		register-python-argcomplete pipx > "$target"
	fi

	print -- 'source "${XDG_DATA_HOME:-$HOME/.local/share}/pipx-init.zsh"'
}

main "$@"

M bin/rebuild-pyenv-init => bin/rebuild-pyenv-init +1 -1
@@ 5,7 5,7 @@ source ~/lib/zsh/strict-mode.zsh
main() {
	local xdg_data_home="${XDG_DATA_HOME:-$HOME/.local/share}"

	local target="${xdg_data_home}/pyenv-init.bash"
	local target="${xdg_data_home}/pyenv-init.zsh"

	local pyenv_exe
	pyenv_exe=$( where -p pyenv 2>/dev/null )

M bin/rebuild-pyenv-virtualenv-init => bin/rebuild-pyenv-virtualenv-init +1 -1
@@ 5,7 5,7 @@ source ~/lib/zsh/strict-mode.zsh
main() {
	local xdg_data_home="${XDG_DATA_HOME:-$HOME/.local/share}"

	local target="${xdg_data_home}/pyenv-virtualenv-init.bash"
	local target="${xdg_data_home}/pyenv-virtualenv-init.zsh"

	local pyenv_virtualenv_exe
	pyenv_virtualenv_exe=$( where -p pyenv-virtualenv 2>/dev/null )