From 2aa623d7c215a8e91dc261b3b177aa3850c4f3e5 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Mon, 4 Mar 2024 12:47:20 +0100
Subject: [PATCH 01/16] fix(just): correctly say devmode is disabled

---
 just/custom.just | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/just/custom.just b/just/custom.just
index f3f63f3d4a7..50c45a044e0 100644
--- a/just/custom.just
+++ b/just/custom.just
@@ -156,14 +156,14 @@ jetbrains-toolbox:
 # Install and configure Incus
 incus:
     #!/usr/bin/env bash
+    source /usr/lib/ujust/ujust.sh
     CURRENT_IMAGE=$(rpm-ostree status -b --json | jq -r '.deployments[0]."container-image-reference"')
-
     if grep -q "bluefin-dx" <<< $CURRENT_IMAGE
     then
         echo 'Installing and configuring Incus.'
         /usr/bin/bluefin-incus
     else
-        echo "Developer mode is currently ${CURRENT_STATE}."
+        echo "Developer mode is currently ${b}${red}Disabled${n}."
         echo "Run `just devmode` to turn on Developer mode."
         exit
     fi

From 3155709187ed7e52e654c4382a95619cb26f6b35 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Mon, 4 Mar 2024 12:48:12 +0100
Subject: [PATCH 02/16] fix(just): do not attempt to run "just devmode" when
 echoing

---
 just/custom.just | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/just/custom.just b/just/custom.just
index 50c45a044e0..ec56eab70ba 100644
--- a/just/custom.just
+++ b/just/custom.just
@@ -164,7 +164,7 @@ incus:
         /usr/bin/bluefin-incus
     else
         echo "Developer mode is currently ${b}${red}Disabled${n}."
-        echo "Run `just devmode` to turn on Developer mode."
+        echo "Run \"just devmode\" to turn on Developer mode."
         exit
     fi
 

From feb12ab26ed062db869293c5982dce0eb1fd9d42 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sat, 9 Mar 2024 08:39:41 +0100
Subject: [PATCH 03/16] feat(just): merge shell recipes into 1 recipe

---
 just/custom.just | 37 ++++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/just/custom.just b/just/custom.just
index ec56eab70ba..0528785a770 100644
--- a/just/custom.just
+++ b/just/custom.just
@@ -100,10 +100,34 @@ devmode:
         fi
     fi
 
-# Switch to the fish shell
-fish:
-    sudo usermod $USER --shell /usr/bin/fish 
-    printf "${USER}'s shell is now %s." "$(cat /etc/passwd | grep ":$UID:" | cut '-d:' '-f7')"
+alias shell := configure-shell
+
+# Switch to a different shell
+configure-shell ACTION="":
+    #!/bin/bash
+    source /usr/lib/ujust/ujust.sh
+    CURRENT_SHELL="$(cat /etc/passwd | grep ":$UID:" | cut '-d:' '-f7')"
+    OPTION={{ ACTION }}
+    if [ "$OPTION" == "help" ]; then
+      echo "Usage: ujust shell <option>"
+      echo "  <option>: Specify the quick option to skip the prompt"
+      echo "  Use 'fish' to select fish"
+      echo "  Use 'zsh' to select zsh"
+      echo "  Use 'bash' to select bash"
+      exit 0
+    elif [ "$OPTION" == "" ]; then
+      echo "${bold}Shell configuration${normal}"
+      echo "${USER}'s shell is currently ${CURRENT_SHELL}"
+      OPTION=$(Choose "fish" "zsh" "bash")
+    fi
+    if [[ "$OPTION" =~ zsh|fish ]]; then
+      sudo usermod $USER --shell /usr/bin/$OPTION 
+      printf "${USER}'s shell is now %s.\n" "$(cat /etc/passwd | grep ":$UID:" | cut '-d:' '-f7')"
+    elif [ "$OPTION" == "bash" ]; then
+      sudo usermod $USER --shell /bin/$OPTION 
+      printf "${USER}'s shell is now %s.\n" "$(cat /etc/passwd | grep ":$UID:" | cut '-d:' '-f7')"
+    fi
+
 
 # Install recommended GNOME extensions
 gnome-extensions:
@@ -210,11 +234,6 @@ touch:
 yafti:
     yafti /etc/yafti.yml --force
 
-# Switch to the zsh shell
-zsh:
-    sudo usermod $USER --shell /usr/bin/zsh 
-    printf "${USER}'s shell is now %s." "$(cat /etc/passwd | grep ":$UID:" | cut '-d:' '-f7')"
-
 # Configure docker,incus-admin,lxd,libvirt container manager permissions
 dx-group:
     sudo usermod -aG docker $USER

