rearranges more logically, hopefully

ubuntu/dev.sh

@@ -1,62 +0,0 @@
-sudo apt install zig -y
-snap install nvim --classic
-
-sudo cp ../sesh /usr/bin
-cp ../tmux.conf ~/.tmux.conf
-
-###### Node
-curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash
-wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash
-nvm install node
-nvm install-latest-npm
-########
-
-sudo apt install golang-go -y
-sudo apt install ripgrep -y
-sudo apt install ruby -y
-sudo apt install ruby-dev -y
-
-sudo add-apt-repository ppa:lazygit-team/release -y
-sudo apt update
-
-LAZYGIT_VERSION=$(curl -s "https://api.github.com/repos/jesseduffield/lazygit/releases/latest" | grep -Po '"tag_name": "v\K[^"]*')
-curl -Lo lazygit.tar.gz "https://github.com/jesseduffield/lazygit/releases/latest/download/lazygit_${LAZYGIT_VERSION}_Linux_x86_64.tar.gz"
-tar xf lazygit.tar.gz lazygit
-sudo install lazygit /usr/local/bin
-
-sudo apt install alacritty -y
-sudo flatpak install org.wezfurlong.wezterm -y
-
-sudo apt install tmux -y
-
-sudo apt install software-properties-common
-sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys EB3E94ADBE1229CF
-sudo sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/vscode stable main" > /etc/apt/sources.list.d/vscode.list'
-sudo apt update
-sudo apt install code -y
-
-# sudo gem install solargraph
-
-##### nerd fonts
-sudo apt install wget fontconfig &&
-  wget -P ~/.local/share/fonts https://github.com/ryanoasis/nerd-fonts/releases/latest/download/Meslo.zip &&
-  cd ~/.local/share/fonts && unzip Meslo.zip && rm *Windows* && rm Meslo.zip && fc-cache -fv
-######
-
-npm install -g @railway/cli
-npm install -g vercel
-npm install -g vercel@latest
-
-cd ~/.config/
-
-git clone http://www.git.noisyserver.sbs/noisycarlos/kitty
-git config --global user.email "noisycarlos@hey.com"
-git config --global user.name "Carlos Aldana"
-
-git clone https://git.noisyserver.sbs/noisycarlos/kitty
-git clone https://git.noisyserver.sbs/noisycarlos/nvim
-git clone https://git.noisyserver.sbs/noisycarlos/wezterm
-
-rm -r lazygit
-git clone https://git.noisyserver.sbs/noisycarlos/lazygit
-git clone https://git.noisyserver.sbs/tmux-plugins/tpm ~/.tmux/plugins/tpm

ubuntu/ubuntu.sh

@@ -1,19 +1,26 @@
-# sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3FEF9748469ADBE15DA7CA80AC2D62742012EA22
+sudo apt install curl -y
+sudo apt install btop -y
+sudo apt-get install fuse libfuse2 -y
+
+# 1Password
 sudo sh -c 'echo "deb [arch=amd64] https://downloads.1password.com/linux/debian/amd64/ stable main" > /etc/apt/sources.list.d/1password.list'
+echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/1password-archive-keyring.gpg] https://downloads.1password.com/linux/debian/amd64 stable main' | sudo tee /etc/apt/sources.list.d/1password.list
+sudo mkdir -p /etc/debsig/policies/AC2D62742012EA22/
+curl -sS https://downloads.1password.com/linux/debian/debsig/1password.pol | sudo tee /etc/debsig/policies/AC2D62742012EA22/1password.pol
+sudo mkdir -p /usr/share/debsig/keyrings/AC2D62742012EA22
+curl -sS https://downloads.1password.com/linux/keys/1password.asc | sudo gpg --dearmor --output /usr/share/debsig/keyrings/AC2D62742012EA22/debsig.gpg
+
 sudo apt update
 sudo apt install 1password -y
 
-sudo apt install btop -y
-sudo apt install curl -y
-sudo apt-get install fuse libfuse2 -y
 # sudo apt install flatseal -y
-
 # sudo apt install gnome-software-plugin-flatpak -y
 # sudo apt install gnome-shell-extension-pop-shell x11-utils -y
+flatpak install flathub com.yubico.yubioath -y
+flatpak install flathub net.nokyan.Resources -y
 
 # Codecs
 sudo apt install ubuntu-restricted-extras -y
-
 # Browsers
 # flatpak install flathub com.google.Chrome -y
 # flatpak install flathub org.waterfoxproject.waterfox -y