From 765964596c06e50534c8e01d373cf9345c00486a Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Wed, 25 May 2022 11:38:52 -0500 Subject: [PATCH 1/7] Changes --- common/fish/vars.fish | 5 +---- common/git/config | 6 ++++++ common/helix/config.toml | 19 +++++++++++++++---- common/helix/languages.toml | 3 +++ common/helix/oldlang | 10 ++++++++++ common/helix/runtime | 1 - common/neovim/lua/lsp.lua | 9 +++++---- .../arch/provision.d/10-install-paru.bash | 12 ++++++++++++ os/linux/arch/provision.d/10-install-yay.bash | 12 ------------ .../arch/provision.d/20-install-packages.bash | 4 ++-- .../arch/provision.d/optional/amd-gpu.bash | 8 +++++--- 11 files changed, 59 insertions(+), 30 deletions(-) create mode 100644 common/helix/languages.toml create mode 100644 common/helix/oldlang delete mode 120000 common/helix/runtime create mode 100755 os/linux/arch/provision.d/10-install-paru.bash delete mode 100755 os/linux/arch/provision.d/10-install-yay.bash diff --git a/common/fish/vars.fish b/common/fish/vars.fish index a6392ba..6514e7f 100644 --- a/common/fish/vars.fish +++ b/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 - set --export --universal EDITOR hx - set --export --universal VISUAL hx -else if command --search --quiet nvim +if command --search --quiet nvim set --export --universal EDITOR nvim set --export --universal VISUAL nvim else if command --search --quiet vim diff --git a/common/git/config b/common/git/config index 2c0917b..b31a147 100644 --- a/common/git/config +++ b/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 diff --git a/common/helix/config.toml b/common/helix/config.toml index 46ab088..96969ab 100644 --- a/common/helix/config.toml +++ b/common/helix/config.toml @@ -4,10 +4,10 @@ theme = "donokai" auto-pairs = false scrolloff = 8 -[editor.cursor-shape] -normal = "block" -insert = "bar" -select = "underline" +# [editor.cursor-shape] +# normal = "block" +# insert = "bar" +# 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 = " " } \ No newline at end of file diff --git a/common/helix/languages.toml b/common/helix/languages.toml new file mode 100644 index 0000000..6ba6b10 --- /dev/null +++ b/common/helix/languages.toml @@ -0,0 +1,3 @@ +[[language]] +name = "typescript" +language-server = { cmd = "deno", args = ["lsp"], language-id = "typescript" } diff --git a/common/helix/oldlang b/common/helix/oldlang new file mode 100644 index 0000000..f08cf9c --- /dev/null +++ b/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 = " " } \ No newline at end of file diff --git a/common/helix/runtime b/common/helix/runtime deleted file mode 120000 index 2c5d6d7..0000000 --- a/common/helix/runtime +++ /dev/null @@ -1 +0,0 @@ -/Users/danielflanagan/code/helix/runtime \ No newline at end of file diff --git a/common/neovim/lua/lsp.lua b/common/neovim/lua/lsp.lua index c37a9a7..3c5a860 100644 --- a/common/neovim/lua/lsp.lua +++ b/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 -unzip elixir-ls.zip -d ~/.local/share/nvim/lsp_servers/elixir/elixir-ls/ -chmod +x ~/.local/share/nvim/lsp_servers/elixir/elixir-ls/language_server.sh +mkdir -p $els_path +unzip elixir-ls.zip -d $els_path/elixir-ls/ +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"), diff --git a/os/linux/arch/provision.d/10-install-paru.bash b/os/linux/arch/provision.d/10-install-paru.bash new file mode 100755 index 0000000..e71c7c3 --- /dev/null +++ b/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" diff --git a/os/linux/arch/provision.d/10-install-yay.bash b/os/linux/arch/provision.d/10-install-yay.bash deleted file mode 100755 index 877deb6..0000000 --- a/os/linux/arch/provision.d/10-install-yay.bash +++ /dev/null @@ -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" diff --git a/os/linux/arch/provision.d/20-install-packages.bash b/os/linux/arch/provision.d/20-install-packages.bash index db88ddd..217d8e3 100755 --- a/os/linux/arch/provision.d/20-install-packages.bash +++ b/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!` diff --git a/os/linux/arch/provision.d/optional/amd-gpu.bash b/os/linux/arch/provision.d/optional/amd-gpu.bash index 261cd7d..170a20c 100755 --- a/os/linux/arch/provision.d/optional/amd-gpu.bash +++ b/os/linux/arch/provision.d/optional/amd-gpu.bash @@ -1,6 +1,8 @@ #!/usr/bin/env bash -yay -S \ - xf86-video-amdgpu mesa lib32-mesa \ - amdvlk lib32-amdvlk \ +paru -S --needed \ + xf86-video-amdgpu mesa \ + amdvlk \ libva-mesa-driver mesa-vdpau libva-vdpau-driver libvdpau-va-gl `# Hardware Accelerated Video` + +paru -S --needed lib32-mesa lib32-amdvlk From f72f4a6242f522013696dfdb3b0d11ddc2177785 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Wed, 25 May 2022 11:54:02 -0500 Subject: [PATCH 2/7] PACKAGES --- os/linux/arch/provision.d/20-install-packages.bash | 2 +- os/linux/arch/provision.d/optional/ui-packages.bash | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/os/linux/arch/provision.d/20-install-packages.bash b/os/linux/arch/provision.d/20-install-packages.bash index 217d8e3..84ed5a1 100755 --- a/os/linux/arch/provision.d/20-install-packages.bash +++ b/os/linux/arch/provision.d/20-install-packages.bash @@ -25,7 +25,7 @@ paru -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` \ diff --git a/os/linux/arch/provision.d/optional/ui-packages.bash b/os/linux/arch/provision.d/optional/ui-packages.bash index 216f9b4..9d7f8cd 100755 --- a/os/linux/arch/provision.d/optional/ui-packages.bash +++ b/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` \ @@ -47,7 +47,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 +59,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` From a1b5a32a82320f0b30b7dc5e992feb5c6b0aab04 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Wed, 25 May 2022 11:58:40 -0500 Subject: [PATCH 3/7] CHAT --- os/linux/arch/provision.d/optional/ui-packages.bash | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/os/linux/arch/provision.d/optional/ui-packages.bash b/os/linux/arch/provision.d/optional/ui-packages.bash index 9d7f8cd..5501f52 100755 --- a/os/linux/arch/provision.d/optional/ui-packages.bash +++ b/os/linux/arch/provision.d/optional/ui-packages.bash @@ -37,7 +37,8 @@ paru -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` \ From 4a4392a3d20f9d7d750133dcac11ab48efe927de Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Wed, 25 May 2022 13:14:36 -0500 Subject: [PATCH 4/7] Stuff --- common/neovim/colors/base16-donokai.vim | 2 +- .../nginx-user-public/dotfiles-setup.d.fish | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/common/neovim/colors/base16-donokai.vim b/common/neovim/colors/base16-donokai.vim index 676c00e..3af3c64 120000 --- a/common/neovim/colors/base16-donokai.vim +++ b/common/neovim/colors/base16-donokai.vim @@ -1 +1 @@ -/Users/danielflanagan/.config/lytedev-dotfiles/common/colors/vim \ No newline at end of file +/home/daniel/.home/.config/lytedev-dotfiles/common/colors/vim \ No newline at end of file diff --git a/host/layer/nginx-user-public/dotfiles-setup.d.fish b/host/layer/nginx-user-public/dotfiles-setup.d.fish index 15ea258..437e87a 100644 --- a/host/layer/nginx-user-public/dotfiles-setup.d.fish +++ b/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 -sudo ln -s (pwd)/user-public-server.conf /etc/nginx/user-public-server.conf -sudo ln -s (pwd)/.nginx-autoindex-before.html /usr/share/nginx/html/.nginx-autoindex-before.html -sudo ln -s (pwd)/.nginx-autoindex-after.html /usr/share/nginx/html/.nginx-autoindex-after.html +function force_link + sudo rm -f "$argv[2]" + echo "Linking $argv[1] to $argv[2]" + 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!' From 35510b3c230ae8b352f95806b35057cbfab1f564 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Wed, 25 May 2022 13:28:13 -0500 Subject: [PATCH 5/7] Use subset webfont --- host/layer/nginx-user-public/.nginx-autoindex-before.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/host/layer/nginx-user-public/.nginx-autoindex-before.html b/host/layer/nginx-user-public/.nginx-autoindex-before.html index f7b6f40..bac5c30 100644 --- a/host/layer/nginx-user-public/.nginx-autoindex-before.html +++ b/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: 3.5em; + padding-right: 3.5em; } From 13b10f5e81dbc41606e55563a0f51aee8145bc92 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Wed, 25 May 2022 13:30:33 -0500 Subject: [PATCH 6/7] REM --- host/layer/nginx-user-public/.nginx-autoindex-before.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/host/layer/nginx-user-public/.nginx-autoindex-before.html b/host/layer/nginx-user-public/.nginx-autoindex-before.html index bac5c30..48d729d 100644 --- a/host/layer/nginx-user-public/.nginx-autoindex-before.html +++ b/host/layer/nginx-user-public/.nginx-autoindex-before.html @@ -54,8 +54,8 @@ h1, pre { display: block; max-width: 800px; margin: 0.5em auto; - padding-left: 3.5em; - padding-right: 3.5em; + padding-left: 1rem; + padding-right: 1em; } From 827d9d298667a0c29f30e2dbf7002a75cd4c006f Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Wed, 25 May 2022 13:33:19 -0500 Subject: [PATCH 7/7] DOUBLE REM --- host/layer/nginx-user-public/.nginx-autoindex-before.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/host/layer/nginx-user-public/.nginx-autoindex-before.html b/host/layer/nginx-user-public/.nginx-autoindex-before.html index 48d729d..1f62ee9 100644 --- a/host/layer/nginx-user-public/.nginx-autoindex-before.html +++ b/host/layer/nginx-user-public/.nginx-autoindex-before.html @@ -55,7 +55,7 @@ h1, pre { max-width: 800px; margin: 0.5em auto; padding-left: 1rem; - padding-right: 1em; + padding-right: 1rem; }