From cc8051311934f28f932536458966c9d5ae7f332e Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sat, 9 Mar 2024 08:46:02 +0100
Subject: [PATCH 04/16] feat(just): add standardization guide to header

---
 just/custom.just | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/just/custom.just b/just/custom.just
index 0528785a770..7b6867f8e0d 100644
--- a/just/custom.just
+++ b/just/custom.just
@@ -1,4 +1,11 @@
 # vim: set ft=make :
+## Standardized verbs
+# configure- = configure something that is pre-installed on the image
+# install-   = install something, no uninstall or configuration provided
+# setup-     = install something and also provide configuration and/or uninstallation options
+# toggle-    = turn something on/off, logic can be automatic or manual selection
+# fix-       = apply fix/patch/workaround for something
+# foo        = no verb is used for shortcuts or something deemed important enough to use a super memorable name
 
 # Run a one minute system benchmark
 benchmark:

From abb03c79a0e20dff814e3cc1c0b5cc6de4d5f96b Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sat, 9 Mar 2024 08:47:05 +0100
Subject: [PATCH 05/16] chore(just): remove empty lines in recipes to fix
 justfile highlighter

---
 just/custom.just | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/just/custom.just b/just/custom.just
index 7b6867f8e0d..d09ddc0e94a 100644
--- a/just/custom.just
+++ b/just/custom.just
@@ -65,7 +65,6 @@ cockpit:
 devmode:
     #!/usr/bin/env bash
     CURRENT_IMAGE=$(rpm-ostree status -b --json | jq -r '.deployments[0]."container-image-reference"')
-
     if grep -q "/var/ublue-os/image" <<< $CURRENT_IMAGE
     then
         echo ""
@@ -74,14 +73,12 @@ devmode:
         echo "and reboot your system when the update is finished."
         exit
     fi
-
     if grep -q "bluefin-dx" <<< $CURRENT_IMAGE
     then
         CURRENT_STATE="enabled"
     else
         CURRENT_STATE="disabled"
     fi
-
     echo "Developer mode is currently ${CURRENT_STATE}"
     echo "Enable or Disable developer mode"
     OPTION=$(gum choose Enable Disable)

From a82ec25a3d374b9d799a2f5ed09e0e103b4fb6d5 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sat, 9 Mar 2024 09:25:05 +0100
Subject: [PATCH 06/16] chore(just): move applications into their own file

---
 just/bluefin-apps.just | 54 ++++++++++++++++++++++++++++++++++++++++++
 just/custom.just       | 40 -------------------------------
 2 files changed, 54 insertions(+), 40 deletions(-)
 create mode 100644 just/bluefin-apps.just

diff --git a/just/bluefin-apps.just b/just/bluefin-apps.just
new file mode 100644
index 00000000000..a566215c7e0
--- /dev/null
+++ b/just/bluefin-apps.just
@@ -0,0 +1,54 @@
+# vim: set ft=make :
+## Standardized verbs
+# configure- = configure something that is pre-installed on the image
+# install-   = install something, no uninstall or configuration provided
+# setup-     = install something and also provide configuration and/or uninstallation options
+# toggle-    = turn something on/off, logic can be automatic or manual selection
+# fix-       = apply fix/patch/workaround for something
+# foo        = no verb is used for shortcuts or something deemed important enough to use a super memorable name
+
+alias brew := install-brew
+
+# Install Homebrew | https://brew.sh
+install-brew:
+    #!/usr/bin/env bash
+    source /usr/lib/ujust/ujust.sh
+    if [[ ! -f "/var/home/linuxbrew/.linuxbrew/bin" || ! -x "/var/home/linuxbrew/.linuxbrew/bin/brew" ]]; then
+        echo "${b}Brew Installation${n}"
+        echo "Please ${b}IGNORE${n} everything the installer tells you to do at the end"
+        echo "We have already done it for you! You just need to close and re-open the terminal after installation"
+        echo "Do you understand?"
+        echo "Please type in \"YES I UNDERSTAND\" and press enter"
+        read ACCEPT
+        if [ "$ACCEPT" == "YES I UNDERSTAND" ]; then
+          /usr/bin/bash -c '/usr/libexec/brew-install'
+        else
+          echo "Capitalization matters when you type \"YES I UNDERSTAND\""
+        fi
+    fi
+    # if /etc/profile.d/brew.sh already exists, replace it with /usr/etc/profile.d/brew.sh
+    if [ -f /etc/profile.d/brew.sh ]; then
+        if [ -f /usr/etc/profile.d/brew.sh ]; then
+            sudo cp /usr/etc/profile.d/brew.sh /etc/profile.d/brew.sh
+        fi
+    fi
+
+alias brew-fleek := install-brew-fleek
+
+# Install "fleek" set of packages for brew | none, low, default, high
+install-brew-fleek level="high":
+    #!/usr/bin/env bash
+    curl --proto '=https' --tlsv1.2 -sSf -L https://brew.getfleek.dev/s/fleek | bash -s -- {{ level }}
+
+alias cockpit := setup-cockpit
+
+# Enable Cockpit for web-based system management | https://cockpit-project.org/
+setup-cockpit:
+    echo 'Enabling Cockpit'
+    echo 'PasswordAuthentication yes' | sudo tee /etc/ssh/sshd_config.d/02-enable-passwords.conf
+    sudo systemctl try-restart sshd
+    sudo systemctl enable --now sshd
+    sudo podman container runlabel --name cockpit-ws RUN quay.io/cockpit/ws
+    sudo podman container runlabel INSTALL quay.io/cockpit/ws
+    sudo systemctl enable cockpit.service
+    echo 'Open Cockpit -> http://localhost:9090'
diff --git a/just/custom.just b/just/custom.just
index d09ddc0e94a..c8fd3616b5e 100644
--- a/just/custom.just
+++ b/just/custom.just
@@ -16,51 +16,11 @@ benchmark:
 bluefin-cli:
     @/usr/libexec/enable-bluefin-cli.sh
 
