helix: explicitly disable smart-tab again

.chezmoiexternal.toml

@@ -12,3 +12,7 @@ url = "https://github.com/zellij-org/zellij/archive/refs/tags/v0.40.0.zip"
 "checksum.sha256" = "sha256-1GtkVgfIJUQYKhxXL94JogzHS2NSqVeQSpLEtwD8X4U="
 include = ["*/zellij-utils/assets/themes/*.kdl"]
 stripComponents = 4
+
+[".config/bash/completions/git-prompt.sh"]
+type = "file"
+url = "https://raw.githubusercontent.com/git/git/v2.45.2/contrib/completion/git-prompt.sh"

dot_bashrc

@@ -1,9 +1,18 @@
 # vim: set ft=bash:
 
-#export PS1='\[\e]0;\w\a\]\n\[\e[32m\]\u@\h \[\e[35m\]$MSYSTEM\[\e[0m\] \[\e[33m\]\w\[\e[0m\]\n'"${_ps1_symbol}"' '
-#export PS1='\[\e]0;\w\a\]\n\[\e[32m\]\u@\h \[\e[35m\]$MSYSTEM\[\e[0m\] \[\e[33m\]\w\[\e[0m\] '"${_ps1_symbol}"' '
-#export PS1='\[\033]0;$TITLEPREFIX:$PWD\007\]\n\[\033[32m\]\u@\h \[\033[35m\]$MSYSTEM \[\033[33m\]\w\[\033[36m\]`__git_ps1`\[\033[0m\] $ '
-export PS1='\[\033]0;$TITLEPREFIX:$PWD\007\]\[\033[32m\]\u@\h \[\033[35m\]$MSYSTEM \[\033[33m\]\w\[\033[36m\]`__git_ps1`\[\033[0m\] $ '
+if [ -r ~/.config/bash/completions/git-prompt.sh ]; then
+	source ~/.config/bash/completions/git-prompt.sh
+fi
+
+if [ -z "$MYSTEM" ]; then
+	export PS1='\[\033]0;$TITLEPREFIX:$PWD\007\]\[\033[32m\]\u@\h \[\033[33m\]\w\[\033[36m\]`__git_ps1`\[\033[0m\] $ '
+else
+	export PS1='\[\033]0;$TITLEPREFIX:$PWD\007\]\[\033[32m\]\u@\h \[\033[35m\]$MSYSTEM \[\033[33m\]\w\[\033[36m\]`__git_ps1`\[\033[0m\] $ '
+fi
+
+if [ -r ~/.config/env ]; then
+	source ~/.config/env
+fi
 
 if [ -r ~/.config/alias ]; then
 	source ~/.config/alias

dot_config/alias-ssh.tmpl

@@ -1,5 +1,5 @@
 # vim: set ft=bash:
 
-{{ if lookPath "keepassxc-cli" -}}
+{{ if and (lookPath "keepassxc-cli") (stat (joinPath .chezmoi.homeDir ".local/private/dotfiles.key")) -}}
 {{ (keepassxc "alias-ssh").Notes }}
-{{- end }}
+{{- end }}

dot_config/alias.tmpl

@@ -33,6 +33,10 @@ alias tf="terraform"
 
 alias z=zellij
 
+{{ if .chezmoi.osRelease.idLike | contains "opensuse" -}}
+alias zy="zypper"
+{{- end }}
+
 # TODO: d/p, dc/pc
 #if (which podman 2>&1 >> /dev/null) then;
 #	alias d="podman"

dot_config/env

@@ -0,0 +1,6 @@
+# vim: set ft=bash:
+
+export PODMAN_IGNORE_CGROUPSV1_WARNING=1
+
+# TODO: wezterm doesn't propagate the variable anymore
+export COLOR_SCHEME=2

dot_config/git/allowed-signers.tmpl

