From 92c8a63d1acf9ee2402364df26e44ad9233db89b Mon Sep 17 00:00:00 2001
From: Alex David <git@alexd.me>
Date: Wed, 11 Nov 2020 14:42:23 -0800
Subject: [PATCH] Switch from netctl to networkmanager

---
 archlinux/PKGBUILD-shared   | 2 --
 archlinux/PKGBUILD-thinkpad | 2 --
 archlinux/setup/chroot      | 9 +++++----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/archlinux/PKGBUILD-shared b/archlinux/PKGBUILD-shared
index 885def9..68c4db2 100644
--- a/archlinux/PKGBUILD-shared
+++ b/archlinux/PKGBUILD-shared
@@ -8,7 +8,6 @@ depends=(
 atool
 bind # dig
 binutils # required for makepkg
-dhcpcd
 firejail
 fish
 fzf
@@ -17,7 +16,6 @@ iputils
 jq
 lsof
 neovim
-net-tools # ifconfig
 openbsd-netcat
 openssh
 pkgfile
diff --git a/archlinux/PKGBUILD-thinkpad b/archlinux/PKGBUILD-thinkpad
index 718a8ef..250a06d 100644
--- a/archlinux/PKGBUILD-thinkpad
+++ b/archlinux/PKGBUILD-thinkpad
@@ -6,11 +6,9 @@ url="https://git.sr.ht/~alexdavid/dotfiles/"
 depends=(
 
 acpi
-dialog
 fwupd
 light
 wireless_tools # iwgetid (in i3blocks script)
-wpa_supplicant
 
 )
 
diff --git a/archlinux/setup/chroot b/archlinux/setup/chroot
index cbf655b..9458b55 100644
--- a/archlinux/setup/chroot
+++ b/archlinux/setup/chroot
@@ -17,13 +17,10 @@ function ask {
 }
 
 section "INSTALLING PACKAGES NEEDED AFTER REBOOT"
-ask WIFI "Install wifi-menu? (yes/no)"
-[ "$WIFI" == "yes" ] && pacman -S dialog wpa_supplicant
 pacman -S \
-  dhcpcd \
   fakeroot binutils \
   intel-ucode \
-  netctl \
+  networkmanager \
   sudo \
   vi \
   ;
@@ -52,3 +49,7 @@ passwd "$USERNAME"
 section "SETTING UP SIMPLE FIREWALL"
 cp /etc/iptables/simple_firewall.rules /etc/iptables/iptables.rules
 systemctl enable iptables.service
+
+section "ENABLE SERVICES"
+systemctl enable NetworkManager
+systemctl enable systemd-timesyncd
-- 
2.30.2