From e9102f006540a8984f957b974150e05794196525 Mon Sep 17 00:00:00 2001
From: Daniel Micay <daniel.micay@grapheneos.org>
Date: Sat, 16 Nov 2024 10:50:10 -0500
Subject: [PATCH] replace vim with neovim and tinyxxd

---
 home/.config/fish/config.fish       | 6 ++++--
 packages/0.grapheneos.network       | 3 ++-
 packages/0.grapheneos.org           | 3 ++-
 packages/0.ns2.grapheneos.org       | 3 ++-
 packages/0.releases.grapheneos.org  | 3 ++-
 packages/1.grapheneos.network       | 3 ++-
 packages/1.grapheneos.org           | 3 ++-
 packages/1.ns2.grapheneos.org       | 3 ++-
 packages/1.releases.grapheneos.org  | 3 ++-
 packages/2.grapheneos.network       | 3 ++-
 packages/2.grapheneos.org           | 3 ++-
 packages/2.ns2.grapheneos.org       | 3 ++-
 packages/2.releases.grapheneos.org  | 3 ++-
 packages/3.grapheneos.network       | 3 ++-
 packages/3.grapheneos.org           | 3 ++-
 packages/3.releases.grapheneos.org  | 3 ++-
 packages/4.releases.grapheneos.org  | 3 ++-
 packages/5.releases.grapheneos.org  | 3 ++-
 packages/6.releases.grapheneos.org  | 3 ++-
 packages/7.releases.grapheneos.org  | 3 ++-
 packages/attestation.app            | 3 ++-
 packages/discuss.grapheneos.org     | 3 ++-
 packages/grapheneos.social          | 3 ++-
 packages/mail.grapheneos.org        | 3 ++-
 packages/matrix.grapheneos.org      | 3 ++-
 packages/ns1.grapheneos.org         | 3 ++-
 packages/ns1.staging.grapheneos.org | 3 ++-
 packages/staging.attestation.app    | 3 ++-
 packages/staging.grapheneos.org     | 3 ++-
 29 files changed, 60 insertions(+), 30 deletions(-)

diff --git a/home/.config/fish/config.fish b/home/.config/fish/config.fish
index 01a2580..d720e77 100644
--- a/home/.config/fish/config.fish
+++ b/home/.config/fish/config.fish
@@ -2,8 +2,8 @@ set -g fish_greeting
 
 set -gx INPUTRC ~/.config/inputrc
 
-set -gx EDITOR vim
-set -gx VISUAL vim
+set -gx EDITOR nvim
+set -gx VISUAL nvim
 set -gx PAGER less
 
 set -gx LS_COLORS "rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43:ca=00:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.7z=01;31:*.ace=01;31:*.alz=01;31:*.apk=01;31:*.arc=01;31:*.arj=01;31:*.bz=01;31:*.bz2=01;31:*.cab=01;31:*.cpio=01;31:*.crate=01;31:*.deb=01;31:*.drpm=01;31:*.dwm=01;31:*.dz=01;31:*.ear=01;31:*.egg=01;31:*.esd=01;31:*.gz=01;31:*.jar=01;31:*.lha=01;31:*.lrz=01;31:*.lz=01;31:*.lz4=01;31:*.lzh=01;31:*.lzma=01;31:*.lzo=01;31:*.pyz=01;31:*.rar=01;31:*.rpm=01;31:*.rz=01;31:*.sar=01;31:*.swm=01;31:*.t7z=01;31:*.tar=01;31:*.taz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tgz=01;31:*.tlz=01;31:*.txz=01;31:*.tz=01;31:*.tzo=01;31:*.tzst=01;31:*.udeb=01;31:*.war=01;31:*.whl=01;31:*.wim=01;31:*.xz=01;31:*.z=01;31:*.zip=01;31:*.zoo=01;31:*.zst=01;31:*.avif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mjpg=01;35:*.mjpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.webp=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.m4a=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.oga=00;36:*.opus=00;36:*.spx=00;36:*.xspf=00;36:*~=00;90:*#=00;90:*.bak=00;90:*.crdownload=00;90:*.dpkg-dist=00;90:*.dpkg-new=00;90:*.dpkg-old=00;90:*.dpkg-tmp=00;90:*.old=00;90:*.orig=00;90:*.part=00;90:*.rej=00;90:*.rpmnew=00;90:*.rpmorig=00;90:*.rpmsave=00;90:*.swp=00;90:*.tmp=00;90:*.ucf-dist=00;90:*.ucf-new=00;90:*.ucf-old=00;90:"
