Forever battle

.gitignore

@@ -1,2 +1,3 @@
 /janus/*
 byobu/.ssh-agent
+*.sqlite

config/alacritty/alacritty.toml

@@ -1,5 +1,3 @@
-import = ["~/.config/alacritty/themes/themes/tender.toml"]
-live_config_reload = true
 
 [bell]
 animation = "EaseOutExpo"
@@ -579,7 +577,7 @@ multiplier = 3
 save_to_clipboard = false
 semantic_escape_chars = ",│`|:\"' ()[]{}<>"
 
-[shell]
+[terminal.shell]
 args = ["-l"]
 program = "/bin/zsh"
 
@@ -593,3 +591,9 @@ startup_mode = "Windowed"
 [window.padding]
 x = 2
 y = 2
+
+[general]
+live_config_reload = true
+import = ["~/.config/alacritty/themes/themes/tender.toml"]
+
+[terminal]

config/ghostty/config

@@ -0,0 +1,48 @@
+# This is the configuration file for Ghostty.
+#
+# This template file has been automatically created at the following
+# path since Ghostty couldn't find any existing config files on your system:
+#
+#   /home/me/.config/ghostty/config
+#
+# The template does not set any default options, since Ghostty ships
+# with sensible defaults for all options. Users should only need to set
+# options that they want to change from the default.
+#
+# Run `ghostty +show-config --default --docs` to view a list of
+# all available config options and their default values.
+#
+# Additionally, each config option is also explained in detail
+# on Ghostty's website, at https://ghostty.org/docs/config.
+
+# Config syntax crash course
+# ==========================
+# # The config file consists of simple key-value pairs,
+# # separated by equals signs.
+# font-family = Iosevka
+# window-padding-x = 2
+#
+# # Spacing around the equals sign does not matter.
+# # All of these are identical:
+# key=value
+# key= value
+# key =value
+# key = value
+#
+# # Any line beginning with a # is a comment. It's not possible to put
+# # a comment after a config option, since it would be interpreted as a
+# # part of the value. For example, this will have a value of "#123abc":
+# background = #123abc
+#
+# # Empty values are used to reset config keys to default.
+# key =
+#
+# # Some config options have unique syntaxes for their value,
+# # which is explained in the docs for that config option.
+# # Just for example:
+# resize-overlay-duration = 4s 200ms
+
+font-family = Comic Code
+font-family-bold = Comic Code Bold
+font-family-italic = Comic Code Italic
+font-family-bold-italic = Comic Code Bold Italic

config/sway/config

@@ -135,7 +135,7 @@ font pango:Comic Code Bold 12
 
 xwayland enable
 
-set $term alacritty
+set $term ghostty
 
 exec swayidle -w \
     timeout 300 'swaylock -f -c 000000' \

gitconfig

@@ -69,7 +69,7 @@
 	forceSignAnnotated = true
 
 [gpg]
-	program = gpg2
+	program = gpg-sq
 
 [init]
 	templatedir = ~/.config/git_template

ipython/profile_default/startup/README

@@ -0,0 +1,11 @@
+This is the IPython startup directory
+
+.py and .ipy files in this directory will be run *prior* to any code or files specified
+via the exec_lines or exec_files configurables whenever you load this profile.
+
+Files will be run in lexicographical order, so you can control the execution order of files
+with a prefix, e.g.::
+
+    00-first.py
+    50-middle.py
+    99-last.ipy

local/bin/cb-uri-tailscale

@@ -0,0 +1,27 @@
+#!/usr/bin/env python3
+import subprocess
+import sys
+import urllib.parse
+
+
+def main(sysargs=sys.argv[:]):
+    cb_uri = subprocess.check_output(["cb", "uri", *sysargs[1:]], text=True)
+
+    parsed_cb_uri = urllib.parse.urlsplit(cb_uri)
+    tailscale_cb_uri = parsed_cb_uri._replace(
+        netloc=str(parsed_cb_uri.username)
+        + ":"
+        + str(parsed_cb_uri.password)
+        + "@"
+        + str(parsed_cb_uri.hostname).split(".")[1]
+        + ":"
+        + str(parsed_cb_uri.port)
+    )
+
+    print(tailscale_cb_uri.geturl())
+
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())

p10k.zsh

@@ -946,11 +946,10 @@
   # Python virtual environment color.
   typeset -g POWERLEVEL9K_VIRTUALENV_FOREGROUND=0
   typeset -g POWERLEVEL9K_VIRTUALENV_BACKGROUND=4
-  # Don't show Python version next to the virtual environment name.
-  typeset -g POWERLEVEL9K_VIRTUALENV_SHOW_PYTHON_VERSION=false
+  typeset -g POWERLEVEL9K_VIRTUALENV_SHOW_PYTHON_VERSION=true
   # If set to "false", won't show virtualenv if pyenv is already shown.
   # If set to "if-different", won't show virtualenv if it's the same as pyenv.
-  typeset -g POWERLEVEL9K_VIRTUALENV_SHOW_WITH_PYENV=false
+  typeset -g POWERLEVEL9K_VIRTUALENV_SHOW_WITH_PYENV=true
   # Separate environment name from Python version only with a space.
   typeset -g POWERLEVEL9K_VIRTUALENV_{LEFT,RIGHT}_DELIMITER=
   # Custom icon.

tmux.conf

@@ -1,7 +1,8 @@
 bind-key C-b last-window
 set-option -g default-command /bin/zsh
 set-option -g default-shell /bin/zsh
-set-option -g default-terminal 'screen-256color'
+set-option -s default-terminal 'tmux-256color'
+set -ga terminal-overrides ',alacritty:RGB,*256col*:RGB'
 set-option -g history-limit 100000
 set-option -g prefix C-b
 set-option -g renumber-windows on

vim/coc-settings.json

@@ -1,33 +1,49 @@
 {
-  "languageserver": {
-    "terraform": {
-      "command": "terraform-lsp",
-      "filetypes": [
-        "terraform"
-      ]
-    },
-    "R": {
-      "command": "R",
-      "args": [
-        "--slave",
-        "-e",
-        "languageserver::run()"
-      ],
-      "filetypes": [
-        "r"
-      ]
-    },
-    "bash": {
-      "command": "bash-language-server",
-      "args": [
-        "start"
-      ],
-      "filetypes": [
-        "sh"
-      ],
-      "ignoredRootPaths": [
-        "~"
-      ]
-    }
-  }
+	"languageserver": {
+		"terraform": {
+			"command": "terraform-lsp",
+			"filetypes": [
+				"terraform"
+			]
+		},
+		"R": {
+			"command": "R",
+			"args": [
+				"--slave",
+				"-e",
+				"languageserver::run()"
+			],
+			"filetypes": [
+				"r"
+			]
+		},
+		"bash": {
+			"command": "bash-language-server",
+			"args": [
+				"start"
+			],
+			"filetypes": [
+				"sh"
+			],
+			"ignoredRootPaths": [
+				"~"
+			]
+		},
+		"ruff-lsp": {
+			"command": [
+				"ruff-lsp"
+			],
+			"filetypes": [
+				"python"
+			]
+		}
+	},
+	"pyright.enable": true,
+	"pyright.inlayHints.functionReturnTypes": true,
+	"pyright.inlayHints.variableTypes": true,
+	"pyright.organizeimports.provider": "ruff",
+	"pyright.testing.provider": "pytest",
+	"python.formatting.provider": "ruff",
+	"python.linting.ruffEnabled": true,
+	"clangd.path": "~/.config/coc/extensions/coc-clangd-data/install/17.0.3/clangd_17.0.3/bin/clangd"
 }

vimrc

@@ -1,5 +1,4 @@
 packloadall
-call pathogen#infect()
 
 syntax on
 
@@ -15,7 +14,7 @@ set backupdir^=~/.vim/_backup//
 set cursorline
 set cursorcolumn
 set directory^=~/.vim/_temp//
-set encoding=utf8
+set encoding=utf-8
 set hlsearch
 set ignorecase
 set incsearch
@@ -24,11 +23,12 @@ set linebreak
 set modeline
 set nowrap
 set number
+set signcolumn=yes
 set smartcase
 set statusline+=%#warningmsg#
 set statusline+=%*
 set tabstop=4
-set updatetime=100
+set updatetime=300
 set textwidth=1000
 
 if has("persistent_undo")
@@ -46,9 +46,12 @@ au BufRead,BufNewFile .envrc setfiletype sh
 au BufRead,BufNewFile Dockerfile* setfiletype dockerfile
 au BufRead,BufNewFile Pipfile setfiletype toml
 au BufRead,BufNewFile kubectl-edit-status-* setfiletype yaml
+au BufRead,BufNewFile *kubeconfig* setfiletype yaml
+au BufRead,BufNewFile */.kube/config setfiletype yaml
 au BufRead,BufNewFile .lintr setfiletype yaml
 au BufRead,BufNewFile devcontainer.json setfiletype jsonc
 au BufRead,BufNewFile devcontainer-feature.json setfiletype jsonc