-# Install Homebrew | https://brew.sh
-brew:
-    #!/usr/bin/env bash
-    source /usr/lib/ujust/ujust.sh
-    if [[ ! -f "/var/home/linuxbrew/.linuxbrew/bin" || ! -x "/var/home/linuxbrew/.linuxbrew/bin/brew" ]]; then
-        echo "${b}Brew Installation${n}"
-        echo "Please ${b}IGNORE${n} everything the installer tells you to do at the end"
-        echo "We have already done it for you! You just need to close and re-open the terminal after installation"
-        echo "Do you understand?"
-        echo "Please type in \"YES I UNDERSTAND\" and press enter"
-        read ACCEPT
-        if [ "$ACCEPT" == "YES I UNDERSTAND" ]; then
-          /usr/bin/bash -c '/usr/libexec/brew-install'
-        else
-          echo "Capitalization matters when you type \"YES I UNDERSTAND\""
-        fi
-    fi
-    # if /etc/profile.d/brew.sh already exists, replace it with /usr/etc/profile.d/brew.sh
-    if [ -f /etc/profile.d/brew.sh ]; then
-        if [ -f /usr/etc/profile.d/brew.sh ]; then
-            sudo cp /usr/etc/profile.d/brew.sh /etc/profile.d/brew.sh
-        fi
-    fi
-
-# Install "fleek" set of packages for brew | none, low, default, high
-brew-fleek level="high":
-    #!/usr/bin/env bash
-    curl --proto '=https' --tlsv1.2 -sSf -L https://brew.getfleek.dev/s/fleek | bash -s -- {{ level }}
-
 # Configure Terminal Experience
 [private]
 configure-terminal:
     @/usr/libexec/configure-terminal.sh
 
-# Enable Cockpit for web-based system management | https://cockpit-project.org/
-cockpit:
-    echo 'Enabling Cockpit'
-    echo 'PasswordAuthentication yes' | sudo tee /etc/ssh/sshd_config.d/02-enable-passwords.conf
-    sudo systemctl try-restart sshd
-    sudo systemctl enable --now sshd
-    sudo podman container runlabel --name cockpit-ws RUN quay.io/cockpit/ws
-    sudo podman container runlabel INSTALL quay.io/cockpit/ws
-    sudo systemctl enable cockpit.service
-    echo 'Open Cockpit -> http://localhost:9090'
-
 # Toggle between Bluefin and the Developer Experience
 devmode:
     #!/usr/bin/env bash

From 0305a7d34610d6cee66e742db25fa3f2304bf47b Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sat, 9 Mar 2024 09:31:45 +0100
Subject: [PATCH 07/16] feat(just): convert cockpit recipe into a setup recipe

---
 just/bluefin-apps.just | 55 +++++++++++++++++++++++++++++++++++-------
 1 file changed, 46 insertions(+), 9 deletions(-)

diff --git a/just/bluefin-apps.just b/just/bluefin-apps.just
index a566215c7e0..2426ca085a8 100644
--- a/just/bluefin-apps.just
+++ b/just/bluefin-apps.just
@@ -43,12 +43,49 @@ install-brew-fleek level="high":
 alias cockpit := setup-cockpit
 
 # Enable Cockpit for web-based system management | https://cockpit-project.org/