@@ -42,4 +42,6 @@ if status is-interactive
     alias chown='chown --preserve-root'
     alias chown='chmod --preserve-root'
     alias chown='chgrp --preserve-root'
+    alias vim=nvim
+    alias vimdiff='nvim -d'
 end
diff --git a/packages/0.grapheneos.network b/packages/0.grapheneos.network
index e19bdb5..174b607 100644
--- a/packages/0.grapheneos.network
+++ b/packages/0.grapheneos.network
@@ -13,6 +13,7 @@ logrotate
 man-db
 moreutils
 mtr
+neovim
 nftables
 nginx
 nmap
@@ -25,7 +26,7 @@ rsync
 strace
 stress
 sysstat
+tinyxxd
 tree
 unbound
-vim
 xfsprogs
diff --git a/packages/0.grapheneos.org b/packages/0.grapheneos.org
index fd3fd11..b287922 100644
--- a/packages/0.grapheneos.org
+++ b/packages/0.grapheneos.org
@@ -13,6 +13,7 @@ logrotate
 man-db
 moreutils
 mtr
+neovim
 nftables
 nginx
 nginx-mod-brotli
@@ -26,7 +27,7 @@ rsync
 strace
 stress
 sysstat
+tinyxxd
 tree
 unbound
-vim
 xfsprogs
diff --git a/packages/0.ns2.grapheneos.org b/packages/0.ns2.grapheneos.org
index 9775096..181bc49 100644
--- a/packages/0.ns2.grapheneos.org
+++ b/packages/0.ns2.grapheneos.org
@@ -17,6 +17,7 @@ man-db
 mmdblookup
 moreutils
 mtr
+neovim
 nftables
 nginx
 nmap
@@ -30,8 +31,8 @@ rsync
 strace
 stress
 sysstat
+tinyxxd
 tree
 unbound
-vim
 xfsprogs
 yaml-cpp
diff --git a/packages/0.releases.grapheneos.org b/packages/0.releases.grapheneos.org
index fd3fd11..b287922 100644
--- a/packages/0.releases.grapheneos.org
+++ b/packages/0.releases.grapheneos.org
@@ -13,6 +13,7 @@ logrotate
 man-db
 moreutils
 mtr
+neovim
 nftables
 nginx
 nginx-mod-brotli
@@ -26,7 +27,7 @@ rsync
 strace
 stress
 sysstat
+tinyxxd
 tree
 unbound
-vim
 xfsprogs
diff --git a/packages/1.grapheneos.network b/packages/1.grapheneos.network
index b55e0c8..445cd8f 100644
--- a/packages/1.grapheneos.network
+++ b/packages/1.grapheneos.network
@@ -12,6 +12,7 @@ logrotate
 man-db
 moreutils
 mtr
+neovim
 nftables
 nginx
 nmap
@@ -24,7 +25,7 @@ rsync
 strace
 stress
 sysstat
+tinyxxd
 tree
 unbound
-vim
 xfsprogs
diff --git a/packages/1.grapheneos.org b/packages/1.grapheneos.org
index 515f2c1..36ca4ab 100644
--- a/packages/1.grapheneos.org
+++ b/packages/1.grapheneos.org
@@ -12,6 +12,7 @@ logrotate
 man-db
 moreutils
 mtr
+neovim
 nftables
 nginx
 nginx-mod-brotli
@@ -25,7 +26,7 @@ rsync
 strace
 stress
 sysstat
+tinyxxd
 tree
 unbound
-vim
 xfsprogs
