Changes

common/fish/vars.fish

@@ -14,10 +14,7 @@ set --export --universal LESS "-r"
 
 set --export --universal MANPAGER 'env MANWIDTH="" nvim --cmd "let g:prosession_on_startup=0" +Man!'
 
-if command --search --quiet hx
+if command --search --quiet nvim
-	set --export --universal EDITOR hx
-	set --export --universal VISUAL hx
-else if command --search --quiet nvim
 	set --export --universal EDITOR nvim
 	set --export --universal VISUAL nvim
 else if command --search --quiet vim

common/git/config

@@ -44,6 +44,9 @@
 	s = status
 	sur = submodule update --remote
 
+[pull]
+	default = current
+
 [merge]
 	tool = $EDITOR -d
 	conflictstyle = diff3
@@ -82,6 +85,9 @@
 	path = ~/.config/lytedev-env/host-layer-personal/gitconfig
 	path = ~/.config/lytedev-env/divvy/gitconfig
 
+[branch]
+	autoSetupMerge = true
+
 # [push]
 # 	pushOption = merge_request.create
 # 	pushOption = merge_request.remove_source_branch 

common/helix/config.toml

@@ -4,10 +4,10 @@ theme = "donokai"
 auto-pairs = false
 scrolloff = 8
 
-[editor.cursor-shape]
+# [editor.cursor-shape]
-normal = "block"
+# normal = "block"
-insert = "bar"
+# insert = "bar"
-select = "underline"
+# select = "underline"
 
 [editor.file-picker]
 hidden = false
@@ -23,3 +23,14 @@ g = { G = "goto_last_line" }
 
 # [editor]
 # mouse = false
+
+# [[language]]
+# name = "typescript"
+# scope = "source.ts"
+# injection-regex = "^(ts|typescript)$"
+# file-types = ["ts"]
+# shebangs = []
+# roots = []
+# # TODO: highlights-params
+# language-server = { command = "deno", args = ["lsp"], language-id = "typescript"}
+# indent = { tab-width = 2, unit = "  " }

common/helix/languages.toml

@@ -0,0 +1,3 @@
+[[language]]
+name = "typescript"
+language-server = { cmd = "deno", args = ["lsp"], language-id = "typescript" }

common/helix/oldlang

@@ -0,0 +1,10 @@
+[[language]]
+name = "typescript"
+scope = "source.ts"
+injection-regex = "^(ts|typescript)$"
+file-types = ["ts"]
+shebangs = []
+roots = []
+# TODO: highlights-params
+language-server = { command = "deno", args = ["lsp"], language-id = "typescript"}
+indent = { tab-width = 2, unit = "  " }

common/helix/runtime

@@ -1 +0,0 @@
-/Users/danielflanagan/code/helix/runtime

common/neovim/lua/lsp.lua

@@ -45,10 +45,11 @@ local common_config = {
 
 --[[
 
+set els_path ~/.local/share/nvim/lsp_servers/elixir
 curl -fLO https://github.com/elixir-lsp/elixir-ls/releases/latest/download/elixir-ls.zip
-mkdir -p ~/.local/share/nvim/lsp_servers/elixir
+mkdir -p $els_path
-unzip elixir-ls.zip -d ~/.local/share/nvim/lsp_servers/elixir/elixir-ls/
+unzip elixir-ls.zip -d $els_path/elixir-ls/
-chmod +x ~/.local/share/nvim/lsp_servers/elixir/elixir-ls/language_server.sh
+chmod +x $els_path/elixir-ls/language_server.sh
 
 ]]
 
@@ -74,7 +75,7 @@ local lsp_configs = {
 	},
 	vimls = {},
 	rust_analyzer = {},
-	tsserver = {},
+	-- tsserver = {},
 	pylsp = {},
 	denols = {
 		root_dir = lsp.util.root_pattern("deno.json"),

os/linux/arch/provision.d/10-install-paru.bash

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+echo "Installing paru as $(whoami)"
+REPOSITORY_PATH="/tmp/provisioning"
+sudo pacman -S --needed --noconfirm git base-devel
+mkdir -p "$REPOSITORY_PATH"
+rm -rf "$REPOSITORY_PATH/paru"
+git clone https://aur.archlinux.org/paru-bin.git "$REPOSITORY_PATH/paru"
+cd "$REPOSITORY_PATH/paru" || exit 1
+makepkg --noconfirm -si
+paru -S --noconfirm paru-bin
+rm -rf "$REPOSITORY_PATH/paru"

os/linux/arch/provision.d/10-install-yay.bash

@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-echo "Installing yay as $(whoami)"
-REPOSITORY_PATH="/tmp/provisioning"
-sudo pacman -S --needed --noconfirm git base-devel
-mkdir -p "$REPOSITORY_PATH"
-rm -rf "$REPOSITORY_PATH/yay"
-git clone https://aur.archlinux.org/yay-bin.git "$REPOSITORY_PATH/yay"
-cd "$REPOSITORY_PATH/yay" || exit 1
-makepkg --noconfirm -si
-yay -S --noconfirm yay-bin
-rm -rf "$REPOSITORY_PATH/yay"

os/linux/arch/provision.d/20-install-packages.bash

@@ -7,7 +7,7 @@
 # 	sudo sh -c 'echo -e "\n\n[multilib]\nInclude = /etc/pacman.d/mirrorlist" >> /etc/pacman.conf'
 # fi
 
-yay -Sy --needed --noconfirm \
+paru -Sy --needed --noconfirm \
 	fwupd \
 	docker `# Containers` \
 	ncdu `# Disk Usage Analyzer` \
@@ -43,7 +43,7 @@ yay -Sy --needed --noconfirm \
 	fortune-mod fortune-mod-archlinux `# Fortune` \
 	oath-toolkit `# One-Time Passwords` \
 	sysstat `# System Statistics` \
-	reflector-simple `# Simplify Mirror Management` \
+	reflector `# Simplify Mirror Management` \
 	inetutils `# netutils` \
 	nnn `# CLI File Manager` \
 	man-db man-pages `# Come On, Man!`

os/linux/arch/provision.d/optional/amd-gpu.bash

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
-yay -S \
+paru -S --needed \
-	xf86-video-amdgpu mesa lib32-mesa \
+	xf86-video-amdgpu mesa \
-	amdvlk lib32-amdvlk \
+	amdvlk \
 	libva-mesa-driver mesa-vdpau libva-vdpau-driver libvdpau-va-gl `# Hardware Accelerated Video`
+
+paru -S --needed lib32-mesa lib32-amdvlk