-setup-cockpit:
-    echo 'Enabling Cockpit'
-    echo 'PasswordAuthentication yes' | sudo tee /etc/ssh/sshd_config.d/02-enable-passwords.conf
-    sudo systemctl try-restart sshd
-    sudo systemctl enable --now sshd
-    sudo podman container runlabel --name cockpit-ws RUN quay.io/cockpit/ws
-    sudo podman container runlabel INSTALL quay.io/cockpit/ws
-    sudo systemctl enable cockpit.service
-    echo 'Open Cockpit -> http://localhost:9090'
+setup-cockpit ACTION="":
+    #!/usr/bin/env bash
+    source /usr/lib/ujust/ujust.sh
+    COCKPIT_SERVICE_STATUS="$(systemctl is-enabled cockpit.service)"
+    if [ "$COCKPIT_SERVICE_STATUS" == "enabled" ]; then
+      COCKPIT_SERVICE_STATUS="${green}${b}Enabled${n}"
+    elif [ "$COCKPIT_SERVICE_STATUS" == "disabled" ]; then
+      COCKPIT_SERVICE_STATUS="${red}${b}Disabled${n}"
+    else
+      COCKPIT_SERVICE_STATUS="${invert}${b}Not Installed${n}"
+    fi
+    OPTION={{ ACTION }}
+    if [ "$OPTION" == "help" ]; then
+      echo "Usage: ujust setup-cockpit <option>"
+      echo "  <option>: Specify the quick option to skip the prompt"
+      echo "  Use 'install' to select Install Cockpit"
+      echo "  Use 'enable' to select Enable Cockpit"
+      echo "  Use 'disable' to select Disable Cockpit"
+      exit 0
+    elif [ "$OPTION" == "" ]; then
+      echo "${bold}Cockpit Setup${normal}"
+      echo "Cockpit service is currently: $COCKPIT_SERVICE_STATUS"
+      if [[ "${COCKPIT_SERVICE_STATUS}" =~ "Not Installed" ]]; then
+        OPTION=$(Choose "Install Cockpit" "Cancel")
+      else
+        OPTION=$(Choose "Enable Cockpit" "Disable Cockpit")
+      fi
+    fi
+    if [[ "${OPTION,,}" =~ ^install ]]; then
+      echo 'Installing Cockpit'
+      echo 'PasswordAuthentication yes' | sudo tee /etc/ssh/sshd_config.d/02-enable-passwords.conf
+      sudo systemctl try-restart sshd
+      sudo systemctl enable --now sshd
+      sudo podman container runlabel --name cockpit-ws RUN quay.io/cockpit/ws
+      sudo podman container runlabel INSTALL quay.io/cockpit/ws
+      OPTION="Enable Cockpit"
+    fi
+    if [[ "${OPTION,,}" =~ ^enable ]]; then
+      echo "${green}${b}Enabling${n} Cockpit"
+      sudo systemctl enable cockpit.service
+      echo "$(Urllink "http://localhost:9090" "Open Cockpit${n}") -> http://localhost:9090"
+    elif [[ "${OPTION,,}" =~ ^disable ]]; then
+      echo "${red}${b}Disabling${n} Cockpit"
+      sudo systemctl disable cockpit.service
+      echo "Cockpit has been ${b}${red}disabled${n}"
+    fi

From b44232f078d3a510124210d01256ac7dc0cfbdb8 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sat, 9 Mar 2024 09:36:11 +0100
Subject: [PATCH 08/16] chore(just): move jetbrains toolbox to apps justfile

---
 just/bluefin-apps.just | 20 ++++++++++++++++++++
 just/custom.just       | 18 ------------------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/just/bluefin-apps.just b/just/bluefin-apps.just
index 2426ca085a8..96b2f9cae6f 100644
--- a/just/bluefin-apps.just
+++ b/just/bluefin-apps.just
@@ -89,3 +89,23 @@ setup-cockpit ACTION="":
       sudo systemctl disable cockpit.service
       echo "Cockpit has been ${b}${red}disabled${n}"
     fi
+
+alias jetbrains-toolbox := install-jetbrains-toolbox
+
+# Install JetBrains Toolbox | https://www.jetbrains.com/toolbox-app/
+install-jetbrains-toolbox:
+    #!/usr/bin/env bash
+    pushd "$(mktemp -d)"
+    echo "Get latest JetBrains Toolbox version"
+    # Get the json with latest releases
+    curl -sSfL -o releases.json "https://data.services.jetbrains.com/products/releases?code=TBA&latest=true&type=release"
+    # Extract information
+    BUILD_VERSION=$(jq -r '.TBA[0].build' ./releases.json)
+    DOWNLOAD_LINK=$(jq -r '.TBA[0].downloads.linux.link' ./releases.json)
+    CHECKSUM_LINK=$(jq -r '.TBA[0].downloads.linux.checksumLink' ./releases.json)
+    echo "Installing JetBrains Toolbox ${BUILD_VERSION}"
+    curl -sSfL -O "${DOWNLOAD_LINK}"
+    curl -sSfL "${CHECKSUM_LINK}" | sha256sum -c
+    tar zxf jetbrains-toolbox-"${BUILD_VERSION}".tar.gz
+    echo "Launching JetBrains Toolbox"
+    ./jetbrains-toolbox-"${BUILD_VERSION}"/jetbrains-toolbox
diff --git a/just/custom.just b/just/custom.just
index c8fd3616b5e..b0f8dcd6673 100644
--- a/just/custom.just
+++ b/just/custom.just
@@ -123,24 +123,6 @@ gnome-vrr:
     fi
     echo "To apply the changes make sure you logout and restart your session"
 