diff --git a/packages/1.ns2.grapheneos.org b/packages/1.ns2.grapheneos.org
index a7c1519..9426659 100644
--- a/packages/1.ns2.grapheneos.org
+++ b/packages/1.ns2.grapheneos.org
@@ -16,6 +16,7 @@ man-db
 mmdblookup
 moreutils
 mtr
+neovim
 nftables
 nginx
 nmap
@@ -29,8 +30,8 @@ rsync
 strace
 stress
 sysstat
+tinyxxd
 tree
 unbound
-vim
 xfsprogs
 yaml-cpp
diff --git a/packages/1.releases.grapheneos.org b/packages/1.releases.grapheneos.org
index 515f2c1..36ca4ab 100644
--- a/packages/1.releases.grapheneos.org
+++ b/packages/1.releases.grapheneos.org
@@ -12,6 +12,7 @@ logrotate
 man-db
 moreutils
 mtr
+neovim
 nftables
 nginx
 nginx-mod-brotli
@@ -25,7 +26,7 @@ rsync
 strace
 stress
 sysstat
+tinyxxd
 tree
 unbound
-vim
 xfsprogs
diff --git a/packages/2.grapheneos.network b/packages/2.grapheneos.network
index b55e0c8..445cd8f 100644
--- a/packages/2.grapheneos.network
+++ b/packages/2.grapheneos.network
@@ -12,6 +12,7 @@ logrotate
 man-db
 moreutils
 mtr
+neovim
 nftables
 nginx
 nmap
@@ -24,7 +25,7 @@ rsync
 strace
 stress
 sysstat
+tinyxxd
 tree
 unbound
-vim
 xfsprogs
diff --git a/packages/2.grapheneos.org b/packages/2.grapheneos.org
index 515f2c1..36ca4ab 100644
--- a/packages/2.grapheneos.org
+++ b/packages/2.grapheneos.org
@@ -12,6 +12,7 @@ logrotate
 man-db
 moreutils
 mtr
+neovim
 nftables
 nginx
 nginx-mod-brotli
@@ -25,7 +26,7 @@ rsync
 strace
 stress
 sysstat
+tinyxxd
 tree
 unbound
-vim
 xfsprogs
diff --git a/packages/2.ns2.grapheneos.org b/packages/2.ns2.grapheneos.org
index a7c1519..9426659 100644
--- a/packages/2.ns2.grapheneos.org
+++ b/packages/2.ns2.grapheneos.org
@@ -16,6 +16,7 @@ man-db
 mmdblookup
 moreutils
 mtr
+neovim
 nftables
 nginx
 nmap
@@ -29,8 +30,8 @@ rsync
 strace
 stress
 sysstat
+tinyxxd
 tree
 unbound
-vim
 xfsprogs
 yaml-cpp
diff --git a/packages/2.releases.grapheneos.org b/packages/2.releases.grapheneos.org
index 515f2c1..36ca4ab 100644
--- a/packages/2.releases.grapheneos.org
+++ b/packages/2.releases.grapheneos.org
@@ -12,6 +12,7 @@ logrotate
 man-db
 moreutils
 mtr
+neovim
 nftables
 nginx
 nginx-mod-brotli
@@ -25,7 +26,7 @@ rsync
 strace
 stress
 sysstat
+tinyxxd
 tree
 unbound
-vim
 xfsprogs
diff --git a/packages/3.grapheneos.network b/packages/3.grapheneos.network
index b55e0c8..445cd8f 100644
--- a/packages/3.grapheneos.network
+++ b/packages/3.grapheneos.network
@@ -12,6 +12,7 @@ logrotate
 man-db
 moreutils
 mtr
+neovim
 nftables
 nginx
 nmap
@@ -24,7 +25,7 @@ rsync
 strace
 stress
 sysstat
+tinyxxd
 tree
 unbound
-vim
 xfsprogs
diff --git a/packages/3.grapheneos.org b/packages/3.grapheneos.org
index 515f2c1..36ca4ab 100644
--- a/packages/3.grapheneos.org
+++ b/packages/3.grapheneos.org
@@ -12,6 +12,7 @@ logrotate
 man-db
 moreutils
 mtr
