From f91be32d36e1413d88a11947a1cc3f744c32e608 Mon Sep 17 00:00:00 2001 From: Ryan Peach Date: Mon, 7 Oct 2024 20:54:21 -0400 Subject: [PATCH 01/10] Installed just treesitter --- home/.config/nvim/lua/plugins/example.lua | 26 +------------------- home/.config/nvim/lua/plugins/treesitter.lua | 15 +++++++++++ 2 files changed, 16 insertions(+), 25 deletions(-) create mode 100644 home/.config/nvim/lua/plugins/treesitter.lua diff --git a/home/.config/nvim/lua/plugins/example.lua b/home/.config/nvim/lua/plugins/example.lua index 58ef265..efe2de2 100644 --- a/home/.config/nvim/lua/plugins/example.lua +++ b/home/.config/nvim/lua/plugins/example.lua @@ -105,31 +105,7 @@ return { -- for typescript, LazyVim also includes extra specs to properly setup lspconfig, -- treesitter, mason and typescript.nvim. So instead of the above, you can use: - {import = "lazyvim.plugins.extras.lang.typescript"}, - - -- add more treesitter parsers - { - "nvim-treesitter/nvim-treesitter", - opts = { - ensure_installed = { - "bash", "html", "javascript", "json", "lua", "markdown", - "markdown_inline", "python", "query", "regex", "tsx", - "typescript", "vim", "yaml" - } - } - }, - - -- since `vim.tbl_deep_extend`, can only merge tables and not lists, the code above - -- would overwrite `ensure_installed` with the new value. - -- If you'd rather extend the default config, use the code below instead: - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - -- add tsx and treesitter - vim.list_extend(opts.ensure_installed, {"tsx", "typescript"}) - end - }, -- the opts function can also be used to change the default opts: - { + {import = "lazyvim.plugins.extras.lang.typescript"}, { "nvim-lualine/lualine.nvim", event = "VeryLazy", opts = function(_, opts) diff --git a/home/.config/nvim/lua/plugins/treesitter.lua b/home/.config/nvim/lua/plugins/treesitter.lua new file mode 100644 index 0000000..5c1ddd4 --- /dev/null +++ b/home/.config/nvim/lua/plugins/treesitter.lua @@ -0,0 +1,15 @@ +return { + {"IndianBoy42/tree-sitter-just"}, + -- since `vim.tbl_deep_extend`, can only merge tables and not lists, the code above + -- would overwrite `ensure_installed` with the new value. + -- If you'd rather extend the default config, use the code below instead: + { + "nvim-treesitter/nvim-treesitter", + opts = function(_, opts) + -- add tsx and treesitter + require('tree-sitter-just').setup({}) + vim.list_extend(opts.ensure_installed, {"just"}) + end + } -- the opts function can also be used to change the default opts: + +} From 734cb19160bf4cae88fd23b870b9cdc98294d790 Mon Sep 17 00:00:00 2001 From: Ryan Peach Date: Tue, 31 Dec 2024 18:45:22 -0500 Subject: [PATCH 02/10] Some changes --- home/.gitignore_global | 2 -- home/.zshrc | 18 ++++++++++++++++++ home/bin/cloneorg | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/home/.gitignore_global b/home/.gitignore_global index 5732ec8..01a75eb 100644 --- a/home/.gitignore_global +++ b/home/.gitignore_global @@ -71,7 +71,6 @@ tramp # cask packages .cask/ -dist/ # Flycheck flycheck_*.el @@ -141,7 +140,6 @@ __pycache__/ .Python build/ develop-eggs/ -dist/ downloads/ eggs/ .eggs/ diff --git a/home/.zshrc b/home/.zshrc index f908e51..819330e 100644 --- a/home/.zshrc +++ b/home/.zshrc @@ -238,6 +238,24 @@ build-deps () { alias trueclear="clear" alias clear="trueclear && neofetch" +# Load environment variables from a file +function dotenv() { + if [[ -f "$1" ]]; then + export $(grep -v '^#' "$1" | xargs) + else + echo "dotenv: File '$1' not found." + fi +} + +# Unset environment variables that were set from a file +function undotenv() { + if [[ -f "$1" ]]; then + unset $(grep -v '^#' "$1" | sed -E 's/(.*)=.*/\1/' | xargs) + else + echo "undotenv: File '$1' not found." + fi +} + ## =============== Exit ========================= ## Because the shell has ~/shell inside its own filesystem ## we want to protect any work we are doing in this filesystem diff --git a/home/bin/cloneorg b/home/bin/cloneorg index 18f7555..dcd6b99 100755 --- a/home/bin/cloneorg +++ b/home/bin/cloneorg @@ -73,7 +73,7 @@ clone_or_update_repo() { cd - || exit else echo "Cloning $repo_name into $target_dir" - git clone git@github.com:$ORGANIZATION/$repo_name.git "$target_dir/$repo_name" --mirror + git clone git@github.com:$ORGANIZATION/$repo_name.git "$target_dir/$repo_name" fi } From e20657f4c358492e41346d242fae5cfe0ac2e910 Mon Sep 17 00:00:00 2001 From: Ryan Peach Date: Wed, 9 Apr 2025 13:21:43 -0400 Subject: [PATCH 03/10] nerdfont name changed https://github.com/alacritty/alacritty/issues/7379 --- home/.alacritty/includes/shared.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.alacritty/includes/shared.toml b/home/.alacritty/includes/shared.toml index 40ce2ce..b464f66 100644 --- a/home/.alacritty/includes/shared.toml +++ b/home/.alacritty/includes/shared.toml @@ -1,6 +1,6 @@ [font] size = 12 -normal = { family = "JetBrainsMono Nerd Font", style = "Regular" } +normal = { family = "JetBrainsMono NF", style = "Regular" } [scrolling] history = 100000 From 4f57bfdb35387501818a837f22e62657ece5b82c Mon Sep 17 00:00:00 2001 From: Ryan Peach Date: Tue, 7 Oct 2025 12:43:10 -0400 Subject: [PATCH 04/10] Add docker path to path --- home/.zshrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home/.zshrc b/home/.zshrc index 819330e..e9b2d5a 100644 --- a/home/.zshrc +++ b/home/.zshrc @@ -16,6 +16,9 @@ fi # If you come from bash you might have to change your $PATH. export PATH=$HOME/bin:/usr/local/bin:$HOME/.local/bin:$PATH:/opt/homebrew/bin:/home/linuxbrew/.linuxbrew/bin:$HOME/.cargo/bin +# Add docker to path +export PATH=$PATH:$HOME/.docker/bin + # Load private info location if [ -z "$ZSHRC_PRIVATE_LOC" ]; then ZSHRC_PRIVATE_LOC=$MNT From a1718a7a66eef1dd485fb220c52b00b1b534fb01 Mon Sep 17 00:00:00 2001 From: Ryan Peach Date: Tue, 7 Oct 2025 12:48:28 -0400 Subject: [PATCH 05/10] Set GPG id to C3238691F8B983AB1ED09984F394946CED79E325. --- .gpg-id | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gpg-id diff --git a/.gpg-id b/.gpg-id new file mode 100644 index 0000000..5b7248a --- /dev/null +++ b/.gpg-id @@ -0,0 +1 @@ +C3238691F8B983AB1ED09984F394946CED79E325 From c00c01204b25aa3cabbb87509e4046b2de7d7bf3 Mon Sep 17 00:00:00 2001 From: Ryan Peach Date: Tue, 7 Oct 2025 12:49:09 -0400 Subject: [PATCH 06/10] Revert "Set GPG id to C3238691F8B983AB1ED09984F394946CED79E325." This reverts commit a1718a7a66eef1dd485fb220c52b00b1b534fb01. --- .gpg-id | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .gpg-id diff --git a/.gpg-id b/.gpg-id deleted file mode 100644 index 5b7248a..0000000 --- a/.gpg-id +++ /dev/null @@ -1 +0,0 @@ -C3238691F8B983AB1ED09984F394946CED79E325 From 5acaa12ef2dbe4c304d31e12d15df5f07f915bb6 Mon Sep 17 00:00:00 2001 From: Ryan Peach Date: Tue, 7 Oct 2025 12:50:04 -0400 Subject: [PATCH 07/10] Created a password store folder for the pass tool --- .password-store/.gpg-id | 1 + 1 file changed, 1 insertion(+) create mode 100644 .password-store/.gpg-id diff --git a/.password-store/.gpg-id b/.password-store/.gpg-id new file mode 100644 index 0000000..5b7248a --- /dev/null +++ b/.password-store/.gpg-id @@ -0,0 +1 @@ +C3238691F8B983AB1ED09984F394946CED79E325 From 7d4e01d2fb5edd89a5e6d51bb072156360fac811 Mon Sep 17 00:00:00 2001 From: Ryan Peach Date: Tue, 7 Oct 2025 12:53:12 -0400 Subject: [PATCH 08/10] Move password-store into home so it will work with stow --- {.password-store => home/.password-store}/.gpg-id | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {.password-store => home/.password-store}/.gpg-id (100%) diff --git a/.password-store/.gpg-id b/home/.password-store/.gpg-id similarity index 100% rename from .password-store/.gpg-id rename to home/.password-store/.gpg-id From 973d60039fe96a0891789d730b030fb790ce3cc0 Mon Sep 17 00:00:00 2001 From: Ryan Peach Date: Tue, 7 Oct 2025 13:14:35 -0400 Subject: [PATCH 09/10] Definitely don't upload anything about ansys --- .gitignore | 1 + Dockerfile | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 58f491e..c17f019 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ .python-version lazy-lock.json lazyvim.json +*ansys* #nvim ## Swap diff --git a/Dockerfile b/Dockerfile index f36d6f1..66c7b9b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,6 +29,8 @@ RUN apk add --no-cache \ sshpass \ openssh-client \ openssh-server \ + gnupg \ + pass \ # Archive tools \ unzip \ tar \ From 710adf5f6dc591045e216edf8a242b0c20c6e4d0 Mon Sep 17 00:00:00 2001 From: Ryan Peach Date: Tue, 28 Oct 2025 17:53:59 -0400 Subject: [PATCH 10/10] Added OPENAI_API_KEY --- home/.alacritty/profiles/tmux.toml | 5 ++++- home/.password-store/OPENAI_API_KEY.gpg | Bin 0 -> 313 bytes 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 home/.password-store/OPENAI_API_KEY.gpg diff --git a/home/.alacritty/profiles/tmux.toml b/home/.alacritty/profiles/tmux.toml index 7b1fed2..df18f38 100644 --- a/home/.alacritty/profiles/tmux.toml +++ b/home/.alacritty/profiles/tmux.toml @@ -1,8 +1,11 @@ +[general] import = [ "~/.alacritty/includes/shared.toml" ] -[shell] +[terminal] + +[terminal.shell] program = "/bin/zsh" args = [ "-l", diff --git a/home/.password-store/OPENAI_API_KEY.gpg b/home/.password-store/OPENAI_API_KEY.gpg new file mode 100644 index 0000000000000000000000000000000000000000..41e4f7db9065da469757b62d143399af520b46f5 GIT binary patch literal 313 zcmV-90mlA>UIWaA&W!6u{MZr!2SEGbPJLs|%gjNKK^{_D>{cnpcL4*bfK!iE;(f zz!m{g1AzpQ4?7w6dA*qmv(1-j^%$Jzu5C4okvEo?BI;ZKw*(%~*}c01&U`