-# Install JetBrains Toolbox | https://www.jetbrains.com/toolbox-app/
-jetbrains-toolbox:
-    #!/usr/bin/env bash
-    pushd "$(mktemp -d)"
-    echo "Get latest JetBrains Toolbox version"
-    # Get the json with latest releases
-    curl -sSfL -o releases.json "https://data.services.jetbrains.com/products/releases?code=TBA&latest=true&type=release"
-    # Extract information
-    BUILD_VERSION=$(jq -r '.TBA[0].build' ./releases.json)
-    DOWNLOAD_LINK=$(jq -r '.TBA[0].downloads.linux.link' ./releases.json)
-    CHECKSUM_LINK=$(jq -r '.TBA[0].downloads.linux.checksumLink' ./releases.json)
-    echo "Installing JetBrains Toolbox ${BUILD_VERSION}"
-    curl -sSfL -O "${DOWNLOAD_LINK}"
-    curl -sSfL "${CHECKSUM_LINK}" | sha256sum -c
-    tar zxf jetbrains-toolbox-"${BUILD_VERSION}".tar.gz
-    echo "Launching JetBrains Toolbox"
-    ./jetbrains-toolbox-"${BUILD_VERSION}"/jetbrains-toolbox
-
 # Install and configure Incus
 incus:
     #!/usr/bin/env bash

From a2be83fffe7cfe50bef066a3f6f0623effc1cb14 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sat, 9 Mar 2024 09:37:19 +0100
Subject: [PATCH 09/16] chore(just): move touch recipe to apps justfile

---
 just/bluefin-apps.just | 8 ++++++++
 just/custom.just       | 6 ------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/just/bluefin-apps.just b/just/bluefin-apps.just
index 96b2f9cae6f..38f7a78ab9a 100644
--- a/just/bluefin-apps.just
+++ b/just/bluefin-apps.just
@@ -109,3 +109,11 @@ install-jetbrains-toolbox:
     tar zxf jetbrains-toolbox-"${BUILD_VERSION}".tar.gz
     echo "Launching JetBrains Toolbox"
     ./jetbrains-toolbox-"${BUILD_VERSION}"/jetbrains-toolbox
+
+alias touch := install-touch
+
+# Install a better on-screen-keyboard and gesture improvements
+install-touch:
+    pip install --upgrade gnome-extensions-cli
+    gext install improvedosk@nick-shmyrev.dev
+    gext install gestureImprovements@gestures
diff --git a/just/custom.just b/just/custom.just
index b0f8dcd6673..8c8eb29c3ec 100644
--- a/just/custom.just
+++ b/just/custom.just
@@ -170,12 +170,6 @@ tensorflow:
     podman pull docker.io/tensorflow/tensorflow:latest
     podman run -it -p 8888:8888 docker.io/tensorflow/tensorflow:latest-jupyter  # Start Jupyter server
 
-# Install a better on-screen-keyboard and gesture improvements
-touch:
-    pip install --upgrade gnome-extensions-cli
-    gext install improvedosk@nick-shmyrev.dev
-    gext install gestureImprovements@gestures
-
 # Run the yafti setup tool
 yafti:
     yafti /etc/yafti.yml --force

From b23edeec1732043908823c18f733a38b94111ef6 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sat, 9 Mar 2024 09:39:33 +0100
Subject: [PATCH 10/16] chore(just): move atuin to apps justfile

---
 just/bluefin-apps.just | 17 +++++++++++++++++
 just/custom.just       | 15 ---------------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/just/bluefin-apps.just b/just/bluefin-apps.just
index 38f7a78ab9a..8f2387069c7 100644
--- a/just/bluefin-apps.just
+++ b/just/bluefin-apps.just
@@ -117,3 +117,20 @@ install-touch:
     pip install --upgrade gnome-extensions-cli
     gext install improvedosk@nick-shmyrev.dev
     gext install gestureImprovements@gestures