+neovim
 nftables
 nginx
 nginx-mod-brotli
@@ -25,7 +26,7 @@ rsync
 strace
 stress
 sysstat
+tinyxxd
 tree
 unbound
-vim
 xfsprogs
diff --git a/packages/3.releases.grapheneos.org b/packages/3.releases.grapheneos.org
index 515f2c1..36ca4ab 100644
--- a/packages/3.releases.grapheneos.org
+++ b/packages/3.releases.grapheneos.org
@@ -12,6 +12,7 @@ logrotate
 man-db
 moreutils
 mtr
+neovim
 nftables
 nginx
 nginx-mod-brotli
@@ -25,7 +26,7 @@ rsync
 strace
 stress
 sysstat
+tinyxxd
 tree
 unbound
-vim
 xfsprogs
diff --git a/packages/4.releases.grapheneos.org b/packages/4.releases.grapheneos.org
index 515f2c1..36ca4ab 100644
--- a/packages/4.releases.grapheneos.org
+++ b/packages/4.releases.grapheneos.org
@@ -12,6 +12,7 @@ logrotate
 man-db
 moreutils
 mtr
+neovim
 nftables
 nginx
 nginx-mod-brotli
@@ -25,7 +26,7 @@ rsync
 strace
 stress
 sysstat
+tinyxxd
 tree
 unbound
-vim
 xfsprogs
diff --git a/packages/5.releases.grapheneos.org b/packages/5.releases.grapheneos.org
index 515f2c1..36ca4ab 100644
--- a/packages/5.releases.grapheneos.org
+++ b/packages/5.releases.grapheneos.org
@@ -12,6 +12,7 @@ logrotate
 man-db
 moreutils
 mtr
+neovim
 nftables
 nginx
 nginx-mod-brotli
@@ -25,7 +26,7 @@ rsync
 strace
 stress
 sysstat
+tinyxxd
 tree
 unbound
-vim
 xfsprogs
diff --git a/packages/6.releases.grapheneos.org b/packages/6.releases.grapheneos.org
index 515f2c1..36ca4ab 100644
--- a/packages/6.releases.grapheneos.org
+++ b/packages/6.releases.grapheneos.org
@@ -12,6 +12,7 @@ logrotate
 man-db
 moreutils
 mtr
+neovim
 nftables
 nginx
 nginx-mod-brotli
@@ -25,7 +26,7 @@ rsync
 strace
 stress
 sysstat
+tinyxxd
 tree
 unbound
-vim
 xfsprogs
diff --git a/packages/7.releases.grapheneos.org b/packages/7.releases.grapheneos.org
index 515f2c1..36ca4ab 100644
--- a/packages/7.releases.grapheneos.org
+++ b/packages/7.releases.grapheneos.org
@@ -12,6 +12,7 @@ logrotate
 man-db
 moreutils
 mtr
+neovim
 nftables
 nginx
 nginx-mod-brotli
@@ -25,7 +26,7 @@ rsync
 strace
 stress
 sysstat
+tinyxxd
 tree
 unbound
-vim
 xfsprogs
diff --git a/packages/attestation.app b/packages/attestation.app
index e6a3cf0..1e01382 100644
--- a/packages/attestation.app
+++ b/packages/attestation.app
@@ -15,6 +15,7 @@ logrotate
 man-db
 moreutils
 mtr
+neovim
 nftables
 nginx
 nginx-mod-brotli
@@ -32,7 +33,7 @@ sqlite-analyzer
 strace
 stress
 sysstat
+tinyxxd
 tree
 unbound
-vim
 xfsprogs
diff --git a/packages/discuss.grapheneos.org b/packages/discuss.grapheneos.org
index f76be1a..8db0a86 100644
--- a/packages/discuss.grapheneos.org
+++ b/packages/discuss.grapheneos.org
@@ -19,6 +19,7 @@ mariadb
 mmdblookup
 moreutils
 mtr
+neovim
 nftables
 nginx
 nginx-mod-brotli
