From cdeb94a9e413f39ea2dc9bfe127a158ae5b90706 Mon Sep 17 00:00:00 2001
From: Andrew Coleman <penguincoder@gmail.com>
Date: Thu, 30 Jun 2022 09:48:17 -0400
Subject: [PATCH] add ubuntu/popos instructions

---
 README.md | 61 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 33 insertions(+), 28 deletions(-)

diff --git a/README.md b/README.md
index e087fd6..552e99c 100644
--- a/README.md
+++ b/README.md
@@ -116,7 +116,6 @@ systemctl enable --now --user ssh-agent.service
 
 ```bash
 sudo apt install -y \
-  bat \
   build-essential \
   curl \
   cmake \
@@ -133,13 +132,13 @@ sudo apt install -y \
   jq \
   just \
   kitty-terminfo \
+  libmhash2 \
+  libssl-dev \
   libvirt-daemon \
   lzop \
   most \
-  mhash \
   mosh \
   mtr \
-  neovim \
   nmon \
   openssh-server \
   pgcli \
@@ -156,6 +155,37 @@ sudo apt install -y \
   zfs-dkms \
   zfsutils-linux
 systemctl enable --now sshd.service
+systemctl enable zfs.target
+systemctl enable zfs-import-cache
+systemctl enable zfs-mount
+systemctl enable zfs-import.target
+curl -Lo /tmp/nvim-linux64.deb https://github.com/neovim/neovim/releases/download/v0.7.2/nvim-linux64.deb && doas apt install -y /tmp/nvim-linux64.deb && rm -f /tmp/nvim-linux64.deb
+go install github.com/schollz/croc/v9@latest
+cargo install \
+  atuin \
+  bat \
+  bottom \
+  broot \
+  choose \
+  difftastic \
+  du-dust \
+  exa \
+  fd-find \
+  flamegraph \
+  git-delta \
+  gitui \
+  grex \
+  hexyl \
+  htmlq \
+  sd \
+  starship \
+  tealdeer \
+  tokei \
+  watchexec-cli \
+  upterm \
+  xh \
+  xsv
+curl -LO https://github.com/owenthereal/upterm/releases/download/v0.9.0/upterm_linux_amd64.tar.gz
 ```
 
 # Bitwarden
@@ -212,31 +242,6 @@ cargo install \
   xcp
 cargo +nightly install --git https://github.com/martinvonz/jj.git
 cargo +nightly install --git https://github.com/getzola/zola.git
-# ubuntu
-cargo install \
-  atuin \
-  bottom \
-  broot \
-  cargo-flamegraph \
-  choose \
-  croc \
-  difftastic \
-  du-dust \
-  exa
-  fd-find \
-  git-delta \
-  gitui \
-  grex \
-  hexyl \
-  htmlq \
-  sd \
-  starship \
-  tealdeer \
-  tokei \
-  watchexec \
-  upterm \
-  xh \
-  xsv
 ```
 # Chezmoi