diff --git a/env-available/lin-min.sh b/env-available/lin-min.sh index 7e85ded..90d2b00 100755 --- a/env-available/lin-min.sh +++ b/env-available/lin-min.sh @@ -43,6 +43,7 @@ if [ "$os_distro" = "Ubuntu" ]; then apt update -y # apt purge -y apt install -y wget git vim neovim tmux htop gcc g++ clang clang-format libssl-dev silversearcher-ag fzf shellcheck procps make cmake + apt install -y ansible fi if [ "$os_distro" = "CentOS" ]; then yum update -y diff --git a/env-available/server-ubuntu-22.04/bashrc b/env-available/server-ubuntu-22.04/bashrc index 36134d1..062f0a9 100644 --- a/env-available/server-ubuntu-22.04/bashrc +++ b/env-available/server-ubuntu-22.04/bashrc @@ -128,6 +128,9 @@ export NVM_DIR="$HOME/.nvm" [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion PATH=$PATH:/home/buda/scripts/git +PATH=$PATH:/usr/local/cuda/bin +LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/cuda/lib64 + # Add git branch if its present to PS1 parse_git_branch() { git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/(\1)/' diff --git a/env-available/server-ubuntu-22.04/setup.sh b/env-available/server-ubuntu-22.04/setup.sh index 72c9a45..ae8782c 100755 --- a/env-available/server-ubuntu-22.04/setup.sh +++ b/env-available/server-ubuntu-22.04/setup.sh @@ -8,6 +8,7 @@ RM_DEPS=( # rm_nvchad # rm_fzf # rm_custom-conda + # rm_custom-cuda ) DEPS=( htop tmux vim tree curl git tig dialog silversearcher-ag zsh plocate @@ -24,15 +25,15 @@ DEPS=( custom-fzf custom-nvm custom-rust - nvidia-cuda-toolkit + custom-conda + # nvidia-cuda-toolkit # custom-cudnn custom-nccl custom-cutensor custom-cusparselt + custom-cuda # custom-just # https://just.systems/man/en/chapter_4.html -> cargo install just # custom-mevi # https://github.com/fasterthanlime/mevi # sudo sysctl -w vm.unprivileged_userfaultfd=1 # cargo install just trunk cargo-tree-sitter - custom-conda - nvidia-cuda-toolkit # custom-cuda ) # TODO(gitbuda): Add e.g. https://github.com/leehblue/texpander @@ -58,6 +59,10 @@ function rm_custom-conda { rm -rf $1/miniconda3 } +function rm_custom-cuda { + echo "Removing custom-cuda" +} + if [ "$EUID" -ne 0 ]; then echo "Please run as root." fi @@ -168,10 +173,12 @@ for pkg in "${DEPS[@]}"; do if [ "$pkg" == custom-nvchad ]; then if [ ! -d "/home/$SUDO_USER/.config/nvim" ]; then + # NOTE: Only reconsider on a new major version. # sudo -H -u "$SUDO_USER" bash -c "git clone git@github.com:NvChad/starter.git '/home/$SUDO_USER/.config/nvim'" # chown -R "$SUDO_USER:$SUDO_USER" "/home/$SUDO_USER/.config/nvim" # cd "/home/$SUDO_USER/.config/nvim" # git checkout v2.5 + # TODO: Since v2.5 remove the .git folder if [ ! -L "/home/$SUDO_USER/.config/nvim" ]; then ln -s "/home/$SUDO_USER/scripts/nvchad-v2.5" "/home/$SUDO_USER/.config/nvim" fi @@ -217,10 +224,14 @@ for pkg in "${DEPS[@]}"; do fi if [ "$pkg" == custom-cuda ]; then + # https://www.cherryservers.com/blog/install-cuda-ubuntu + # Find cuda download link under https://developer.nvidia.com/cuda-downloads. # TODO(gitbuda): Revisit how to skip custom installation. NOTE: there is also nvidia-cuda-toolkit, if here, remove the default package. if [ ! -d "/usr/local/cuda" ]; then cd "$script_dir" - wget https://developer.download.nvidia.com/compute/cuda/11.6.0/local_installers/cuda_11.6.0_510.39.01_linux.run -O cuda.out + if [ ! -f "cuda.out" ]; then + wget https://developer.download.nvidia.com/compute/cuda/12.2.2/local_installers/cuda_12.2.2_535.104.05_linux.run -O cuda.out + fi sh cuda.out fi echo "$pkg is installed." && continue diff --git a/nvchad-v2.5/lazy-lock.json b/nvchad-v2.5/lazy-lock.json index fd0d896..0a1adbd 100644 --- a/nvchad-v2.5/lazy-lock.json +++ b/nvchad-v2.5/lazy-lock.json @@ -1,31 +1,30 @@ { "ChatGPT.nvim": { "branch": "main", "commit": "df53728e05129278d6ea26271ec086aa013bed90" }, - "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, - "LuaSnip": { "branch": "master", "commit": "825a61bad1d60d917a7962d73cf3c683f4e0407e" }, - "NvChad": { "branch": "v2.5", "commit": "6833c60694a626615911e379d201dd723511546d" }, - "base46": { "branch": "v2.5", "commit": "adb64a6ae70f8c61c5ab8892f07d29dafd4d47ad" }, + "LuaSnip": { "branch": "master", "commit": "878ace11983444d865a72e1759dbcc331d1ace4c" }, + "NvChad": { "branch": "v2.5", "commit": "f9ed3a79dbe956cdbd866b0d3f3b2650c61d81ee" }, + "base46": { "branch": "v2.5", "commit": "581da737daacd67c6184c076e4e07a03c9fbf7cf" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "9d5ba06d6ee7418c674f498634617416d15b6239" }, - "friendly-snippets": { "branch": "main", "commit": "ea068f1becd91bcd4591fceb6420d4335e2e14d3" }, - "gitsigns.nvim": { "branch": "main", "commit": "fa052c20aa7cc62ce6a328c7f3bd556c93b5370e" }, - "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, - "lazy.nvim": { "branch": "main", "commit": "bef521ac89c8d423f9d092e37b58e8af0c099309" }, - "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, - "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" }, - "nvim-autopairs": { "branch": "master", "commit": "dbfc1c34bed415906395db8303c71039b3a3ffb4" }, - "nvim-cmp": { "branch": "main", "commit": "ce16de5665c766f39c271705b17fff06f7bcb84f" }, + "conform.nvim": { "branch": "master", "commit": "f3b930db4964d60e255c8f9e37b7f2218dfc08cb" }, + "friendly-snippets": { "branch": "main", "commit": "d0610077b6129cf9f7f78afbe3a1425d60f6e2f1" }, + "gitsigns.nvim": { "branch": "main", "commit": "75dc649106827183547d3bedd4602442340d2f7f" }, + "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, + "lazy.nvim": { "branch": "main", "commit": "ad30030b6abca7dac5a493c58b4d183b3fe93202" }, + "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, + "nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" }, + "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, + "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, - "nvim-lspconfig": { "branch": "master", "commit": "96e5711040df23583591391ce49e556b8cd248d8" }, - "nvim-tree.lua": { "branch": "master", "commit": "d8d3a1590a05b2d8b5eb26e2ed1c6052b1b47a77" }, - "nvim-treesitter": { "branch": "master", "commit": "1b050206e490a4146cdf25c7b38969c1711b5620" }, - "nvim-web-devicons": { "branch": "master", "commit": "3ee60deaa539360518eaab93a6c701fe9f4d82ef" }, - "plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" }, - "telescope.nvim": { "branch": "master", "commit": "4626aaa2bcfdacf55fd6d44b430e2df81b2403ff" }, - "trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" }, - "ui": { "branch": "v2.5", "commit": "e1af69426b3c4b55c88bd1c81790c1c73b30bfa8" }, - "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } + "nvim-lspconfig": { "branch": "master", "commit": "710a8fa7379db32199545f30ea01dd8446b9302f" }, + "nvim-tree.lua": { "branch": "master", "commit": "26632f496e7e3c0450d8ecff88f49068cecc8bda" }, + "nvim-treesitter": { "branch": "master", "commit": "979beffc1a86e7ba19bd6535c0370d8e1aaaad3c" }, + "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" }, + "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, + "telescope.nvim": { "branch": "master", "commit": "dfa230be84a044e7f546a6c2b0a403c739732b86" }, + "trouble.nvim": { "branch": "main", "commit": "c945d9fe43dbe2e693f0b1a0c2420ad7603f880b" }, + "ui": { "branch": "v2.5", "commit": "0c283b6aed4eed585a497c9031b18b5009bfe4dd" }, + "which-key.nvim": { "branch": "main", "commit": "4b7167f8fb2dba3d01980735e3509e172c024c29" } } \ No newline at end of file diff --git a/util b/util index 494a86b..5b8fff2 160000 --- a/util +++ b/util @@ -1 +1 @@ -Subproject commit 494a86bd4097a2eab16c400049150c6e72d9824c +Subproject commit 5b8fff24a7b985baadfd749914a6a8a524ceccec