+au BufRead,BufNewFile *.bicepparam setfiletype bicep
 au BufNewFile,BufRead *.go setlocal noexpandtab tabstop=4 shiftwidth=4
 au FileType go nmap <leader>r <Plug>(go-run)
 au FileType go nmap <Leader>c <Plug>(go-coverage-toggle)
@@ -77,20 +80,21 @@ map <leader>l :Minimap<CR>
 map <leader>L :MinimapClose<CR>
 nmap <F8> :TagbarToggle<CR>
 
-augroup black_on_save
-  autocmd!
-  autocmd BufWritePre *.py Black
-augroup end
+"augroup black_on_save
+"  autocmd!
+"  autocmd BufWritePre *.py Black
+"augroup end
 
 autocmd BufNewFile,BufRead *.c set formatprg=astyle\ -t4\ -A14
 
 let g:EditorConfig_exclude_patterns = ['fugitive://.*', 'scp://.*']
 let g:airline_powerline_fonts = 1
+let g:black_use_virtualenv = 1
 let g:coc_global_extensions = ['coc-tsserver']
 let g:coc_node_path = "/home/dan/.nvm/versions/node/v16.9.1/bin/node"
 let g:go_auto_sameids = 1
 let g:go_auto_type_info = 1
-let g:go_def_mode='gopls'
+let g:go_def_mode = 'gopls'
 let g:go_fmt_command = "goimports"
 let g:go_highlight_build_constraints = 1
 let g:go_highlight_extra_types = 1