+
+alias atuin := install-atuin
+
+# Add atuin
+install-atuin:
+    #!/usr/bin/bash 
+    shell=$(basename $SHELL) 
+    if test $shell = "fish"; then 
+        echo "Adding atuin to your config.fish"
+        printf '\nif status is-interactive\n\tif type -q atuin\n\t\tatuin init fish | source\n\tend\nend\n' >> ${XDG_CONFIG_HOME:-$HOME/.config}/fish/config.fish
+    elif test $shell = "zsh"; then 
+        echo "Adding atuin to your .zshrc"
+        printf '\n[[ "$(command -v atuin)" ]] && eval "$(atuin init zsh)"\n' >> ${ZDOTDIR:-$HOME}/.zshrc 
+    elif test $shell = "bash"; then 
+        echo "Adding bash-prexec and atuin to your .bashrc" 
+        printf '\n[[ -f /usr/share/bash-prexec ]] && source /usr/share/bash-prexec\n[[ "$(command -v atuin)" ]] && eval "$(atuin init bash)"\n' >> ~/.bashrc
+    fi
diff --git a/just/custom.just b/just/custom.just
index 8c8eb29c3ec..4693800550c 100644
--- a/just/custom.just
+++ b/just/custom.just
@@ -181,18 +181,3 @@ dx-group:
     sudo usermod -aG lxd $USER
     sudo usermod -aG libvirt $USER
     @echo "Logout to use docker, incus-admin, lxd, libvirt"
-
-# Add atuin
-atuin:
-    #!/usr/bin/bash 
-    shell=$(basename $SHELL) 
-    if test $shell = "fish"; then 
-        echo "Adding atuin to your config.fish"
-        printf '\nif status is-interactive\n\tif type -q atuin\n\t\tatuin init fish | source\n\tend\nend\n' >> ${XDG_CONFIG_HOME:-$HOME/.config}/fish/config.fish
-    elif test $shell = "zsh"; then 
-        echo "Adding atuin to your .zshrc"
-        printf '\n[[ "$(command -v atuin)" ]] && eval "$(atuin init zsh)"\n' >> ${ZDOTDIR:-$HOME}/.zshrc 
-    elif test $shell = "bash"; then 
-        echo "Adding bash-prexec and atuin to your .bashrc" 
-        printf '\n[[ -f /usr/share/bash-prexec ]] && source /usr/share/bash-prexec\n[[ "$(command -v atuin)" ]] && eval "$(atuin init bash)"\n' >> ~/.bashrc
-    fi

From fc34033ee0a0dd808b584d420140b06fd5f4885d Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sat, 9 Mar 2024 09:45:10 +0100
Subject: [PATCH 11/16] chore(just): move tool recipes to the tools justfile

---
 just/bluefin-tools.just | 27 +++++++++++++++++++++++++++
 just/custom.just        | 19 -------------------
 2 files changed, 27 insertions(+), 19 deletions(-)
 create mode 100644 just/bluefin-tools.just

diff --git a/just/bluefin-tools.just b/just/bluefin-tools.just
new file mode 100644
index 00000000000..f0a4c027292
--- /dev/null
+++ b/just/bluefin-tools.just
@@ -0,0 +1,27 @@
+# vim: set ft=make :
+## Standardized verbs
+# configure- = configure something that is pre-installed on the image
+# install-   = install something, no uninstall or configuration provided
+# setup-     = install something and also provide configuration and/or uninstallation options
+# toggle-    = turn something on/off, logic can be automatic or manual selection
+# fix-       = apply fix/patch/workaround for something
+# foo        = no verb is used for shortcuts or something deemed important enough to use a super memorable name
+
+# Run pytorch
+pytorch:
+    echo 'Follow the prompts and check the tutorial: https://docs.anaconda.com/free/anaconda/jupyter-notebooks/'
+    podman pull docker.io/continuumio/miniconda3
+    podman run -i -t -p 8888:8888 docker.io/continuumio/miniconda3 /bin/bash -c "/opt/conda/bin/conda install jupyter -y --quiet && mkdir \
+    /opt/notebooks && /opt/conda/bin/jupyter notebook \
+    --notebook-dir=/opt/notebooks --ip='*' --port=8888 \
+    --no-browser --allow-root"
+
+# Run Tensorflow
+tensorflow:
+    echo 'Follow the prompts and check the tutorial: https://www.tensorflow.org/tutorials/quickstart/beginner'
+    podman pull docker.io/tensorflow/tensorflow:latest
+    podman run -it -p 8888:8888 docker.io/tensorflow/tensorflow:latest-jupyter  # Start Jupyter server
+
+# Run the yafti setup tool
+yafti:
+    yafti /etc/yafti.yml --force
diff --git a/just/custom.just b/just/custom.just
index 4693800550c..5fd6bd92357 100644
--- a/just/custom.just
+++ b/just/custom.just
@@ -155,25 +155,6 @@ ptyxis-transparency opacity="0.95":
       printf "Value must be between 0 and 1: %s.\n" "{{ opacity }}"
     fi
 
