improved minecraft, added avr, freecad, build

The build now auto-detects wireless interface and sets java for minec-
raft. It also allows for an interactive `passwd` question.

5 files changed, 13 insertions, 7 deletions

diff --git a/build.sh b/build.sh
index ab4d8ba..52dd0af 100755
--- a/build.sh
+++ b/build.sh
@@ -22,9 +22,13 @@ locale-gen
 sh mod.sh
 
 sh config.sh
+archlinux-java set java-8-openjdk
 sh source.sh
 
 grub-install --target=x86_64-efi --efi-directory=/boot --bootloader-id=GRUB
 grub-mkconfig -o /boot/grub/grub.cfg
 mkinitcpio -P
+systemctl enable wpa_supplicant@$(basename /sys/class/net/wl*)
 sed 's:#.*$::' services | xargs systemctl enable
+
+passwd
diff --git a/install.sh b/install.sh
index 526eeb7..21a1acc 100755
--- a/install.sh
+++ b/install.sh
@@ -51,7 +51,4 @@ else
 fi
 mkdir -pv /mnt/root/dotfiles
 cp -r . /mnt/root/dotfiles
-arch-chroot /mnt << EOF
-    sh /root/dotfiles/build.sh
-EOF
-echo "DONE! You should set passwords, move around ssh keys, etc."
+arch-chroot /mnt /root/dotfiles/build.sh
diff --git a/packages b/packages
index f83cdcb..57f1d5e 100644
--- a/packages
+++ b/packages
@@ -50,7 +50,7 @@ python
     tk
 texlive-bin texlive-core
 imagemagick ghostscript
-jre-openjdk # for minecraft
+jdk8-openjdk # for minecraft
 
 # System
 zsh
@@ -100,6 +100,7 @@ firefox chromium
 zathura zathura-pdf-mupdf
 utox
 gimp
+freecad
 
 # base-devel
 autoconf
@@ -133,3 +134,8 @@ steam
 # Power Management
 tlp
 powertop
+
+# Arduino
+avrdude
+avr-gcc avr-libc
+avr-binutils
diff --git a/services b/services
index 0218954..4c5e42d 100644
--- a/services
+++ b/services
@@ -2,7 +2,6 @@ org.cups.cupsd.socket
 dhcpcd
 polkit
 avahi-daemon
-wpa_supplicant@wlp3s0
 bluetooth
 tlp
 powertop
diff --git a/src/etc/udev/rules.d/99-lowbat.rules b/src/etc/udev/rules.d/99-lowbat.rules
index c5a9b76..0d90607 100644
--- a/src/etc/udev/rules.d/99-lowbat.rules
+++ b/src/etc/udev/rules.d/99-lowbat.rules
@@ -1,4 +1,4 @@
 SUBSYSTEM=="power_supply", ATTR{status}=="Discharging", ATTR{capacity}=="[0-1]", RUN+="/usr/bin/systemctl hybrid-sleep"
 
-SUBSYSTEM=="power_supply", ATTR{status}=="Discharging", ATTR{capacity}=="[0-5]", RUN+="/usr/local/bin/bat-led-set 1"
+SUBSYSTEM=="power_supply", ATTR{manufacturer}=="Celxpert", ATTR{status}=="Discharging", ATTR{capacity}=="[0-5]", RUN+="/usr/local/bin/bat-led-set 1"
 SUBSYSTEM=="power_supply", ATTR{status}=="Charging", RUN+="/usr/local/bin/bat-led-set 0"