@@ -98,7 +102,7 @@ let g:go_highlight_fields = 1
 let g:go_highlight_function_calls = 1
 let g:go_highlight_functions = 1
 let g:go_highlight_operators = 1
-let g:go_info_mode='gopls'
+let g:go_info_mode = 'gopls'
 let g:html_indent_script1 = "inc"
 let g:html_indent_style1 = "inc"
 let g:minimap_auto_start = 1
@@ -108,6 +112,7 @@ let g:minimap_highlight_search = 1
 let g:minimap_enable_highlight_colorgroup = 1
 let g:minimap_width = 10
 let g:python_highlight_all = 1
+let g:rehash256 = 1
 let g:rustfmt_autosave = 1
 let g:shfmt_extra_args = '-i 2'
 let g:shfmt_fmt_on_save = 1
@@ -117,7 +122,16 @@ let g:vim_markdown_folding_disabled = 1
 let g:vim_markdown_frontmatter = 1
 let g:yapf_style = "pep8"
 
+if exists('+termguicolors')
+  let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
+  let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
+  set termguicolors
+endif
+
+"colorscheme dichromatic
 colorscheme dracula
+"colorscheme molokai
+"colorscheme elflord
 
 hi Comment cterm=NONE ctermfg=DarkRed gui=NONE guifg=red2
 hi minimapCursor ctermbg=59 ctermfg=228 guibg=#5F5F5F guifg=#FFFF87
@@ -131,16 +145,4 @@ function! <SID>SynStack()
   echo map(synstack(line('.'), col('.')), 'synIDattr(v:val, "name")')
 endfunc
 
