diff --git a/bash/.bashrc b/bash/.bashrc index 204f917..3cbac1e 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -105,8 +105,8 @@ if [ -f ~/.bash_aliases ]; then . ~/.bash_aliases fi -if [ -f ~/.zakrc ]; then - . ~/.zakrc +if [ -f ~/.bash_secrets ]; then + . ~/.bash_secrets fi # enable programmable completion features (you don't need to enable @@ -127,3 +127,5 @@ export NVM_DIR="$HOME/.nvm" export KUBECONFIG=$HOME/kubeconfig +export PATH="$PATH:$HOME:$HOME/bin:$HOME/.local/bin:/usr/local/go/bin:/usr/local/bin" + diff --git a/bash/.zakrc b/bash/.zakrc deleted file mode 100755 index 8b13789..0000000 --- a/bash/.zakrc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/build_neovim b/build_neovim index 89eaa04..b9376aa 100755 --- a/build_neovim +++ b/build_neovim @@ -3,9 +3,9 @@ git clone --recursive --depth=1 --branch v0.9.5 https://github.com/neovim/neovim.git build-neovim cd build-neovim rm -rf build -make CMAKE_BUILD_TYPE=Release -j8 +sudo make CMAKE_BUILD_TYPE=Release -j$(nproc) sudo make install cd .. -rm -rf build-neovim +sudo rm -rf build-neovim diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index d2f95e3..c567384 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -8,7 +8,7 @@ "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, "harpoon": { "branch": "master", "commit": "ccae1b9bec717ae284906b0bf83d720e59d12b91" }, - "lazy.nvim": { "branch": "main", "commit": "758bb5de98b805acc5eeed8cdc8ac7f0bc4b0b86" }, + "lazy.nvim": { "branch": "main", "commit": "8f19915175395680808de529e4220da8dafc0759" }, "lsp-zero.nvim": { "branch": "v3.x", "commit": "f12d50716e8e59ea9f5cf484eac6968c33a95917" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" }, diff --git a/prep b/prep index 5d1b325..dbfb7c1 100755 --- a/prep +++ b/prep @@ -3,14 +3,15 @@ sudo apt update && sudo apt upgrade -y sudo apt install -y ripgrep build-essential git cmake fzf stow zsh sudo apt install -y ninja-build gettext unzip curl tmux bc -sudo update-alternatives --install /usr/bin/editor editor /usr/local/bin/nvim 1000 -sudo update-alternatives --install /usr/bin/vim vim /usr/local/bin/nvim 1000 if ! command -v nvim &> /dev/null then sh ./build_neovim fi +sudo update-alternatives --install /usr/bin/editor editor /usr/local/bin/nvim 1000 +sudo update-alternatives --install /usr/bin/vim vim /usr/local/bin/nvim 1000 + curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash export NVM_DIR="$HOME/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm