From f8f8e2de1cea8a5b4939de8598fdf1b7a99a376f Mon Sep 17 00:00:00 2001
From: Phantop <phantop@tuta.io>
Date: Wed, 25 Nov 2020 14:15:58 -0500
Subject: [PATCH] Setup: add a ton of missing stuff

---
 .local/bin/72 |  3 ++-
 .setup        | 33 +++++++++++++++++++++++++--------
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/.local/bin/72 b/.local/bin/72
index 0d79c27..28d2981 100755
--- a/.local/bin/72
+++ b/.local/bin/72
@@ -1,4 +1,5 @@
 #!/bin/sh
-xrandr --newmode $(cvt 1920 1080 72 | tail -n1 | cut -d' ' -f2- | tr ' ' \n | awk '$1=$1')
+xrandr --newmode $(cvt 1920 1080 72 | tail -n1 | cut -d' ' -f2-)
 xrandr --addmode $(xrandr --listactivemonitors | tail -n1 | cut -d' ' -f5- | awk '$1=$1') $(cvt 1920 1080 72 | tail -n1 | cut -d' ' -f2)
 xrandr --output $(xrandr --listactivemonitors | tail -n1 | cut -d' ' -f5- | awk '$1=$1') --mode $(cvt 1920 1080 72 | tail -n1 | cut -d' ' -f2)
+xrandr --output $(xrandr --listactivemonitors | tail -n1 | cut -d' ' -f5- | awk '$1=$1') --mode "1920x1080"
diff --git a/.setup b/.setup
index 97e4760..51919de 100755
--- a/.setup
+++ b/.setup
@@ -1,14 +1,19 @@
 #!/bin/sh
 sudo eopkg up
-sudo eopkg it -c system.devel
-sudo eopkg rm celluloid gnome-mpv gnome-terminal hexchat libreoffice-common mate-terminal nautilus onboard rhythmbox
 
-desktop="bleachbit caja devilspie2 engrampa goverlay keepassx kitty libstrangle mpv qutebrowser rofi"
-dev="git-extras jq neovim pip solbuild-config-local-unstable tor"
-multimedia="audacity feh gmic-gimp libva-utils mpv quodlibet spek viewnior zathura-poppler"
-terminal="advancecomp aria2 autojump busybox fd fish innoextract most ncdu p7zip ripgrep speedtest-cli stow tmux"
-sudo eopkg it $desktop $terminal
+gnome="celluloid eog file-roller gnome-calendar gnome-photos gnome-mpv gnome-terminal nautilus onboard rhythmbox"
+sudo eopkg rm $gnome firefox hexchat libreoffice-common mate-terminal thunderbird
+
+desktop="bleachbit caja engrampa goverlay keepassx kitty libstrangle qutebrowser rofi"
+dev="docker-compose git-extras jq neovim openssh-server pip solbuild tig tor"
+multimedia="audacious audacious-plugins audacity feh gmic-gimp mpv opus-tools quodlibet spek viewnior zathura-poppler"
+terminal="advancecomp aria2 autojump busybox fd fish innoextract most ncdu playerctl p7zip ripgrep tmux"
+ricing="adapta-gtk-theme devilspie2 font-ubuntu-ttf stow"
+
+sudo eopkg it -c system.devel
+sudo eopkg it $desktop $dev $multimedia $terminal $ricing
 sudo pip3 install --upgrade qutebrowser breadability
+sudo eopkg it wine-32bit; sudo eopkg rm wine
 
 rm ~/.bashrc
 cd ~/.dotfiles
@@ -28,13 +33,25 @@ curl -fsSL https://starship.rs/install.sh | sudo bash -s -- -b /usr/bin -y
 chsh -s /usr/bin/fish
 
 sh -c "$(curl -sL https://nextdns.io/install)"
+sudo nextdns install
+sudo nextdns start
 
 tracker=tracker-store tracker-mine-fs tracker-miner-rss tracker-extra tracker-miner-apps tracker-writeback
 systemctl --user mask $tracker
 sudo systemctl mask $tracker
 tracker reset --hard
-sudo systemctl enable tor
+sudo systemctl enable --now docker tor
+sudo usermod -aG docker $USER
 
 git clone https://github.com/Phantop/solus-stuff ~/.solus
 git clone https://github.com/iv-org/invidious ~/.invidious
 git clone https://github.com/Phantop/phantop.github.io ~/.site
+git clone https://github.com/Phantop/haiku-icons ~/.local/share/icons/haiku-icons
+
+cd ~/.solus
+sudo ./build dolphin-emu-git earlyoom hid-nintendo mpv-mpris joycond waifu2x
+
+cd ~/.invidious
+fish -c invidious
+
+fish -c "clean;re"