@@ -1,3 +1,3 @@
-{{- if lookPath "keepassxc-cli" }}
+{{ if and (lookPath "keepassxc-cli") (stat (joinPath .chezmoi.homeDir ".local/private/dotfiles.key")) -}}
 {{- (keepassxc "allowed-signers").Notes }}
-{{- end }}
+{{- end }}

dot_config/helix/config.dark.toml

@@ -27,6 +27,9 @@ space = "none"
 tab = "all"
 newline = "none"
 
+[editor.smart-tab]
+enable = false
+
 [editor.soft-wrap]
 enable = true
 

dot_config/helix/config.toml

@@ -27,6 +27,9 @@ space = "none"
 tab = "all"
 newline = "none"
 
+[editor.smart-tab]
+enable = false
+
 [editor.soft-wrap]
 enable = true
 

dot_config/helix/generate-languages.nu

@@ -54,13 +54,6 @@ def main [] {
 			} else if $lang.name == "javascript" {
 				$lang | process-typescript-like $lang.name
 			} else if $lang.name == "json" {
-<<<<<<< Updated upstream
-				$lang | process-typescript-like $lang.name
-			} else if $lang.name == "css" {
-				$lang | insert formatter (get-biome-formatter $lang)
-||||||| Stash base
-				$lang | process-typescript-like $lang.name
-=======
 				$lang | process-typescript-like $lang.name | insert file-types [
 					"json",
 					"jsonc",
@@ -83,7 +76,9 @@ def main [] {
 					".watchmanconfig",
 					"tfstate"
 				]
->>>>>>> Stashed changes
+			# TODO
+			#} else if $lang.name == "css" {
+			#	$lang | insert formatter (get-biome-formatter $lang)
 			} else if $lang.name == "scss" {
 				# Helix doesn't support less
 				$lang | insert file-types ["scss", "less"]

dot_config/helix/languages.toml

@@ -58,6 +58,20 @@ name = "mint"
 tab-width = 4
 unit = '\t'
 
+[[language]]
+name = "mojo"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
+[[language]]
+name = "janet"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
 [[language]]
 auto-format = true
 file-types = ["json", "jsonc", "arb", "ipynb", "geojson", "gltf", "webmanifest", "flake.lock", ".babelrc", ".bowerrc", ".jscrc", "js.map", "ts.map", "css.map", ".jslintrc", "jsonld", ".vuerc", "composer.lock", ".watchmanconfig", "tfstate"]
@@ -71,6 +85,20 @@ command = "biome"
 tab-width = 4
 unit = '\t'
 
+[[language]]
+name = "jsonc"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
+[[language]]
+name = "json5"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
 [[language]]
 name = "c"
 
@@ -99,6 +127,20 @@ name = "c-sharp"
 tab-width = 4
 unit = '\t'
 
+[[language]]
+name = "cel"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
+[[language]]
+name = "spicedb"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
 [[language]]
 name = "go"
 
@@ -172,10 +214,6 @@ unit = '\t'
 [[language]]
 name = "css"
 
-[language.formatter]
-args = ["format", "--stdin-file-path", 'dummy.{name: css, indent: {tab-width: 4, unit: \t}}', "--trailing-comma=none"]
-command = "biome"
-
 [language.indent]
 tab-width = 4
 unit = '\t'
@@ -238,6 +276,16 @@ name = "php"
 tab-width = 4
 unit = '\t'
 
+[[language]]
+name = "php-only"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
+[[language]]
+name = "blade"
+
 [[language]]
 name = "twig"
 
@@ -266,6 +314,9 @@ name = "lean"
 tab-width = 4
 unit = '\t'
 
+[[language]]
+name = "lpf"
+
 [[language]]
 name = "julia"
 
@@ -280,6 +331,13 @@ name = "java"
 tab-width = 4
 unit = '\t'
 
+[[language]]
+name = "smali"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
 [[language]]
 name = "ledger"
 
@@ -346,6 +404,13 @@ name = "haskell"
 tab-width = 4
 unit = '\t'
 
+[[language]]
+name = "haskell-persistent"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
 [[language]]
 name = "purescript"
 
@@ -398,9 +463,16 @@ name = "perl"
 tab-width = 4
 unit = '\t'
 
+[[language]]
+name = "pod"
+
 [[language]]
 name = "racket"
 
+[language.indent]
+tab-width = 4
+unit = '\t'
+
 [[language]]
 name = "common-lisp"
 
@@ -477,6 +549,13 @@ name = "dockerfile"
 tab-width = 4
 unit = '\t'
 
+[[language]]
+name = "docker-compose"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
 [[language]]
 name = "git-commit"
 
@@ -877,6 +956,13 @@ name = "jsonnet"
 tab-width = 4
 unit = '\t'
 
+[[language]]
+name = "ada"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
 [[language]]
 name = "astro"
 
@@ -949,6 +1035,13 @@ name = "ini"
 tab-width = 4
 unit = '\t'
 
+[[language]]
+name = "inko"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
 [[language]]
 name = "bicep"
 
@@ -1041,6 +1134,13 @@ name = "nasm"
 tab-width = 4
 unit = '\t'
 
+[[language]]
+name = "gas"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
 [[language]]
 name = "rst"
 
@@ -1102,6 +1202,13 @@ name = "just"
 tab-width = 4
 unit = '\t'
 
+[[language]]
+name = "gn"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
 [[language]]
 name = "blueprint"
 
@@ -1116,6 +1223,13 @@ name = "forth"
 tab-width = 4
 unit = '\t'
 
+[[language]]
+name = "fsharp"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
 [[language]]
 name = "t32"
 
@@ -1130,6 +1244,217 @@ name = "webc"
 tab-width = 4
 unit = '\t'
 
+[[language]]
+name = "typst"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
+[[language]]
+name = "nunjucks"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
+[[language]]
+name = "jinja"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
+[[language]]
+name = "wren"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
+[[language]]
+name = "unison"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
+[[language]]
+name = "todotxt"
+
+[[language]]
+name = "strace"
+
+[[language]]
+name = "gemini"
+
+[[language]]
+name = "agda"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
+[[language]]
+name = "templ"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
+[[language]]
+name = "dbml"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
+[[language]]
+name = "bitbake"
+
+[[language]]
+name = "log"
+
+[[language]]
+name = "hoon"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
+[[language]]
+name = "hocon"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
+[[language]]
+name = "koka"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
+[[language]]
+name = "tact"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
+[[language]]
+name = "pkl"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
+[[language]]
+name = "groovy"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
+[[language]]
+name = "fidl"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
+[[language]]
+name = "powershell"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
+[[language]]
+name = "ld"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
+[[language]]
+name = "hyprlang"
+
+[[language]]
+name = "tcl"
+
+[[language]]
+name = "supercollider"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
+[[language]]
+name = "pkgbuild"
+
+[[language]]
+name = "helm"
+
+[[language]]
+name = "glimmer"
+
+[[language]]
+name = "ohm"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
+[[language]]
+name = "earthfile"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
+[[language]]
+name = "adl"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
+[[language]]
+name = "ldif"
+
+[[language]]
+name = "xtc"
+
+[[language]]
+name = "move"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
+[[language]]
+name = "pest"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
+[[language]]
+name = "gjs"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
+[[language]]
+name = "gts"
+
+[language.indent]
+tab-width = 4
+unit = '\t'
+
 [language-server.deno-language-server]
 args = ["lsp"]
 command = "deno"

dot_ssh/config

@@ -1,6 +1,10 @@
 Host *
 	SendEnv COLOR_SCHEME
 
+Host 10.10.2.17
+	HostName 10.10.2.17
+	IdentityFile ~/.ssh/azure-vm
+
 Host git.disroot.org
 	HostName git.disroot.org
-	IdentityFile ~/.ssh/github-etiennek
+	IdentityFile ~/.ssh/github-extra