From 6002d76388e1034f8813cb46964987f2c2632c3b Mon Sep 17 00:00:00 2001 From: JafarAbdi Date: Sat, 31 Aug 2024 15:50:44 +0100 Subject: [PATCH] Cleaup installation scripts --- Makefile | 2 +- README.md | 2 +- fish/conf.d/installs.fish | 14 ++++---------- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index dc02dd11..ea81cc1a 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ dev-rust: fish -c 'source ~/myconfigs/fish/conf.d/installs.fish && install-rust-lsp' dev-cpp: - fish -c 'source ~/myconfigs/fish/conf.d/installs.fish && install-cpp-lsp && install-cpp-analyzers' + fish -c 'source ~/myconfigs/fish/conf.d/installs.fish && install-cpp-lsp' dev-xml: fish -c 'source ~/myconfigs/fish/conf.d/installs.fish && install-xml-lsp' diff --git a/README.md b/README.md index 9784aa85..d080f435 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,6 @@ make host # Host specific configs make dev ``` -- Install tailscale: https://tailscale.com/download +- Install tailscale: [tailscale](https://tailscale.com/download) - Install Obsidian: `install-obsidian` - Install NextCloud: `install-nextcloud-sync` diff --git a/fish/conf.d/installs.fish b/fish/conf.d/installs.fish index 88fbd7ed..4062afa9 100644 --- a/fish/conf.d/installs.fish +++ b/fish/conf.d/installs.fish @@ -393,9 +393,9 @@ function install-luacheck end function install-markdown-lsp - install-from-github artempyanykh/marksman marksman-linux - chmod +x marksman-linux - mv marksman-linux ~/.local/bin/marksman + install-from-github artempyanykh/marksman marksman-linux-x64 + chmod +x marksman-linux-x64 + mv marksman-linux-x64 ~/.local/bin/marksman end function install-cpp-analyzers @@ -611,13 +611,7 @@ function install-docker # It uses the latest stable version, there's release for sid # https://docs.docker.com/engine/install/debian/ # https://nickjanetakis.com/blog/docker-tip-77-installing-docker-on-debian-unstable - if ! command -q nvidia-docker &> /dev/null - export distribution=(export (cat /etc/os-release |xargs -L 1);echo $ID$VERSION_ID) \ - && curl -s -L https://nvidia.github.io/nvidia-docker/gpgkey | sudo apt-key add - \ - && curl -s -L https://nvidia.github.io/nvidia-docker/$distribution/nvidia-docker.list | sudo tee /etc/apt/sources.list.d/nvidia-docker.list - sudo apt-get update - sudo apt-get install -y nvidia-docker2 - end + echo "To install nvidia-docker follow: https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/latest/install-guide.html#installation" sudo systemctl restart docker wget https://raw.githubusercontent.com/docker/cli/master/contrib/completion/fish/docker.fish -O ~/.config/fish/completions/docker.fish wget https://raw.githubusercontent.com/docker/compose/master/contrib/completion/fish/docker-compose.fish -O ~/.config/fish/completions/docker-compose.fish