-# Run pytorch
-pytorch:
-    echo 'Follow the prompts and check the tutorial: https://docs.anaconda.com/free/anaconda/jupyter-notebooks/'
-    podman pull docker.io/continuumio/miniconda3
-    podman run -i -t -p 8888:8888 docker.io/continuumio/miniconda3 /bin/bash -c "/opt/conda/bin/conda install jupyter -y --quiet && mkdir \
-    /opt/notebooks && /opt/conda/bin/jupyter notebook \
-    --notebook-dir=/opt/notebooks --ip='*' --port=8888 \
-    --no-browser --allow-root"
-
-# Run Tensorflow
-tensorflow:
-    echo 'Follow the prompts and check the tutorial: https://www.tensorflow.org/tutorials/quickstart/beginner'
-    podman pull docker.io/tensorflow/tensorflow:latest
-    podman run -it -p 8888:8888 docker.io/tensorflow/tensorflow:latest-jupyter  # Start Jupyter server
-
-# Run the yafti setup tool
-yafti:
-    yafti /etc/yafti.yml --force
-
 # Configure docker,incus-admin,lxd,libvirt container manager permissions
 dx-group:
     sudo usermod -aG docker $USER

From ca922bda274624faf93d52c4f8b79502df6639db Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sat, 9 Mar 2024 09:48:44 +0100
Subject: [PATCH 12/16] chore(just): move incus to apps justfile

---
 just/bluefin-apps.just | 17 +++++++++++++++++
 just/custom.just       | 16 ----------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/just/bluefin-apps.just b/just/bluefin-apps.just
index 8f2387069c7..cfdd4aa458e 100644
--- a/just/bluefin-apps.just
+++ b/just/bluefin-apps.just
@@ -134,3 +134,20 @@ install-atuin:
         echo "Adding bash-prexec and atuin to your .bashrc" 
         printf '\n[[ -f /usr/share/bash-prexec ]] && source /usr/share/bash-prexec\n[[ "$(command -v atuin)" ]] && eval "$(atuin init bash)"\n' >> ~/.bashrc
     fi
+
+alias incus := install-incus
+
+# Install and configure Incus
+install-incus:
+    #!/usr/bin/env bash
+    source /usr/lib/ujust/ujust.sh
+    CURRENT_IMAGE=$(rpm-ostree status -b --json | jq -r '.deployments[0]."container-image-reference"')
+    if grep -q "bluefin-dx" <<< $CURRENT_IMAGE
+    then
+        echo 'Installing and configuring Incus.'
+        /usr/bin/bluefin-incus
+    else
+        echo "Developer mode is currently ${b}${red}Disabled${n}."
+        echo "Run \"just devmode\" to turn on Developer mode."
+        exit
+    fi
diff --git a/just/custom.just b/just/custom.just
index 5fd6bd92357..7ad9f83e2b0 100644
--- a/just/custom.just
+++ b/just/custom.just
@@ -92,7 +92,6 @@ configure-shell ACTION="":
       printf "${USER}'s shell is now %s.\n" "$(cat /etc/passwd | grep ":$UID:" | cut '-d:' '-f7')"
     fi
 
-
 # Install recommended GNOME extensions
 gnome-extensions:
     pip install --upgrade gnome-extensions-cli
@@ -123,21 +122,6 @@ gnome-vrr:
     fi
     echo "To apply the changes make sure you logout and restart your session"
 
-# Install and configure Incus
-incus:
-    #!/usr/bin/env bash
-    source /usr/lib/ujust/ujust.sh
-    CURRENT_IMAGE=$(rpm-ostree status -b --json | jq -r '.deployments[0]."container-image-reference"')
-    if grep -q "bluefin-dx" <<< $CURRENT_IMAGE
-    then
-        echo 'Installing and configuring Incus.'
-        /usr/bin/bluefin-incus
-    else
-        echo "Developer mode is currently ${b}${red}Disabled${n}."
-        echo "Run \"just devmode\" to turn on Developer mode."
-        exit
-    fi
-
 # Ptyxis terminal transparency
 ptyxis-transparency opacity="0.95":
     #!/usr/bin/env bash

From 8f29b825b0fc688775b6bbb285bca4e278ae6a86 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sat, 9 Mar 2024 09:55:21 +0100
Subject: [PATCH 13/16] chore(just): update remaining recipes to use
 standardized verbs changes gnome-extensions to get-gnome-extensions changes
 gnome-vrr to toggle-gnome-vrr

