From c88b024cf9c7ef401a9eb33c7187fd5a7fa5ad96 Mon Sep 17 00:00:00 2001 From: Dominic Masters Date: Sat, 17 Sep 2022 11:49:26 -0700 Subject: [PATCH] New cleaner dotenv.sh --- TODO.txt | 3 + {scripts => configs}/pia-settings.json | 0 {scripts => configs}/vimrc-config | 0 {scripts => configs}/vimrc-plugins | 0 dotenv.sh | 138 +++++++++++++++++----- scripts/install-arch.sh | 7 -- scripts/install-debian.sh | 8 -- scripts/install-gbdk.sh | 1 - scripts/install-iosevka.sh | 8 -- scripts/install-node.sh | 16 --- scripts/install-plasma.sh | 156 ------------------------- scripts/install-rvm.sh | 11 -- scripts/install-vim.sh | 16 --- 13 files changed, 112 insertions(+), 252 deletions(-) create mode 100644 TODO.txt rename {scripts => configs}/pia-settings.json (100%) rename {scripts => configs}/vimrc-config (100%) rename {scripts => configs}/vimrc-plugins (100%) delete mode 100755 scripts/install-arch.sh delete mode 100755 scripts/install-debian.sh delete mode 100755 scripts/install-gbdk.sh delete mode 100755 scripts/install-iosevka.sh delete mode 100755 scripts/install-node.sh delete mode 100755 scripts/install-plasma.sh delete mode 100755 scripts/install-rvm.sh delete mode 100755 scripts/install-vim.sh diff --git a/TODO.txt b/TODO.txt new file mode 100644 index 0000000..c15f636 --- /dev/null +++ b/TODO.txt @@ -0,0 +1,3 @@ +1 - Upgrade +2 - Hide the Manjaro Hello (and disable launch at start?) +3 - Install Oracle Guest additions? May not be required for some archs \ No newline at end of file diff --git a/scripts/pia-settings.json b/configs/pia-settings.json similarity index 100% rename from scripts/pia-settings.json rename to configs/pia-settings.json diff --git a/scripts/vimrc-config b/configs/vimrc-config similarity index 100% rename from scripts/vimrc-config rename to configs/vimrc-config diff --git a/scripts/vimrc-plugins b/configs/vimrc-plugins similarity index 100% rename from scripts/vimrc-plugins rename to configs/vimrc-plugins diff --git a/dotenv.sh b/dotenv.sh index d430a98..d78b9c8 100755 --- a/dotenv.sh +++ b/dotenv.sh @@ -6,41 +6,121 @@ if [[ "$EUID" -eq 0 ]]; then exit 1 fi -# Grant SH execute -chmod +x ./**/*.sh -# Setup SSH key -mkdir -p ~/.ssh -echo "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAhF9DPXFN207BJrScSdWCMP+S5iOHKa/9KRBSMx4iqcc3YgGJttgMdTqrlJwTKDZgxmzc9LSBGJlkY5fQaYRyH4kRTaBs6oyYbEeo9b85NF8NZ1cpeMA3qORRIkWlDeSYIBhPmwORqPJjXDIEp04eza/ujZmOLGO412h4+Z6RLjUq7gdQEB9o9v9hz/9rV+0IRhie4PumffWZ94ZyAixrgsUGJqDyfLo+mTSEgXOYAJgvqfZ5+q3tke2MraGVmjZhinBfUZp608VqA56bG6KRvJX1uz8TGuReG4UCiWQX/waTxJRc80FySjnR7+1uzB7OwGWtiN0B6/lOd2Gt8QufKQ== rsa-key-20190523" >> ~/.ssh/authorized_keys -chmod 0700 ~/.ssh/authorized_keys +# Update, run twice incase of keychain updates +sudo pacman -Syuu -q --noconfirm +sudo pacman -Syuu -q --noconfirm -# Arch Linux Setup -if [ -f "/etc/arch-release" ]; then - ./scripts/install-arch.sh -fi - -# Debian set up -if [ -f "/etc/debian_version" ]; then - ./scripts/install-debian.sh -fi - -# Update flatpak +flatpak update --assumeyes flatpak update --assumeyes -# Node JS / NVM -./scripts/install-node.sh -source ~/.nvm/nvm.sh -# Ruby / RVM -./scripts/install-rvm.sh -source ~/.rvm/scripts/rvm +# Install the tools I like to use in the CLI +sudo pacman -S -q --noconfirm \ + base-devel \ + unrar \ + git \ + cmake \ + curl \ + wget \ + flatpak \ + neovim \ + vim -# VIM -./scripts/install-vim.sh -# Plasma Desktop -if [[ "$DESKTOP_SESSION" -eq "plasma" ]]; then - ./scripts/install-plasma.sh +# Install over pacman programs I use +mkdir -p ~/Applications + + +sudo pacman -S -q --noconfirm + firefox \ + gparted \ + solaar \ + qbittorrent \ + vlc \ + pinta \ + cheese \ + #meld \ + filezilla \ + inkscape \ + gnome-chess \ + gnome-mines \ + gnome-sudoku \ + aisleriot \ + handbrake \ + audacity \ + blender \ + #maliit-framework \ + #maliit-keyboard \ + tiled \ + libreoffice-fresh \ + #xorg-xcursorgen \ + plasma-wayland-session \ + steam \ + zip \ + ttc-iosevka + + +# Install programs using flatpak +flatpak install flathub \ + com.bitwarden.desktop \ + com.obsproject.Studio \ + com.discordapp.Discord \ + com.usebottles.bottles \ + org.libretro.RetroArch \ + org.gnome.NetworkDisplays \ + org.gnome.gitlab.YaLTeR.VideoTrimmer \ + com.orama_interactive.Pixelorama \ + #com.parsecgaming.parsec \ + #com.github.tenderowl.frog \ + com.uploadedlobster.peek \ + --assumeyes + + +# VS Code (AUR) +git clone https://aur.archlinux.org/visual-studio-code-bin +cd visual-studio-code-bin +makepkg -si --noconfirm +cd .. + + +# pCloud +if [ ! -f "~/Applications/pcloud" ]; then + wget https://p-def8.pcloud.com/cBZu1eKrMZMqwjTqZZZh9ILr7Z2ZZmNzZkZPF7pVZrHZrzZBpZpRZc5Z6pZopZ9pZApZGFZUJZkJZPpZkzZWTVkVZQDtD9nHvjKu7c1tTLeXYVj05EfNk/pcloud -O ~/Applications/pcloud + chmod +x ~/Applications/pcloud + ~/Applications/pcloud & fi -# Iosevka + +# PIA +if ! command -v piactl &> /dev/null +then + wget https://installers.privateinternetaccess.com/download/pia-linux-3.3.1-06924.run -O ~/Downloads/pia.run + chmod +x ~/Downloads/pia.run + mkdir -p ~/.config/privateinternetaccess + cp ./scripts/pia-settings.json ~/.config/privateinternetaccess/clientsettings.json + ~/Downloads/pia.run + rm ~/Downloads/pia.run +fi + + +# Node JS / NVM +if ! command -v nvm &> /dev/null +then + curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash + NVM_DIR="$HOME/.nvm" + [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" + [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" +fi + +nvm install --lts +npm i -g yarn + + +# VIM +sh -c 'curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim' +cp ./configs/vimrc-plugins ~/.config/nvim/init.vim +vim +"PlugInstall --sync" +qa + +cat ./configs/vimrc-config >> ~/.config/nvim/init.vim +echo "alias vim='nvim'" >> ~/.bashrc \ No newline at end of file diff --git a/scripts/install-arch.sh b/scripts/install-arch.sh deleted file mode 100755 index e280917..0000000 --- a/scripts/install-arch.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -# Update -sudo pacman -Syuu -q --noconfirm - -# Install -sudo pacman -S -q --noconfirm base-devel unrar git cmake curl wget flatpak neovim vim \ No newline at end of file diff --git a/scripts/install-debian.sh b/scripts/install-debian.sh deleted file mode 100755 index 11d6517..0000000 --- a/scripts/install-debian.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -# Update -sudo apt update -sudo apt upgrade - -# Install -sudo apt install --assume-yes build-essential unrar git cmake curl wget flatpak neovim vim diff --git a/scripts/install-gbdk.sh b/scripts/install-gbdk.sh deleted file mode 100755 index cc1f786..0000000 --- a/scripts/install-gbdk.sh +++ /dev/null @@ -1 +0,0 @@ -#!/bin/bash \ No newline at end of file diff --git a/scripts/install-iosevka.sh b/scripts/install-iosevka.sh deleted file mode 100755 index b8d643e..0000000 --- a/scripts/install-iosevka.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -echo "Downloading Iosveka" -if [ ! -f ~/Downloads/iosevka.zip ]; then - wget -O ~/Downloads/iosevka.zip "https://github.com/be5invis/Iosevka/releases/download/v11.2.6/super-ttc-iosevka-11.2.6.zip" -fi -unzip ~/Downloads/iosevka.zip -sudo mv ./iosevka.ttc /usr/local/share/fonts diff --git a/scripts/install-node.sh b/scripts/install-node.sh deleted file mode 100755 index 65d6c60..0000000 --- a/scripts/install-node.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -# NVM -if ! command -v nvm &> /dev/null -then - curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.37.2/install.sh | bash -fi -NVM_DIR="$HOME/.nvm" -[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" -[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" - -# Install NodeJS LTS -nvm install --lts - -# Install global packages -npm i -g yarn \ No newline at end of file diff --git a/scripts/install-plasma.sh b/scripts/install-plasma.sh deleted file mode 100755 index 99aae50..0000000 --- a/scripts/install-plasma.sh +++ /dev/null @@ -1,156 +0,0 @@ -#!/bin/bash - -# Create applications directory -mkdir -p ~/Applications - -# Prep snap -#sudo ln -s /var/lib/snapd/snap /snap - -toInstall="\ - firefox \ - gparted \ - solaar \ - qbittorrent \ - vlc \ - pinta \ - cheese \ - meld \ - filezilla \ - inkscape \ - gnome-chess \ - gnome-mines \ - gnome-sudoku \ - aisleriot \ - handbrake \ - audacity \ - blender \ - maliit-framework \ - maliit-keyboard \ - tiled \ - libreoffice-fresh \ - xorg-xcursorgen \ - plasma-wayland-session \ - steam \ - zip -" - -# Arch Linux Setup -if [ -f "/etc/arch-release" ]; then - sudo pacman -S -q --noconfirm $toInstall - - # VS Code (Arch) - git clone https://aur.archlinux.org/visual-studio-code-bin - cd visual-studio-code-bin - makepkg -si --noconfirm - cd .. -fi - -# Debian set up -if [ -f "/etc/debian_version" ]; then - sudo apt install --assume-yes $toInstall - - # VS Code (Debian) - wget https://az764295.vo.msecnd.net/stable/da15b6fd3ef856477bf6f4fb29ba1b7af717770d/code_1.67.1-1651841865_amd64.deb -O ~/Downloads/vscode.deb - sudo dpkg -i ~/Downloads/vscode.deb - rm ~/Downloads/vscode.deb -fi - -# Install programs using flatpak -flatpak install flathub \ - com.bitwarden.desktop \ - com.obsproject.Studio \ - com.discordapp.Discord \ - com.usebottles.bottles \ - org.libretro.RetroArch \ - org.gnome.NetworkDisplays \ - org.gnome.gitlab.YaLTeR.VideoTrimmer \ - com.orama_interactive.Pixelorama \ - com.parsecgaming.parsec \ - com.github.tenderowl.frog \ - com.uploadedlobster.peek \ - --assumeyes - -# pCloud -if [ ! -f "~/Applications/pcloud" ]; then - wget https://p-def8.pcloud.com/cBZu1eKrMZMqwjTqZZZh9ILr7Z2ZZmNzZkZPF7pVZrHZrzZBpZpRZc5Z6pZopZ9pZApZGFZUJZkJZPpZkzZWTVkVZQDtD9nHvjKu7c1tTLeXYVj05EfNk/pcloud -O ~/Applications/pcloud - chmod +x ~/Applications/pcloud - ~/Applications/pcloud & -fi - -# PIA -if ! command -v piactl &> /dev/null -then - wget https://installers.privateinternetaccess.com/download/pia-linux-3.3.1-06924.run -O ~/Downloads/pia.run - chmod +x ~/Downloads/pia.run - mkdir -p ~/.config/privateinternetaccess - cp ./scripts/pia-settings.json ~/.config/privateinternetaccess/clientsettings.json - ~/Downloads/pia.run - rm ~/Downloads/pia.run -fi - -# Qogir theme -#git clone https://github.com/vinceliuice/Qogir-kde -#cd Qogir-kde -#./install.sh -#cd .. - -# Delete Qogir ugly icons (Sorry Qogir) -#rm -rf ~/.local/share/plasma/desktoptheme/Qogir*/icons - -# Iosevka Font -#mkdir -p ~/.fonts -#wget "https://objects.githubusercontent.com/github-production-release-asset-2e65be/39315600/97e975fb-b154-4b05-bd0a-3c818fdb02f9?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AKIAIWNJYAX4CSVEH53A%2F20220424%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20220424T063917Z&X-Amz-Expires=300&X-Amz-Signature=4edc659fe314a1f8b8964063152d98f2ce1e1c971619d87c08996443ce65cf68&X-Amz-SignedHeaders=host&actor_id=0&key_id=0&repo_id=39315600&response-content-disposition=attachment%3B%20filename%3Dsuper-ttc-iosevka-ss09-15.2.0.zip&response-content-type=application%2Foctet-stream" -O ./iosevka-ss09.zip -#bsdtar xvf ./iosevka-ss09.zip -#mkdir -p ~/.fonts -#cp -r ./*.ttc ~/.fonts/ - -# Papirus Icons -mkdir -p ~/.local/share/icons -wget -qO- https://git.io/papirus-icon-theme-install | DESTDIR="$HOME/.local/share/icons" sh -/usr/lib/plasma-changeicons Papirus-Dark - -# simp1e cursors -if [ ! -d "simp1e" ] ; then - git clone --recurse-submodules https://gitlab.com/zoli111/simp1e.git -fi -cd simp1e -find . -type f -name "*.sh" -exec sed -i 's/\r//' {} \; -chmod +x ./generate_svgs.sh -./generate_svgs.sh -./build_cursors.sh -cp -r ./built_themes/* ~/.local/share/icons/ -kwriteconfig5 --file ~/.config/kcminputrc --group Mouse --key cursorTheme "Simp1e-" - -# Wallpaper - -# Kickstart / Start Menu, installed but not configured -if [ ! -d "plasma-kickoff-grid" ] ; then - git clone https://gitlab.com/nwwdles/plasma-kickoff-grid.git -fi -cd plasma-kickoff-grid -zip -r "plasma-kickoff-grid.plasmoid" package -kpackagetool5 --install "plasma-kickoff-grid.plasmoid" - -# TODO: -# Change the blinking animation on opening apps -# Splash Screen -# Screen Edges for desktop -# Touch Screen Gestures* -# Lock Screen settings -# Virtual Desktops -# Task Switcher (Alt Tab) -# Disable -# SDDM -# Autostart -# Dont restore saved session -# Do not disturb mode -# User Icon and email -# Date and time settings, localization settings -# Disable KDE Wallet -# Online accounts (gmail) -# Night Color -# Power save settings -# Printers? -# Application Launcher -# Change tray icons -# Change clock display \ No newline at end of file diff --git a/scripts/install-rvm.sh b/scripts/install-rvm.sh deleted file mode 100755 index fc62b0f..0000000 --- a/scripts/install-rvm.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -if ! command -v rvm &> /dev/null -then - gpg2 --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB - \curl -sSL https://get.rvm.io | bash -s stable - source ~/.rvm/scripts/rvm -fi - -# Install Ruby 2.7.2 -rvm install 2.7.2 -rvm use 2.7.2 --default diff --git a/scripts/install-vim.sh b/scripts/install-vim.sh deleted file mode 100755 index 2f25054..0000000 --- a/scripts/install-vim.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -cd ./scripts - -mkdir -p ~/.config/nvim - -# Install Plugin Manager -sh -c 'curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs \ - https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim' -cp ./vimrc-plugins ~/.config/nvim/init.vim -vim +"PlugInstall --sync" +qa - -# Setup Configuration -cat ./vimrc-config >> ~/.config/nvim/init.vim - -# Alias NEOVIM -echo "alias vim='nvim'" >> ~/.bashrc \ No newline at end of file