From cf153415cd860e535a7121fd0f3c27ce28ba6475 Mon Sep 17 00:00:00 2001
From: mitchell <m@mjfs.us>
Date: Sun, 17 Jan 2021 23:55:22 -0500
Subject: [PATCH] Update install_arch and provision_linux

---
 install_arch    | 14 +++++++++-----
 provision_linux | 17 +++++++++++++++--
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/install_arch b/install_arch
index 0655071..cbc7192 100755
--- a/install_arch
+++ b/install_arch
@@ -82,13 +82,16 @@ function configure_wired_network -a interface
 Name=$interface
 
 [Network]
-DHCP=yes" >/etc/systemd/network/20-wired.network
-
-    ln -sf /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf
+DHCP=yes
+IPv6PrivacyExtensions=yes" >/etc/systemd/network/20-wired.network
 
     log 'Enabling systemd networkd and resolved services'
     systemctl enable systemd-networkd.service
     systemctl enable systemd-resolved.service
+    systemctl start systemd-networkd.service
+    systemctl start systemd-resolved.service
+
+    ln -sf /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf
 end
 
 
@@ -111,8 +114,9 @@ function configure_sudo
     log 'Adding and configuring sudo group'
     install sudo
     groupadd sudo
-    set -lx EDITOR sed -i 's/#\s%sudo/%sudo/'
-    visudo
+
+    echo "# Enable sudo group
+%sudo ALL=(ALL) ALL" | sudo tee /etc/sudoers.d/sudo_group
 end
 
 function create_admin_user -a username
diff --git a/provision_linux b/provision_linux
index 8127fa2..52d5e9e 100755
--- a/provision_linux
+++ b/provision_linux
@@ -36,6 +36,19 @@ function provision_terminal_env -d 'Install base terminal utilities and sync con
         rm -rf $tmp_dir
     end
 
+    if test $distro = debian
+        log 'Adding fish apt repo'
+
+        install_pkgs gpg
+
+        echo 'deb http://download.opensuse.org/repositories/shells:/fish:/release:/3/Debian_10/ /' |
+        sudo tee /etc/apt/sources.list.d/shells:fish:release:3.list
+
+        curl -fsSL https://download.opensuse.org/repositories/shells:fish:release:3/Debian_10/Release.key |
+        gpg --dearmor |
+        sudo tee /etc/apt/trusted.gpg.d/shells_fish_release_3.gpg >/dev/null
+    end
+
     set -l base_pkgs \
         fish \
         git \
@@ -45,12 +58,12 @@ function provision_terminal_env -d 'Install base terminal utilities and sync con
         curl \
         kitty-terminfo \
         fzf \
-        bat
 
     set -l arch_pkgs \
         $base_pkgs \
         python-neovim \
-        the_silver_searcher
+        the_silver_searcher \
+        bat
 
     set -l debian_pkgs \
         $base_pkgs \