Merge remote-tracking branch 'upstream/master'

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/.gitignore

@@ -0,0 +1 @@
+runtime

common/helix/config.toml

@@ -5,16 +5,19 @@ auto-pairs = false
 scrolloff = 8
 rulers = [80, 120]
 
-[editor.cursor-shape]
+# [editor.cursor-shape]
-normal = "block"
+# normal = "block"
-insert = "bar"
+# insert = "bar"
-select = "underline"
+# select = "underline"
 
 [editor.file-picker]
 hidden = false
 
 [keys.insert]
-j = { k = "normal_mode", j = "normal_mode" }
+j = { k = "normal_mode", j = "normal_mode", K = "normal_mode", J = "normal_mode" }
+J = { k = "normal_mode", j = "normal_mode", K = "normal_mode", J = "normal_mode" }
+k = { k = "normal_mode", j = "normal_mode", K = "normal_mode", J = "normal_mode" }
+K = { k = "normal_mode", j = "normal_mode", K = "normal_mode", J = "normal_mode" }
 
 [keys.normal]
 g = { G = "goto_last_line" }
@@ -23,4 +26,4 @@ g = { G = "goto_last_line" }
 g = { G = "goto_last_line" }
 
 # [editor]
-# mouse = false
+# mouse = false

common/helix/languages.toml

@@ -1,3 +1,11 @@
 [[language]]
 name = "typescript"
-language-server = { command = "deno", args = ["lsp"] }
+scope = "source.ts"
+injection-regex = "ts"
+file-types = ["typescript"]
+roots = ["deno.json"]
+language-server = { command = "denopoo", args = ["lsp"] }
+config = { deno = { enable = true, lint = true } }
+comment-token = "//"
+indent = { tab-width = 2, unit = "  " }
+grammar = "javascript"

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/helix/themes/donokai.toml

@@ -33,6 +33,7 @@
 
 "comment" = { fg = "#88846F" }
 "ui.virtual" = "#888888"
+# "ui.virtual.ruler" = { bg = "#333333" }
 
 "string" = { fg = "#e6db74" }
 "constant.character" = { fg = "#e6db74" }

common/neovim/colors/base16-donokai.vim

@@ -1 +1 @@
-/Users/danielflanagan/.config/lytedev-dotfiles/common/colors/vim
+/home/daniel/.home/.config/lytedev-dotfiles/common/colors/vim

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"),

host/layer/nginx-user-public/.nginx-autoindex-before.html

@@ -15,7 +15,7 @@
 	font-weight: 400;
 	font-stretch: normal;
 	font-style: normal;
-	src: url('https://files.lyte.dev/iosevkalyte/woff2/iosevkalyte-regular.woff2') format('woff2'), url('https://files.lyte.dev/iosevkalyte/ttf/iosevkalyte-regular.ttf') format('truetype');
+	src: url('https://files.lyte.dev/iosevkalyte/iosevkalyteweb-regular.subset.woff2') format('woff2');
 }
 
 @media (prefers-color-scheme: dark) {
@@ -54,6 +54,8 @@ h1, pre {
 	display: block;
 	max-width: 800px;
 	margin: 0.5em auto;
+	padding-left: 1rem;
+	padding-right: 1rem;
 }
 </style>
 </head>

host/layer/nginx-user-public/dotfiles-setup.d.fish

@@ -5,7 +5,15 @@ set h $argv[2]
 set c $argv[3]
 
 pushd (dirname $me)
-sudo ln -s (pwd)/user-public-http.conf /etc/nginx/user-public-http.conf
+function force_link
-sudo ln -s (pwd)/user-public-server.conf /etc/nginx/user-public-server.conf
+	sudo rm -f "$argv[2]"
-sudo ln -s (pwd)/.nginx-autoindex-before.html /usr/share/nginx/html/.nginx-autoindex-before.html
+	echo "Linking $argv[1] to $argv[2]"
-sudo ln -s (pwd)/.nginx-autoindex-after.html /usr/share/nginx/html/.nginx-autoindex-after.html
+	sudo ln -s "$argv[1]" "$argv[2]"
+end
+
+force_link (pwd)/user-public-http.conf /etc/nginx/user-public-http.conf
+force_link (pwd)/user-public-server.conf /etc/nginx/user-public-server.conf
+force_link (pwd)/.nginx-autoindex-before.html /usr/share/nginx/html/.nginx-autoindex-before.html
+force_link (pwd)/.nginx-autoindex-after.html /usr/share/nginx/html/.nginx-autoindex-after.html
+
+echo 'Don\'t forget to include the nginx files in your config inside their respective blocks!'

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` \
@@ -25,7 +25,7 @@ yay -Sy --needed --noconfirm \
 	openssh mosh `# Remote Access` \
 	openssl `# Crypto` \
 	asdf-vm `# Runtime Version Manager` \
-	pass `# Password Management` \
+	pass pass-otp `# Password Management` \
 	hexyl `# CLI Hex Viewer` \
 	rsync `# File Transfer` \
 	neovim `# Text Editors` \
@@ -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

os/linux/arch/provision.d/optional/ui-packages.bash

@@ -10,7 +10,7 @@
 # TODO: some of these may be laptop-only?
 # TODO: switch from Thunar to Nautilus?
 
-yay -Sy --needed \
+paru -Sy --needed \
 	xf86-input-libinput \
 	libinput libinput-gestures `# Trackpad Control` \
 	bluez bluez-libs bluez-utils bluez-tools `# Bluetooth` \
@@ -37,7 +37,8 @@ yay -Sy --needed \
 	sc-im `# Spreadsheets` \
 	cloc `# For counting lines of code` \
 	noto-fonts noto-fonts-emoji `# Emoji` \
-	discord `# Voice Chat` \
+	discord `# Personal & Voice Chat` \
+	slack-desktop `# Work Chat` \
 	steam steamcmd lutris `# Games` \
 	gnome-shell `# Guh-nome Guh-shell` \
 	vlc `# Video Viewer` \
@@ -47,7 +48,7 @@ yay -Sy --needed \
 	dmenu `# Application Launcher` \
 	firefox-developer-edition `# Default Web Browser` \
 	passff-host `# Pass integration in Firefox` \
-	kitty `# Terinal Emulator` \
+	kitty-git `# Terinal Emulator` \
 	alsa-utils `# Audio Utilities` \
 	alsa-plugins `# Plugins for ALSA` \
 	pavucontrol pulsemixer `# Audio Backend and Controls` \
@@ -59,9 +60,8 @@ yay -Sy --needed \
 	wofi `# Sway app launcher` \
 	waybar mako `# Sway Bar & Notifications` \
 	slurp grim wl-clipboard `# Sway Screen Selection & Clipping` \
-	pipewire pipewire-pulse pipewire-media-session `# Pipewire` \
+	pipewire pipewire-pulse wireplumber `# Pipewire` \
 	xdg-desktop-portal xdg-desktop-portal-wlr `# Screensharing` \
 	obs-studio `# OBS` \
-	ttf-iosevka `# Primary Fonts` \
 	ttf-font-awesome `# Icon Font` \
 	ripcord `# Discord and Slack Client`