Armbian integration

.gitmodules

@@ -9,3 +9,6 @@
 [submodule "armbian"]
 	path = armbian
 	url = https://github.com/armbian/build
+[submodule "package/bhtui/third-party/TermOx"]
+	path = package/bhtui/third-party/TermOx
+	url = https://github.com/a-n-t-h-o-n-y/TermOx

README.md

@@ -1,13 +1,11 @@
 # Flipper Blackhat OS
-A WiFi security testing OS built on Linux for penetration testing and network analysis. Designed to with with the Flipper Blackhat.
+A WiFi and security testing OS built on Linux for penetration testing and network analysis. Designed to run on the [Flipper Blackhat](https://github.com/o7-machinehum/flipper-blackhat).
 
-## Documentation
-For complete functionality reference and usage examples, see [BLACKHAT_REFERENCE.md](BLACKHAT_REFERENCE.md).
+There are two possible builds in this repository...
 
-## Releases
-The best way to get your hands on all the most recent features is the [nightly build](https://github.com/o7-machinehum/flipper-blackhat-os/actions) here. Just click the most recent "Nightly" and you will find the OS artifacts at the bottom. These can then be flashed to an SD card using unix dd, or whatever Windows application you would use to flash a RPI SD card.
+## Buildroot
 
-## Build (Buildroot)
+### Building
 Make sure submodules are initialized:
 
 	git submodule update --init
@@ -24,8 +22,8 @@ And compile:
 
 	make
 
-## Build (Armbian)
+## Armbian
+
+### Building
 The armbian build is pretty simple...
     ./armbian_build.sh
-
-

armbian_config/dotfiles/alacritty.toml

@@ -0,0 +1,25 @@
+[font]
+size = 8.0
+
+[font.bold]
+family = "monospace"
+style = "Bold"
+
+[font.bold_italic]
+family = "monospace"
+style = "Bold Italic"
+
+[font.italic]
+family = "monospace"
+style = "Italic"
+
+[font.normal]
+family = "monospace"
+style = "Regular"
+
+[window]
+opacity=0.85
+
+[[keyboard.bindings]]
+key = "F1"
+action = "ToggleViMode"

armbian_config/dotfiles/i3_config

@@ -0,0 +1,193 @@
+# This file has been auto-generated by i3-config-wizard(1).
+# It will not be overwritten, so edit it as you like.
+#
+# Should you change your keyboard layout some time, delete
+# this file and re-run i3-config-wizard(1).
+#
+
+# i3 config file (v4)
+#
+# Please see https://i3wm.org/docs/userguide.html for a complete reference!
+
+set $mod Mod4
+
+# Font for window titles. Will also be used by the bar unless a different font
+# is used in the bar {} block below.
+font pango:monospace 7
+
+# This font is widely installed, provides lots of unicode glyphs, right-to-left
+# text rendering and scalability on retina/hidpi displays (thanks to pango).
+#font pango:DejaVu Sans Mono 8
+
+# Set the wallpaper
+exec_always feh --randomize --bg-fill /root/kali.png
+
+# Start XDG autostart .desktop files using dex. See also
+# https://wiki.archlinux.org/index.php/XDG_Autostart
+exec --no-startup-id dex --autostart --environment i3
+
+# The combination of xss-lock, nm-applet and pactl is a popular choice, so
+# they are included here as an example. Modify as you see fit.
+
+# xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
+# screen before suspend. Use loginctl lock-session to lock your screen.
+exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
+
+# NetworkManager is the most popular way to manage wireless networks on Linux,
+# and nm-applet is a desktop environment-independent system tray GUI for it.
+exec --no-startup-id nm-applet
+
+# Use pactl to adjust volume in PulseAudio.
+set $refresh_i3status killall -SIGUSR1 i3status
+bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status
+bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status
+bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
+bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
+
+# Use Mouse+$mod to drag floating windows to their wanted position
+floating_modifier $mod
+
+# move tiling windows via drag & drop by left-clicking into the title bar,
+# or left-clicking anywhere into the window while holding the floating modifier.
+tiling_drag modifier titlebar
+
+# start a terminal
+bindsym $mod+Return exec "alacritty"
+
+# kill focused window
+bindsym $mod+Shift+q kill
+
+# start dmenu (a program launcher)
+bindsym $mod+d exec --no-startup-id dmenu_run
+# A more modern dmenu replacement is rofi:
+# bindcode $mod+40 exec "rofi -modi drun,run -show drun"
+# There also is i3-dmenu-desktop which only displays applications shipping a
+# .desktop file. It is a wrapper around dmenu, so you need that installed.
+# bindcode $mod+40 exec --no-startup-id i3-dmenu-desktop
+
+# change focus
+bindsym $mod+j focus left
+bindsym $mod+k focus down
+bindsym $mod+l focus up
+bindsym $mod+semicolon focus right
+
+# alternatively, you can use the cursor keys:
+bindsym $mod+Left focus left
+bindsym $mod+Down focus down
+bindsym $mod+Up focus up
+bindsym $mod+Right focus right
+
+# move focused window
+bindsym $mod+Shift+j move left
+bindsym $mod+Shift+k move down
+bindsym $mod+Shift+l move up
+bindsym $mod+Shift+semicolon move right
+
+# alternatively, you can use the cursor keys:
+bindsym $mod+Shift+Left move left
+bindsym $mod+Shift+Down move down
+bindsym $mod+Shift+Up move up
+bindsym $mod+Shift+Right move right
+
+# split in horizontal orientation
+bindsym $mod+h split h
+
+# split in vertical orientation
+bindsym $mod+v split v
+
+# enter fullscreen mode for the focused container
+bindsym $mod+f fullscreen toggle
+
+# change container layout (stacked, tabbed, toggle split)
+bindsym $mod+s layout stacking
+bindsym $mod+w layout tabbed
+bindsym $mod+e layout toggle split
+
+# toggle tiling / floating
+bindsym $mod+Shift+space floating toggle
+
+# change focus between tiling / floating windows
+bindsym $mod+space focus mode_toggle
+
+# focus the parent container
+bindsym $mod+a focus parent
+
+# focus the child container
+#bindsym $mod+d focus child
+
+# Define names for default workspaces for which we configure key bindings later on.
+# We use variables to avoid repeating the names in multiple places.
+set $ws1 "1"
+set $ws2 "2"
+set $ws3 "3"
+set $ws4 "4"
+set $ws5 "5"
+set $ws6 "6"
+set $ws7 "7"
+set $ws8 "8"
+set $ws9 "9"
+set $ws10 "10"
+
+# switch to workspace
+bindsym $mod+1 workspace number $ws1
+bindsym $mod+2 workspace number $ws2
+bindsym $mod+3 workspace number $ws3
+bindsym $mod+4 workspace number $ws4
+bindsym $mod+5 workspace number $ws5
+bindsym $mod+6 workspace number $ws6
+bindsym $mod+7 workspace number $ws7
+bindsym $mod+8 workspace number $ws8
+bindsym $mod+9 workspace number $ws9
+bindsym $mod+0 workspace number $ws10
+
+# move focused container to workspace
+bindsym $mod+Shift+1 move container to workspace number $ws1
+bindsym $mod+Shift+2 move container to workspace number $ws2
+bindsym $mod+Shift+3 move container to workspace number $ws3
+bindsym $mod+Shift+4 move container to workspace number $ws4
+bindsym $mod+Shift+5 move container to workspace number $ws5
+bindsym $mod+Shift+6 move container to workspace number $ws6
+bindsym $mod+Shift+7 move container to workspace number $ws7
+bindsym $mod+Shift+8 move container to workspace number $ws8
+bindsym $mod+Shift+9 move container to workspace number $ws9
+bindsym $mod+Shift+0 move container to workspace number $ws10
+
+# reload the configuration file
+bindsym $mod+Shift+c reload
+# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
+bindsym $mod+Shift+r restart
+# exit i3 (logs you out of your X session)
+bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
+
+# resize window (you can also use the mouse for that)
+mode "resize" {
+        # These bindings trigger as soon as you enter the resize mode
+
+        # Pressing left will shrink the window’s width.
+        # Pressing right will grow the window’s width.
+        # Pressing up will shrink the window’s height.
+        # Pressing down will grow the window’s height.
+        bindsym j resize shrink width 10 px or 10 ppt
+        bindsym k resize grow height 10 px or 10 ppt
+        bindsym l resize shrink height 10 px or 10 ppt
+        bindsym semicolon resize grow width 10 px or 10 ppt
+
+        # same bindings, but for the arrow keys
+        bindsym Left resize shrink width 10 px or 10 ppt
+        bindsym Down resize grow height 10 px or 10 ppt
+        bindsym Up resize shrink height 10 px or 10 ppt
+        bindsym Right resize grow width 10 px or 10 ppt
+
+        # back to normal: Enter or Escape or $mod+r
+        bindsym Return mode "default"
+        bindsym Escape mode "default"
+        bindsym $mod+r mode "default"
+}
+
+bindsym $mod+r mode "resize"
+
+# Start i3bar to display a workspace bar (plus the system information i3status
+# finds out, if available)
+bar {
+        status_command i3status
+}

armbian_config/dotfiles/i3status_config

@@ -0,0 +1,49 @@
+# i3status configuration file.
+# see "man i3status" for documentation.
+
+# It is important that this file is edited as UTF-8.
+# The following line should contain a sharp s:
+# ß
+# If the above line is not correctly displayed, fix your editor first!
+
+general {
+        colors = true
+        interval = 5
+}
+
+# order += "ipv6"
+order += "wireless _first_"
+# order += "ethernet _first_"
+# order += "disk /"
+order += "load"
+order += "memory"
+order += "tztime local"
+
+wireless _first_ {
+#        format_up = "W: (%quality at %essid) %ip"
+        format_up = "%ip"
+        format_down = "W: down"
+}
+
+ethernet _first_ {
+        format_up = "E: %ip (%speed)"
+        format_down = "E: down"
+}
+
+disk "/" {
+        format = "%avail"
+}
+
+load {
+        format = "%1min"
+}
+
+memory {
+        format = "U: %used |F: %available"
+        # threshold_degraded = "1G"
+        # format_degraded = "MEMORY < %available"
+}
+
+tztime local {
+        format = "%Y-%m-%d %H:%M:%S"
+}

armbian_config/dotfiles/xinitrc

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+picom --backend=xrender &
+unclutter -idle 1 &
+xrandr --output DSI-1 --rotate inverted
+exec i3

armbian_config/userpatches/customize-image.sh

@@ -18,6 +18,18 @@ fi
 
 systemctl enable bh-boot
 
+# These are started manually
+systemctl disable nginx
+
+systemctl disable hostapd
+systemctl unmask hostapd
+
+systemctl unmask dnsmasq
+systemctl disable dnsmasq
+
+systemctl unmask kismet
+systemctl disable kismet
+
 # Force Realtek dongles to _not_ come up as USB MSD
 # https://linux.die.net/man/1/usb_modeswitch
 echo 'ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="0bda", ATTR{idProduct}=="1a2b", ATTR{bConfigurationValue}!="1", ATTR{bConfigurationValue}="1"' \
@@ -38,18 +50,34 @@ done
 # Also remove the "not logged in yet" flag if present
 rm -f /root/.not_logged_in_yet || true
 
-# Detect a likely serial console. For most boards this is ttyS0 or ttyAMA0; adjust if needed.
-SERIAL_TTY="ttyS0"
+echo 'FONT="Lat7-Terminus12x6.psf.gz"' >> /etc/default/console-setup
 
-mkdir -p /etc/systemd/system/serial-getty@${SERIAL_TTY}.service.d
-cat >/etc/systemd/system/serial-getty@${SERIAL_TTY}.service.d/autologin.conf <<EOF
-[Service]
-ExecStart=
-ExecStart=-/sbin/agetty --autologin root --keep-baud 115200,38400,9600 %I \$TERM
-EOF
+### Boot optimisation below
+systemctl disable armbian-ramlog.service
+systemctl disable keyboard-setup.service
 
-echo bh > /etc/hostname
-echo 'FONT="Lat7-Terminus12x6.psf.gz"' >> /etc/default/console-setup
+## Remove network manager requirement from systemd-user-sessions
+install -D -m 0644 /usr/lib/systemd/system/systemd-user-sessions.service \
+  /etc/systemd/system/systemd-user-sessions.service
+
+# Remove network.target from the After= line(s)
+sed -i 's/[[:space:]]network\.target//g' /etc/systemd/system/systemd-user-sessions.service
+sed -i 's/network\.target[[:space:]]//g' /etc/systemd/system/systemd-user-sessions.service
+
+# Alias python -> python3
+ln -sf /usr/bin/python3 /usr/bin/python
+
+# This is something that makes the terminal more fancy (remove it)
+rm /etc/profile.d/80-systemd-osc-context.sh
+
+# Use old wlanX names
+echo "extraargs=net.ifnames=0 biosdevname=0" >> /boot/armbianEnv.txt
+
+# Bjorn requirements
+pip install smbprotocol --break-system-packages
+pip install pysmb --break-system-packages
 
+cd /root/bhtui
+sudo make install
 
 echo "Customization complete."

armbian_config/userpatches/extensions/kali.sh

@@ -26,6 +26,8 @@ function pre_customize_image__install_kali_packages(){
 	display_alert "Updating package lists with Kali Linux repos" "${BOARD}:${RELEASE}-${BRANCH} :: ${EXTENSION}" "info"
 	do_with_retries 3 chroot_sdcard_apt_get_update
 
-	display_alert "Installing Top 10 Kali Linux tools" "${EXTENSION}" "info"
-	chroot_sdcard_apt_get_install kali-tools-top10
+	chroot_sdcard_apt_get_install kismet
+
+	# display_alert "Installing Top 10 Kali Linux tools" "${EXTENSION}" "info"
+	# chroot_sdcard_apt_get_install kali-tools-top10
 }

armbian_config/userpatches/overlay/etc/hostname

@@ -0,0 +1 @@
+bh