feat: Adds firewalld to system run and setup script.

env/.local/scripts/kanatactl

@@ -28,151 +28,30 @@ FLAGS:
   -h | --help:    Show this help page.
 
 COMMANDS:
-  bootstrap:      Bootstrap a new machine, performs installation, enables, and starts kanata systemd service.
   config:         Commands for the kanata keyboard configuration file(s).
   service:        Commands for the kanata systemd service.
-  install:        Build and install kanata, prompts you to choose the version to install.
+  pkg:            Commands for the kanata package.
+  bootstrap:      Bootstrap a new machine, performs installation, enables, and starts kanata systemd service.
   logs:           View the log file.
-  update:         Pull from git and check for updates.
 
 Run "$THIS <command> --help" for more information about a command.
 
 EOF
 }
 
-kanata_dir="$XDG_DATA_HOME/kanata"
-kanata_url="https://github.com/jtroo/kanata.git"
-kanata_current_version=""
-
 # Logging utility function, use in place of echo.
 log() {
   logging log --source "$THIS_FILE" "$@"
 }
 
-# Get the version of currently installed katana execuatable, if available.
-get_current_version() {
-  if [[ $(command -v /usr/bin/kanata) ]]; then
-    kanata_current_version=$(/usr/bin/kanata --version)
-    # Remove 'kanata ' from output of the version command.
-    kanata_current_version="${kanata_current_version#kanata *}"
-  fi
-}
-
-# Get's kanat versions by git tag and filter's out versions that are less than our
-# current version number.
-get_versions() {
-  get_current_version
-  local rows=()
-  local tag=""
-  local has_seen_current="0"
-  for tag in $(git tag --list 'v*' | sort --version-sort); do
-    if [[ $has_seen_current == "1" ]] || [[ -z $kanata_current_version ]]; then
-      rows+=("$tag\n")
-    elif [[ $tag =~ $kanata_current_version ]]; then
-      has_seen_current="1"
-    fi
-  done
-  echo "$(echo -e "${rows[@]}" | sort --version-sort --reverse | tr -d ' ')"
-}
-
-# Present an fzf menu to choose a version to install / update to.
-prompt_for_version_to_install() {
-  local rows=$(get_versions)
-  if [[ -z $rows ]]; then
-    log --error "No versions to select." && exit 1
-  else
-    echo $(printf '%s\n' "${rows[@]}" | fzf --header='Which version would you like to install?')
-  fi
-}
-
-# Compares the selected version to the installed version.
-compare_versions() {
-  # An example selection at this point: 'v1.9.0'
-  local selection=""
-  read -r selection
-
-  if [[ $(command -v /usr/bin/kanata) ]] && [[ -n $selection ]]; then
-
-    [[ -z $kanata_current_version ]] && get_current_version
-    local selected_version=${selection#v*} # remove the 'v' from selected version.
-
-    log "Comparing selected: '$selected_version' to installed '$kanata_current_version'"
-    if [[ $selected_version == $kanata_current_version ]]; then
-      log --warn "Selected version matches the currently installed version." && exit 1
-    fi
-  fi
-  echo "$selection"
-}
-
-# Check's out the selected version tag and builds the kanata executable.
-build_selection() {
-  # An example selection at this point: 'v1.9.0'
-  local selection=""
-  read -r selection
-
-  if [[ -z $selection ]]; then
-    log --error "Selection is empty." && exit 1
-  # Handle logged messages instead of an actual selection.
-  elif [[ $selection =~ "[WARN]" ]] || [[ $selection =~ "[ERROR]" ]]; then
-    echo $selection && exit 1
-  fi
-
-  if [[ $selection =~ ^v ]]; then
-    log "Building kanata..."
-    # checkout the selected version tag and build.
-    git checkout $selection
-    cargo build --release --features cmd
-    echo "done"
-  fi
-}
-
-# Copies the most recently built kanata executable to the '/usr/bin' directory.
-#
-copy_to_usr_bin() {
-
-  # This is the end of the install / update pipe, so it loops over output of
-  # the other commands in the pipe printing it to the console, while waiting on the
-  # build to be done.
-  while read line; do
-    if [[ $line == "done" ]]; then
-      log "Copying to '/usr/bin/kanata'" && echo "Copying to '/usr/bin/kanata'"
-      sudo cp target/release/kanata /usr/bin
-      echo "Done!"
-    else
-      echo "$line"
-    fi
-  done
-}
-
-# Handles both install or update commands, as they do the same thing, just need to pass in the
-# "Updating" argument when updating, so log messages are clear.
-install_or_update() {
-  local mode=${1:-"Installing"}
-
-  log "$mode kanata..."
-  local should_pull="1"
-
-  if [[ ! -d $kanata_dir ]]; then
-    log "Cloning repo."
-    should_pull="0"
-    git clone $kanata_url $kanata_dir
-  fi
-
-  pushd $kanata_dir &>/dev/null
-  (
-    [[ $should_pull == "1" ]] && git pull origin main >/dev/null 2>&1
-    prompt_for_version_to_install | compare_versions | build_selection | copy_to_usr_bin
-  )
-  popd &>/dev/null
-}
-
 # Bootstrap a new machine, by building and installing the kanata executable,
 # installing the systemd service files, and enable / start the service.
 bootstrap() {
   log "Bootstrapping new system..."
-  install_or_update
+  $THIS_FILE pkg install
-  install_service
+  $THIS_FILE service install
-  enable_and_start_service
+  $THIS_FILE service enable
+  $THIS_FILE service start
 }
 
 ################################################################################
@@ -196,8 +75,10 @@ while [[ $# -gt 0 ]]; do
     shift
     THIS="$THIS service" $SCRIPTS/utils/kanatactl/service "$@"
     exit $?
-  elif [[ $1 == "install" ]]; then
+  elif [[ $1 == "pkg" ]]; then
-    install_or_update && exit $?
+    shift
+    THIS="$THIS pkg" $SCRIPTS/utils/kanatactl/pkg "$@"
+    exit $?
   elif [[ $1 == "logs" ]]; then
     bat ${LOG_DIR:-/tmp/logs}/$LOG_FILE && exit 0
   elif [[ $1 == "update" ]]; then

env/.local/scripts/utils/kanatactl/pkg

@@ -143,10 +143,9 @@ title() {
   fi
 }
 
-# Handles both install or update commands, as they do the same thing, just need to pass in the
+# Handles both install or update commands, as they do the same thing.
-# "Updating" argument when updating, so log messages are clear.
 install_or_update() {
-  local mode=${1:-"Installing"}
+  local mode=$(title)
 
   log "$mode kanata..."
   local should_pull="1"
@@ -178,11 +177,13 @@ while [[ $# -gt 0 ]]; do
     usage && exit 0
   elif [[ $1 == "install" ]]; then
     shift
-    install_or_update "Installing" "$@"
+    install_mode="1"
+    install_or_update "$@"
     exit $?
   elif [[ $1 == "update" ]]; then
     shift
-    install_or_update "Updating" "$@"
+    update_mode="1"
+    install_or_update "$@"
     exit $?
   fi
 done

runs/system

@@ -7,4 +7,6 @@ yay ${1:-"-S --noconfirm"} catppuccin-gtk-theme-mocha \
   pam-u2f \
   pcsc-tools \
   swaync \
-  yubikey-manger
+  yubikey-manger \
+  nfs-utils \
+  firewalld

system

@@ -38,3 +38,4 @@ log_and_run "sudo setcap "cap_dac_override+p" $(which espanso)"
 log_and_run "systemctl --user enable --now logout-task.service"
 log_and_run "systemctl --user enable --now battery-monitor.timer"
 log_and_run "sudo systemctl enable --now pcscd.service"
+log_and_run "sudo systemctl enable --now firewalld.service"