@@ -42,9 +43,9 @@ rsync
 strace
 stress
 sysstat
+tinyxxd
 tree
 unbound
 valkey
-vim
 xfsprogs
 zopfli
diff --git a/packages/grapheneos.social b/packages/grapheneos.social
index 6d92685..ceb6671 100644
--- a/packages/grapheneos.social
+++ b/packages/grapheneos.social
@@ -16,6 +16,7 @@ man-db
 mastodon
 moreutils
 mtr
+neovim
 nftables
 nginx
 nginx-mod-brotli
@@ -35,7 +36,7 @@ strace
 stress
 sudo
 sysstat
+tinyxxd
 tree
 unbound
-vim
 xfsprogs
diff --git a/packages/mail.grapheneos.org b/packages/mail.grapheneos.org
index a52a0a1..750cdc4 100644
--- a/packages/mail.grapheneos.org
+++ b/packages/mail.grapheneos.org
@@ -16,6 +16,7 @@ man-db
 moreutils
 mtr
 mutt
+neovim
 nftables
 nginx
 nmap
@@ -39,7 +40,7 @@ s-nail
 strace
 stress
 sysstat
+tinyxxd
 tree
 unbound
-vim
 xfsprogs
diff --git a/packages/matrix.grapheneos.org b/packages/matrix.grapheneos.org
index e96c2b8..c21dc50 100644
--- a/packages/matrix.grapheneos.org
+++ b/packages/matrix.grapheneos.org
@@ -19,6 +19,7 @@ matrix-synapse
 matterbridge-git
 moreutils
 mtr
+neovim
 nftables
 nginx
 nginx-mod-brotli
@@ -41,8 +42,8 @@ rsync
 strace
 stress
 sysstat
+tinyxxd
 tree
 unbound
-vim
 xfsprogs
 yarn
diff --git a/packages/ns1.grapheneos.org b/packages/ns1.grapheneos.org
index 9775096..181bc49 100644
--- a/packages/ns1.grapheneos.org
+++ b/packages/ns1.grapheneos.org
@@ -17,6 +17,7 @@ man-db
 mmdblookup
 moreutils
 mtr
+neovim
 nftables
 nginx
 nmap
@@ -30,8 +31,8 @@ rsync
 strace
 stress
 sysstat
+tinyxxd
 tree
 unbound
-vim
 xfsprogs
 yaml-cpp
diff --git a/packages/ns1.staging.grapheneos.org b/packages/ns1.staging.grapheneos.org
index 9775096..181bc49 100644
--- a/packages/ns1.staging.grapheneos.org
+++ b/packages/ns1.staging.grapheneos.org
@@ -17,6 +17,7 @@ man-db
 mmdblookup
 moreutils
 mtr
+neovim
 nftables
 nginx
 nmap
@@ -30,8 +31,8 @@ rsync
 strace
 stress
 sysstat
+tinyxxd
 tree
 unbound
-vim
 xfsprogs
 yaml-cpp
diff --git a/packages/staging.attestation.app b/packages/staging.attestation.app
index e6a3cf0..1e01382 100644
--- a/packages/staging.attestation.app
+++ b/packages/staging.attestation.app
@@ -15,6 +15,7 @@ logrotate
 man-db
 moreutils
 mtr
+neovim
 nftables
 nginx
 nginx-mod-brotli
@@ -32,7 +33,7 @@ sqlite-analyzer
 strace
 stress
 sysstat
+tinyxxd
 tree
 unbound
-vim
 xfsprogs
diff --git a/packages/staging.grapheneos.org b/packages/staging.grapheneos.org
index fd3fd11..b287922 100644
--- a/packages/staging.grapheneos.org
+++ b/packages/staging.grapheneos.org
@@ -13,6 +13,7 @@ logrotate
 man-db
 moreutils
 mtr
+neovim
 nftables
 nginx
 nginx-mod-brotli
@@ -26,7 +27,7 @@ rsync
 strace
 stress
 sysstat
+tinyxxd
 tree
 unbound
-vim
 xfsprogs