---
 just/custom.just | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/just/custom.just b/just/custom.just
index 7ad9f83e2b0..0558baf7262 100644
--- a/just/custom.just
+++ b/just/custom.just
@@ -92,15 +92,19 @@ configure-shell ACTION="":
       printf "${USER}'s shell is now %s.\n" "$(cat /etc/passwd | grep ":$UID:" | cut '-d:' '-f7')"
     fi
 
+alias gnome-extensions := get-gnome-extensions
+
 # Install recommended GNOME extensions
-gnome-extensions:
+get-gnome-extensions:
     pip install --upgrade gnome-extensions-cli
     gext install nightthemeswitcher@romainvigier.fr
     gext install pano@elhan.io
     gext install weatheroclock@CleoMenezesJr.github.io
 
+alias gnome-vrr := toggle-gnome-vrr
+
 # Enable or Disable Gnome-VRR
-gnome-vrr:
+toggle-gnome-vrr:
     #!/usr/bin/env bash
     if gsettings get org.gnome.mutter experimental-features | grep -q "variable-refresh-rate"
     then

From 8883aa1ec907a08ab217d17d3964a65da5b42f90 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sat, 9 Mar 2024 10:06:35 +0100
Subject: [PATCH 14/16] chore(just): rename custom.just to bluefin-system.just

---
 just/{custom.just => bluefin-system.just} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename just/{custom.just => bluefin-system.just} (100%)

diff --git a/just/custom.just b/just/bluefin-system.just
similarity index 100%
rename from just/custom.just
rename to just/bluefin-system.just

From 3e950eab4b4304d115e9b93a5bbc48a4f1f7651c Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sat, 9 Mar 2024 10:12:06 +0100
Subject: [PATCH 15/16] feat(just): add headers to show the origin file As the
 containerfile flattens all the files into 1 just file, it is nice to see
 which part of the file originates from where on the system

---
 just/bluefin-apps.just   | 3 +++
 just/bluefin-system.just | 3 +++
 just/bluefin-tools.just  | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/just/bluefin-apps.just b/just/bluefin-apps.just
index cfdd4aa458e..15dde3b24ad 100644
--- a/just/bluefin-apps.just
+++ b/just/bluefin-apps.just
@@ -1,4 +1,7 @@
 # vim: set ft=make :
+########################
+### bluefin-apps.just
+########################
 ## Standardized verbs
 # configure- = configure something that is pre-installed on the image
 # install-   = install something, no uninstall or configuration provided
diff --git a/just/bluefin-system.just b/just/bluefin-system.just
index 0558baf7262..0b4ff127edf 100644
--- a/just/bluefin-system.just
+++ b/just/bluefin-system.just
@@ -1,4 +1,7 @@
 # vim: set ft=make :
+########################
+### bluefin-system.just
+########################
 ## Standardized verbs
 # configure- = configure something that is pre-installed on the image
 # install-   = install something, no uninstall or configuration provided
diff --git a/just/bluefin-tools.just b/just/bluefin-tools.just
index f0a4c027292..4dcc85bc759 100644
--- a/just/bluefin-tools.just
+++ b/just/bluefin-tools.just
@@ -1,4 +1,7 @@
 # vim: set ft=make :
+########################
+### bluefin-tools.just
+########################
 ## Standardized verbs
 # configure- = configure something that is pre-installed on the image
 # install-   = install something, no uninstall or configuration provided

From 2334a404d20948498924186864e10c636342b2ca Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Tue, 12 Mar 2024 08:55:04 +0100
Subject: [PATCH 16/16] feat(just): handle shell selection better when
 configuring the user shell

---
 just/bluefin-system.just | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/just/bluefin-system.just b/just/bluefin-system.just
index 0b4ff127edf..4f4d4c7bffc 100644
--- a/just/bluefin-system.just
+++ b/just/bluefin-system.just
@@ -87,12 +87,11 @@ configure-shell ACTION="":
       echo "${USER}'s shell is currently ${CURRENT_SHELL}"
       OPTION=$(Choose "fish" "zsh" "bash")
     fi
-    if [[ "$OPTION" =~ zsh|fish ]]; then
+    if [ -z "$OPTION" ]; then
+      exit 0
+    else
       sudo usermod $USER --shell /usr/bin/$OPTION 
       printf "${USER}'s shell is now %s.\n" "$(cat /etc/passwd | grep ":$UID:" | cut '-d:' '-f7')"
-    elif [ "$OPTION" == "bash" ]; then
-      sudo usermod $USER --shell /bin/$OPTION 
-      printf "${USER}'s shell is now %s.\n" "$(cat /etc/passwd | grep ":$UID:" | cut '-d:' '-f7')"
     fi
 
 alias gnome-extensions := get-gnome-extensions