-" use <tab> to trigger completion and navigate to the next complete item
-function! CheckBackspace() abort
-  let col = col('.') - 1
-  return !col || getline('.')[col - 1]  =~# '\s'
-endfunction
-
-inoremap <silent><expr> <Tab>
-      \ coc#pum#visible() ? coc#pum#next(1) :
-      \ CheckBackspace() ? "\<Tab>" :
-      \ coc#refresh()
-
-inoremap <expr> <Tab> coc#pum#visible() ? coc#pum#next(1) : "\<Tab>"
-inoremap <expr> <S-Tab> coc#pum#visible() ? coc#pum#prev(1) : "\<S-Tab>"
+"source ~/.vimrc.coc

zshrc

@@ -42,14 +42,12 @@ fi
 
 path=(
   $HOME/.rbenv/shims
-  $HOME/.pyenv/shims
   $HOME/bin
   $HOME/go/bin
   $HOME/.local/bin
   $HOME/.cargo/bin
   $HOME/.rbenv/bin
   $HOME/.phpenv/bin
-  $HOME/.pyenv/bin
   $HOME/.yarn/bin
   $HOME/.pulumi/bin
   ${KREW_ROOT:-$HOME/.krew}/bin
@@ -58,6 +56,7 @@ path=(
   $HOME/perl5/bin
   $HOME/Library/Python/3.8/bin
   /usr/local/opt/python@3.8/bin
+  /usr/bin/core_perl
   /usr/local/sbin
   /usr/local/bin
   /usr/bin/vendor_perl
@@ -97,7 +96,6 @@ plugins=(
   pip
   podman
   postgres
-  pyenv
   python
   rails
   rake-fast
@@ -109,7 +107,6 @@ plugins=(
   symfony-complete
   tmux
   vagrant
-  vault
   vi-mode
   yarn
 )
@@ -133,6 +130,8 @@ export EDITOR=vim
 export PYENV_ROOT="${HOME}/.pyenv"
 export SDKMAN_DIR="${HOME}/.sdkman"
 export VISUAL=vim
+export PTD_CACHE="${HOME}/.local/ptd"
+export PTD_ROOT="${HOME}/code/rstudio/ptd/infra"
 
 # The completion for aws is not compatible with $fpath :scream_cat:
 if [[ -f /usr/local/share/zsh/site-functions/_aws ]] ; then
@@ -173,7 +172,13 @@ unsetopt correct_all
 bindkey '^R' history-incremental-search-backward
 
 if which pyenv >/dev/null; then
-  eval "$(pyenv init - 2>/dev/null)"
+  if [[ "${HATCH_ENV_ACTIVE}" ]]; then
+    : skipping pyenv when inside a hatch env
+  else
+    path=($HOME/.pyenv/shims $HOME/.pyenv/bin "${path[@]}")
+	plugins=("${plugins[@]}" pyenv)
+    eval "$(pyenv init - 2>/dev/null)"
+  fi
 fi
 
 if which phpenv >/dev/null; then
@@ -226,6 +231,23 @@ function docker-cleanup() {
   done
 }
 
+function ptd-completion() {
+  if command -v ptd &>/dev/null; then
+    eval "$(_PTD_COMPLETE=zsh_source ptd)"
+  fi
+}
+
+function mksecret() {
+  local nbytes="${1:-42}"
+
+  python3 <<EOPYTHON | tr -d '/' | tr -d '+' | cut -b1-$((nbytes - 1))
+import secrets
+import base64
+
+print(base64.b64encode(secrets.token_bytes(${nbytes} * 2)).decode(), end="")
+EOPYTHON
+}
+
 export NVM_DIR="${HOME}/.nvm"
 
 __maybesource ~/.zshenv
@@ -265,6 +287,12 @@ fi
 compdef _symfony_complete composer
 compdef _symfony_complete dep
 
+alias fz=fuzzbucket-client
+
+if ptd --version &>/dev/null; then
+  ptd-completion
+fi
+
 # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
 [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh