From 32a8c1260a4e00fcca0dcfad76cc5dd20cf011b5 Mon Sep 17 00:00:00 2001 From: evan Date: Mon, 20 Jul 2026 21:27:18 -0500 Subject: [PATCH] fix up a few things --- desktop-env.sh | 4 ++-- main.sh | 35 ++++++++++++++++++----------------- removing-stuff.sh | 2 +- user-programs.sh | 8 ++++---- utils/dotzshrc | 8 ++++++-- 5 files changed, 31 insertions(+), 26 deletions(-) diff --git a/desktop-env.sh b/desktop-env.sh index b4c3054..f8fe9ef 100644 --- a/desktop-env.sh +++ b/desktop-env.sh @@ -2,7 +2,7 @@ ## DESKTOP ENVIRONMENT ## ########################### # Designed & tested on Cinnamon 6.4.8 -echo "## desktop environment" | tee todo.md -a +echo "## desktop environment" | tee -a todo.md # remap caps-lock to escape (more efficient neovim) gsettings set org.gnome.libgnomekbd.keyboard options "['grp\tgrp:win_space_toggle', 'terminate\tterminate:ctrl_alt_bksp', 'caps\tcaps:escape']" @@ -19,7 +19,7 @@ gsettings set org.cinnamon.gestures swipe-right-3 "WORKSPACE_PREVIOUS::start" # gsettings set org.cinnamon.desktop.wm.preferences mouse-button-modifier "''" # hide annoying super menu icons -echo "* hide annoying super menu icons" | tee todo.md -a +echo "* hide annoying super menu icons" | tee -a todo.md # startup programs - artha mkdir -p "$HOME/.config/autostart" diff --git a/main.sh b/main.sh index 1e48dbb..0f62e6e 100644 --- a/main.sh +++ b/main.sh @@ -15,8 +15,8 @@ INSTALL_USER=$(whoami) ## DEV/PROGRAMMING ## ## ESSENTIAL TOOLS ## ####################### -echo "## dev/programming & essential tools/programs" | tee todo.md -a -echo "* install drivers & such" | tee todo.md -a +echo "## dev/programming & essential tools/programs" | tee -a todo.md +echo "* install drivers & such" | tee -a todo.md # Install some apt packages sudo apt-get upgrade -y @@ -37,7 +37,8 @@ nvm install 24 # install a nerd font (provides special symbols for zsh/starship) sudo mkdir -p /usr/share/fonts/truetype/DejaVuSansMono/ -sudo unzip ./utils/DejaVuSansMono.zip /usr/share/fonts/truetype/DejaVuSansMono/ +sudo unzip ./utils/DejaVuSansMono.zip -d /usr/share/fonts/truetype/DejaVuSansMono/ +fc-cache -f -v # zsh (better shell) sudo apt-get install -y zsh @@ -50,7 +51,7 @@ git clone https://github.com/lukechilds/zsh-nvm.git "$HOME/.nvm-zsh" # starship (shell prompt) curl -sS https://starship.rs/install.sh | sudo sh -s -- -y -# echo 'eval "$(starship init zsh)"' | tee "$HOME/.zshrc" -a # should already be in zshrc +# echo 'eval "$(starship init zsh)"' | tee -a "$HOME/.zshrc" # should already be in zshrc mkdir -p "$HOME/.config" cp ./utils/starship.toml "$HOME/.config/starship.toml" @@ -59,10 +60,10 @@ curl -LO https://github.com/neovim/neovim/releases/latest/download/nvim-linux-x8 sudo rm -rf /opt/nvim-linux-x86_64 sudo tar -C /opt -xzf nvim-linux-x86_64.tar.gz rm nvim-linux-x86_64.tar.gz -echo 'export PATH="$PATH:/opt/nvim-linux-x86_64/bin"' | tee "$HOME/.bashrc" -a +echo 'export PATH="$PATH:/opt/nvim-linux-x86_64/bin"' | tee -a "$HOME/.bashrc" git clone https://gitea.jovan04.com/evan/neovim-config "$HOME/.config/nvim" -echo "* install pyright language server (and any other relevant ones)" | tee todo.md -a +echo "* install pyright language server (and any other relevant ones)" | tee -a todo.md # install VS Code wget "https://code.visualstudio.com/sha/download?build=stable&os=linux-deb-x64" -O "vs-code-linux-x64.deb" @@ -70,13 +71,13 @@ echo "code code/add-microsoft-repo boolean true" | sudo debconf-set-selections sudo apt-get install -y ./vs-code-linux-x64.deb rm ./vs-code-linux-x64.deb -echo "* investigate and install other IDE(s)" | tee todo.md -a +echo "* investigate and install other IDE(s)" | tee -a todo.md # Brave browser curl -fsS https://dl.brave.com/install.sh | sh # GitHub SSH keys -echo "* generate new SSH key and add to GitHub?" | tee todo.md -a +echo "* generate new SSH key and add to GitHub?" | tee -a todo.md # things I'd rather not install but have to # Discord (chat) @@ -87,32 +88,32 @@ rm ./discord-linux.deb mkdir -p "$HOME/.config/discord" echo '{ "DANGEROUS_ENABLE_DEVTOOLS_ONLY_ENABLE_IF_YOU_KNOW_WHAT_YOURE_DOING": true }' | tee "$HOME/.config/discord/settings.json" -echo "* find discord replacement" | tee todo.md -a +echo "* find discord replacement" | tee -a todo.md # Zoom (video call) -echo "* install Zoom (video call)" | tee todo.md -a +echo "* install Zoom (video call)" | tee -a todo.md ############################ ## WORKFLOW/SMALL TOOLS ## ############################ -echo "## workflow helpers, small tools, and utilities" | tee todo.md -a +echo "## workflow helpers, small tools, and utilities" | tee -a todo.md # pbcopy/pbpaste (from macOS) sudo apt-get install -y xclip printf '#!/bin/bash \nxclip -selection clipboard' | sudo tee /usr/local/bin/pbcopy -sudo chown 1000:1000 /usr/local/bin/pbcopy +sudo chown $INSTALL_USER:$INSTALL_USER /usr/local/bin/pbcopy chmod 755 /usr/local/bin/pbcopy printf '#!/bin/bash \nxclip -selection clipboard -o' | sudo tee /usr/local/bin/pbpaste -sudo chown 1000:1000 /usr/local/bin/pbpaste +sudo chown $INSTALL_USER:$INSTALL_USER /usr/local/bin/pbpaste chmod 755 /usr/local/bin/pbpaste # WordNet & def utility sudo apt-get install -y wordnet printf '#!/bin/bash \nwn $1 -over' | sudo tee /usr/local/bin/def -sudo chown 1000:1000 /usr/local/bin/def +sudo chown $INSTALL_USER:$INSTALL_USER /usr/local/bin/def chmod 755 /usr/local/bin/def # Artha (WordNet dictionary) @@ -124,13 +125,13 @@ sudo apt-get install -y qpdf # rndrmarkdown markdown renderer sudo apt-get install -y pandoc sudo cp ./utils/rndrmarkdown /usr/local/bin/rndrmarkdown -sudo chown 1000:1000 /usr/local/bin/rndrmarkdown +sudo chown $INSTALL_USER:$INSTALL_USER /usr/local/bin/rndrmarkdown sudo chmod 755 /usr/local/bin/rndrmarkdown -echo 'alias rmd="rndrmarkdown"' | tee "$HOME/.bashrc" -a +echo 'alias rmd="rndrmarkdown"' | tee -a "$HOME/.bashrc" # readline (for piping 1 line into wc) printf '#!/bin/bash \necho "$(head -n $1 $2 | tail -n 1)"' | sudo tee /usr/local/bin/rline -sudo chown 1000:1000 /usr/local/bin/rline +sudo chown $INSTALL_USER:$INSTALL_USER /usr/local/bin/rline chmod 755 /usr/local/bin/rline # Calc (command-line calculator) diff --git a/removing-stuff.sh b/removing-stuff.sh index 58dd1a6..ce22ef1 100644 --- a/removing-stuff.sh +++ b/removing-stuff.sh @@ -1,7 +1,7 @@ ###################### ## REMOVING STUFF ## ###################### -echo "## removing stuff" | tee todo.md -a +echo "## removing stuff" | tee -a todo.md rmdir $HOME/Documents/ rmdir $HOME/Music/ diff --git a/user-programs.sh b/user-programs.sh index 676a53d..d85b4ee 100644 --- a/user-programs.sh +++ b/user-programs.sh @@ -1,7 +1,7 @@ ########################## ## SPECIALTY PROGRAMS ## ########################## -echo "## special/single-use/professional programs" | tee todo.md -a +echo "## special/single-use/professional programs" | tee -a todo.md # GIMP (image manipulation) sudo apt-get install -y gimp @@ -26,13 +26,13 @@ sudo apt-get update sudo apt-get install -y freecad freecad-doc # 3D printing slicer -echo "* choose and install 3D slicer" | tee todo.md -a +echo "* choose and install 3D slicer" | tee -a todo.md # ProtonVPN -echo "* install protonVPN" | tee todo.md -a +echo "* install protonVPN" | tee -a todo.md # Minecraft -echo "* install Minecraft" | tee todo.md -a +echo "* install Minecraft" | tee -a todo.md # unsure about right now diff --git a/utils/dotzshrc b/utils/dotzshrc index d42a2af..44cea5c 100644 --- a/utils/dotzshrc +++ b/utils/dotzshrc @@ -13,14 +13,18 @@ alias egrep='egrep --color=auto' # sleep 10; alert alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"' +# colored GCC warnings and errors +export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' + export PATH="$PATH:/opt/nvim-linux-x86_64/bin" alias open="xdg-open" alias nv="nvim" alias rmd="rndrmarkdown" -# colored GCC warnings and errors -export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' +autoload -Uz compinit && compinit +zstyle ':completion:*' insert-tab false +zstyle ':completion:*' menu select export NVM_LAZY_LOAD=true source "$HOME/.nvm-zsh/zsh-nvm.plugin.zsh"