Add an example URL.

facts/general/package.yml

@@ -95,39 +95,30 @@
       case $pkg_mgr in
         apt)
           if [[ $distribution != "ParrotOS" ]]; then
-            echo -e "******* Apt *******\n*** Update Cache ***" &&
+            echo "*** Apt ***" &&
             sudo apt update &&
-            echo -e "\n*** Auto Remove ***" &&
             sudo apt autoremove {{ update_accept_var }} &&
-            echo -e "\n*** Clean ***" &&
             sudo apt clean {{ update_accept_var }} &&
-            echo -e "Cleaned!\n\n*** Configure DPKG ***" &&
             sudo dpkg --configure -a &&
-            echo -e "\n*** Fix Broken/Missing ***" &&
             sudo apt --fix-broken --fix-missing install &&
-            echo -e "\n*** Upgrade ***" &&
             sudo apt dist-upgrade --allow-downgrades --fix-broken \
               --fix-missing {{ update_accept_var }} ||
             return 1
           else
-            echo -e "******* Parrot *******\n*** Update Cache ***" &&
+            echo "*** Parrot ***"
             sudo apt update &&
-            echo -e "\n*** Auto Remove ***" &&
             sudo apt autoremove {{ update_accept_var }} &&
             parrot_mirrors_suck=true &&
             while [[ $parrot_mirrors_suck ]]; do
               unset parrot_mirrors_suck
-              echo -e "\n*** Upgrade ***"
               sudo parrot-upgrade
               if [[ $? != 0 ]]; then
                 parrot_mirrors_suck=true
-                echo -e "*** Update Cache, Again ***"
                 sudo apt update --fix-missing
               fi
             done ||
             return 1
           fi
-          echo -e "\n******* Mission Complete!! *******"
         ;;
 
         pacman)

files/scripts/compress_image.sh

@@ -34,12 +34,9 @@ function usage() {
 
 		Parameters:
 		  -s SIZE : Integer for the maximum length of either image dimension.
-		            Default size is 2000.
 		  -l LOCATION : The specific image or folder which needs images shrunk.
-		                Default location is the current directory.
 		  -r : Recursively shrink images based on the location passed.
 		  -f : Force the image to be shrunk even if a file already exists for it.
-		  -F : FORCE the image to be shrunk even if the file is already shrunk.
 		  -d : Delete the original image if the compressed image is smaller.
 		  -c : Clean the filename of underscores, dashes, 'IMG', etc.
 		  -A : Resursively Force, Delete, and Clean.
@@ -51,17 +48,15 @@ function usage() {
 
 ## Parameters ##
 
-while getopts ":s:l:rfFdcAhx" opt; do
+while getopts ":s:l:rfdcAhx" opt; do
 	case $opt in
 		s) in_size="$OPTARG" && size="$in_size" ;;
 		l) location="$OPTARG" ;;
 		r) recurse="Y" && search="find" ;;
 		f) force="Y" ;;
-		F) super_force="Y" ;;
 		d) delete="Y" ;;
 		c) clean="Y" ;;
-		e) expand="Y" ;;
-		A) recurse="Y" && search="find" && force="Y" && delete="Y" && expand="Y" ;;
+		A) recurse="Y" && search="find" && force="Y" && delete="Y" && clean="Y" ;;
 		h) usage 0 ;;
 		x) set -x ;;
 		*) echo "ERROR: Option $OPTARG not recognized." >&2 && usage 1 ;;
@@ -75,7 +70,7 @@ if [[ -n "$in_size" && "$size" != "$in_size" ]]; then
 	usage 1
 fi
 
-convert_exe="`which convert` -strip"
+convert_exe="`which convert`"
 if [[ "$convert_exe" == "" ]]; then
 	echo "ERROR: 'convert' command could not be found, "
 	echo "please install 'imagemagick'."
@@ -95,8 +90,8 @@ $search "$location" | sort | while read image; do
 	# Avoid processing directories no matter the name.
 	[ -d "$image" ] && continue
 
-	# Avoid processing files previously shrunk, unless we are FORCEing.
-	[[ "$image" == *"$tag"* && -z "$super_force" ]] && continue
+	# Avoid processing files previously shrunk.
+	[[ "$image" == *"$tag"* ]] && continue
 
 	echo -e "\n$image"
 
@@ -111,7 +106,8 @@ $search "$location" | sort | while read image; do
 		continue
 	fi
 
-	new_image="${image//.$extension/}.$tag-$date_YYYYMMDD.$size.$extension"
+
+	new_image="${image//.$extension/}.$tag-$date_YYYYMMDD.$extension"
 
 	## Clean Filename ##
 	# Prevent directory from having its name cleaned too.
@@ -124,31 +120,13 @@ $search "$location" | sort | while read image; do
 	new_image_clean="${new_image_clean//-/}"
 	new_image_clean="${new_image_clean// /}"
 
-	## Expanded Filename ##
-	# Add back in the dashes so that the year, month, date, and time are exposed.
-	TEMP="$new_image_clean"
-	# Date Data
-	new_image_exp="${TEMP:0:4}-${TEMP:4:2}-${TEMP:6:2}"
-	# Time Data
-	new_image_exp="${new_image_exp}_${TEMP:8:2}-${TEMP:10:2}-${TEMP:12:2}"
-	# Remainder Data
-	if [[ "${TEMP:14:1}" == "." ]]; then
-		SEP=""
-	else
-		SEP="_"
-	fi
-	new_image_exp="${new_image_exp}${SEP}${TEMP:14}"
-	unset TEMP SEP
-
-	# Add directory back to the full paths.
+	# Add directory back to the full path.
 	new_image_clean="$image_dirname/$new_image_clean"
-	new_image_exp="$image_dirname/$new_image_exp"
 
 	# Delete the existing shrunk image if we are forcing a new compression.
-	if [[ -n "$force" &&
-			(-e "$new_image" || -e $new_image_clean || -e $new_image_exp ) ]]; then
+	if [[ -n "$force" && (-e "$new_image" || -e $new_image_clean) ]]; then
 		echo -n "  FORCE: "
-		rm -v "$new_image" "$new_image_clean" "$new_image_exp" 2>/dev/null
+		rm -v "$new_image" "$new_image_clean" 2>/dev/null
 	fi
 
 	# Skip if a compressed image was already created today.
@@ -157,14 +135,10 @@ $search "$location" | sort | while read image; do
 		continue
 	fi
 
-	# Whether or not to use the cleaned version.
+	# Whether or not to use the cleaned version or the normal version.
 	if [[ -n $clean ]]; then
 		new_image="$new_image_clean"
-	# Whether or not to use the expanded version.
-	elif [[ -n $expand ]]; then
-		new_image="$new_image_exp"
 	fi
-	# Otherwise uses the same name as before.
 
 	###### TBD Instead of this, only alter the file names, and set a dirname var?
 	#### Create a new directory if the directory names were altered.

files/scripts/compress_video.sh

@@ -32,14 +32,7 @@ function usage {
 		  -i input : The input file or folder with which to search for video files.
 		             If nothing is provided, current directory (.) is assumed.
 		  -v bitrate : The video bitrate to convert to.
-		               Defaults are based on the size passed.
-		                 >= 2160:   '30M'
-		                 >= 1440:   '12M'
-		                 >= 1080:    '5M'
-		                 >=  720: '2000k'
-		                 >=  480:  '750k'
-		                 >=  360:  '250k'
-		                  <  360:  '100k'
+		               Defaults to '2000k'.
 		  -a bitrate : The audio bitrate to convert to.
 		               Defaults to '192k'.
 		  -c vcodec : The video codec you'd like to use, such as libopenh264.
@@ -48,8 +41,7 @@ function usage {
 		  -r : Recurse the entire directory structure, compressing all video files.
 		  -f : Force recompressing any files by deleting it if it already exists.
 		  -d : Delete the original video if the compressed version is smaller.
-		  -l : Clean the filename of dashes and underscores so dates line up.
-		  -A : Recursively Force, Delete, and Clean.
+		  -A : Recursively Force and Delete.
 		  -m : Measure the time it takes to compress each video and do the loop.
 		  -V : Add verbosity, such as printing all the variable values.
 		  -x : Set the shell's x flag to display every action which is taken.
@@ -60,7 +52,7 @@ function usage {
 
 ## Parameters ##
 
-while getopts ":i:v:a:c:s:rfdlAmVxh" opt; do
+while getopts ":i:v:a:c:s:rfdAmVxh" opt; do
 	case $opt in
 		i) input="$OPTARG"
 			;;
@@ -78,9 +70,7 @@ while getopts ":i:v:a:c:s:rfdlAmVxh" opt; do
 			;;
 		d) delete="Y"
 			;;
-		l) clean="Y"
-			;;
-		A) search_command="find" && force="Y" && delete="Y" #&& clean="Y"
+		A) search_command="find" && force="Y" && delete="Y"
 			;;
 		m) time_command="`which time`"
 			;;
@@ -105,44 +95,14 @@ if [[ -z "$input" ]]; then
 	input="."
 fi
 
-if [[ -z $size ]]; then
-	size="720"
-fi
-typeset -i size_int
-size_int="$size"
-
-# Ensure the filenames sort properly between 3 and 4 digit resolutions.
-while (( ${#size} < 4 )); do
-    size="0$size"
-done
-compress_tags="$size"
-size="-filter:v scale=-2:$size"
-
 if [[ -z "$video_bitrate" ]]; then
-	# Based roughly on the 2.5 step iteration used for 720 and 1080.
-	if (( size_int >= 2160 )); then
-		video_bitrate="30M"
-	elif (( size_int >= 1440 )); then
-		video_bitrate="12M"
-	elif (( size_int >= 1080 )); then
-		video_bitrate="5M"
-	elif (( size_int >= 720 )); then
-		video_bitrate="2000k"
-	elif (( size_int >= 480 )); then
-		video_bitrate="750k"
-	elif (( size_int >= 360 )); then
-		video_bitrate="250k"
-	else
-		video_bitrate="100k"
-	fi
+	video_bitrate="2000k"
 fi
-compress_tags="$compress_tags-$video_bitrate"
 video_bitrate="-b:v $video_bitrate -minrate 0 -maxrate $video_bitrate -bufsize $video_bitrate"
 
 if [[ -z "$audio_bitrate" ]]; then
 	audio_bitrate="192k"
 fi
-compress_tags="$compress_tags-$audio_bitrate"
 audio_bitrate="-b:a $audio_bitrate"
 
 if [[ -z "$codec" ]]; then
@@ -161,6 +121,11 @@ else
 	time_command="$time_command -p"
 fi
 
+if [[ -z $size ]]; then
+	size="720"
+fi
+size="-filter:v scale=-1:$size"
+
 ## Main ##
 
 if [[ "$verbose" == "Y" ]]; then
@@ -207,41 +172,26 @@ $search_command "$input" | sort | while read file; do
 	# Build the new filename to signify it is different than the original.
 	newfile="${file//$extension/$filename_flag-$date_YYYYMMDD.$extension_lower}"
 
-	# Add the size, video, and audio quality it was converted to.
-	newfile="${newfile//\.$extension_lower/_$compress_tags.$extension_lower}"
-
 	if [[ $newfile == $file ]]; then
 		echo "ERROR: The new calculated filename matches the old, skipping." >&2
 		continue
 	fi
 
-	# TBD / TODO: Test this functionality!
-	new_video_clean="${newfile}"
-	new_video_clean="${new_video_clean//_/}"
-	new_video_clean="${new_video_clean//-/}"
-	new_video_clean="${new_video_clean// /}"
-
 	# More exception checks based on the new file.
-	if [[ -e "$newfile" || -e "$new_video_clean" ]]; then
+	if [[ -e "$newfile" ]]; then
 		if [[ "$force" == "Y" ]]; then
 			echo "FORCE: Removing '$newfile'."
 			if [[ -d ~/TRASH ]]; then
-				mv -v "$newfile" "$new_video_clean" ~/TRASH/ 2>/dev/null
+				mv -v "$newfile" ~/TRASH/
 			else
-				rm -v "$newfile" "$new_video_clean" 2>/dev/null
+				rm -v "$newfile"
 			fi
 		else
-			echo "SKIP: Already has a compressed version."
-			ls -sh "$newfile" "$new_video_clean" 2>/dev/null
+			echo "SKIP: Already has a compressed version ($newfile)."
 			continue
 		fi
 	fi
 
-	# Whether or not to use the cleaned version or the normal version.
-	if [[ -n $clean ]]; then
-		newfile="$new_video_clean"
-	fi
-
 	# Convert the file.
 	echo "Converting to '$newfile'."
 	echo "*** `date` ***"

files/settings/vscode.json

@@ -3,7 +3,6 @@
 	"save_loc1": "~/.var/app/com.visualstudio.code-oss/config/Code - OSS/{{ user_desc }}/settings.json",
 	"save_loc2": "~/.var/app/com.vscodium.codium/config/VSCodium/{{ user_desc }}/settings.json",
 	"END_COMMENTS": "",
-
 	"workbench.startupEditor": "none",
 	"editor.rulers": [
 		 80, 120, 200
@@ -12,14 +11,5 @@
 	"editor.tabSize": 3,
 	"editor.insertSpaces": false,
 	"files.insertFinalNewline": true,
-	"files.trimFinalNewlines": true,
-	"git.confirmSync": false,
-
-    "[dart]": {
-        "editor.formatOnSave": true,
-        "editor.formatOnType": true,
-        "editor.selectionHighlight": false,
-        "editor.tabCompletion": "onlySnippets",
-        "editor.wordBasedSuggestions": "off"
-    }
+	"files.trimFinalNewlines": true
 }

local.yml

@@ -75,6 +75,7 @@
       - include_tasks: tasks/general/software/sendmail.yml
         when: ansible_system == "FreeBSD"
 
+
       # Gather again in case missing programs have now been installed.
       - include_tasks: facts/general/gather.yml
 
@@ -123,12 +124,6 @@
       - include_tasks: tasks/workstation/linux/software/packages.yml
         when: ansible_system == "Linux"
 
-      - include_tasks: tasks/workstation/linux/software/lutris.yml
-        when: ansible_system == "Linux"
-
-      - include_tasks: tasks/workstation/linux/software/vscodium.yml
-        when: ansible_system == "Linux"
-
       - include_tasks: tasks/workstation/linux/software/brave.yml
         when: ansible_pkg_mgr in ("apt", "dnf", "zypper") and not mobile
 
@@ -159,12 +154,6 @@
       - include_tasks: tasks/workstation/shared/settings/services.yml
 
       # Final Tasks (SLOW) #
-      - include_tasks: tasks/workstation/linux/software/flutter.yml
-        when: ansible_system == "Linux"
-
-      - include_tasks: tasks/workstation/linux/software/android.yml
-        when: ansible_system == "Linux"
-
       - include_tasks: tasks/workstation/linux/software/flatpaks.yml
         when: ansible_system == "Linux" and flatpak_distro
 

tasks/general/acct_mgmt/provision_config.yml

@@ -35,11 +35,11 @@
       ;
       ;       user : Provide the name of the user account.
       ;                Example: tom, jerry, kim, sarah
-      ;                Default: user
+      ;                Default: ling
       ;
       ;  user_desc : Provide the description of the user account.
       ;                Example: Thomas, Jerry, Kimberly, Sarah
-      ;                Default: User
+      ;                Default: Hyperling
       ;
       ;  sshd_port : Determine the port which SSHD should listen on.
       ;                Example: 12345
@@ -101,22 +101,6 @@
       ;            Slows down the rate of services such as telegraf and cron.
       ;              Default: false
       ;
-      ;;;;;;;;;;;;;;;;;;;;         Server Shortcut          ;;;;;;;;;;;;;;;;;;;;
-      ;
-      ; For typing `prod` and getting straight to a server, like in env-termux.
-      ;
-      ; prod_host : Branch to use on this machine.
-      ;               Example: myserver.com, mywebhost.net
-      ;               Default: hyperling.com
-      ;
-      ; prod_port : Provide the git host that the machine should poll.
-      ;               Example: 22, 222, 2222
-      ;               Default: 22
-      ;
-      ; prod_user : Port of the server host to use for SSH requests.
-      ;               Example: jim, bob, jeff, anne
-      ;               Default: user
-      ;
       [global]
     marker: '; {mark} MANAGED BY ANSIBLE | Generic Config'
     state: present
@@ -140,9 +124,6 @@
     git_user:     "{{ lookup('ini', 'git_user     file={{gen_file}} default=me') }}"
     git_project:  "{{ lookup('ini', 'git_project  file={{gen_file}} default=env-ansible') }}"
     git_ssh_port: "{{ lookup('ini', 'git_ssh_port file={{gen_file}} default=22') }}"
-    prod_host: "{{ lookup('ini', 'prod_host   file={{gen_file}} default=hyperling.com') }}"
-    prod_port: "{{ lookup('ini', 'prod_port   file={{gen_file}} default=22') }}"
-    prod_user: "{{ lookup('ini', 'prod_user   file={{gen_file}} default=user') }}"
 
 - name: General | Account Management | Provisioning Configuration | General | List
   set_fact:
@@ -163,9 +144,6 @@
     - { 'git_user': "{{ git_user }}" }
     - { 'git_project': "{{ git_project }}" }
     - { 'git_ssh_port': "{{ git_ssh_port }}" }
-    - { 'prod_host': "{{ prod_host }}" }
-    - { 'prod_port': "{{ prod_port }}" }
-    - { 'prod_user': "{{ prod_user }}" }
 
 
 ## Workstation ##
@@ -181,10 +159,6 @@
       ;  coding : Set to true for installation of code editors (VSCode, PyCharm, Android Studio)
       ;
       ; editing : Set to true for installation of Audio/Video editors (Shotcut, Audacity, OBS Stdio, GIMP)
-      ;           Set to video for only the video related portions.
-      ;             - Shotcut, OpenShot, OBS Studio, etc.
-      ;           Set to audio for only the music related portions.
-      ;             - Audacity (or similar), LMMS, VMPK, etc.
       ;
       ;  gaming : Set to true for installation of gaming software (Steam, Lutris)
       ;

tasks/general/acct_mgmt/users.yml

@@ -100,6 +100,7 @@
     mode: '0755'
   loop:
     - "{{ user_user.home }}/bin"
+    - "{{ user_user.home }}/LBRY"
     - "{{ user_user.home }}/TRASH"
     - "{{ user_user.home }}/Downloads"
     - "{{ user_user.home }}/Reports"
@@ -157,27 +158,26 @@
     function_update: |
       function update() {
         PROG=$FUNCNAME
-        usage="Usage: $PROG [-y] [-g] [-s] [-f]
+        usage="Usage: $PROG [-y]
         $PROG is used to run all the system's package manager commands
           in one swoop. Flow stops if any command returns a failure code.
           The hope is to run something as easy as 'pacman -Syyu'.
         -y : Assume yes to any prompts.
-        -g : Goodbye - Shutdown after updating.
+        -g : Shutdown after updating.
         -s : System updates only, no Flatpaks.
         -f : Flatpaks only, no system updates."
 
         unset OPTIND
         unset accept
-        unset shutdown
+        unset goodbye
         unset only_sys
         unset only_flat
-
         while getopts ":hygsf" opt; do
             case $opt in
               h) echo -e "$usage"
                 return 0 ;;
               y) accept="-y" ;;
-              g) shutdown="Y" ;;
+              g) goodbye="Y" ;;
               s) only_sys="Y" ;;
               f) only_flat="Y" ;;
               *) echo "ERROR: -$OPTARG is not a recognized option." >&2
@@ -192,7 +192,7 @@
           {{ update_package_manager }}
         fi
 
-        if [[ "$shutdown" == "Y" && "{{ battery }}" == "True" ]]; then
+        if [[ "$goodbye" == "Y" && "{{ battery }}" == "True" ]]; then
           echo -e "\n*** Only System Updates - Skipping Flatpak ***\n\n"
         elif [[ "$only_sys" == "Y" ]]; then
           echo -e "\n*** Manually Skipping Flatpak ***\n\n"
@@ -202,8 +202,7 @@
 
         echo "*** Completed Successfully ***"
 
-        if [[ $shutdown == "Y" ]]; then
-          shopt -s expand_aliases
+        if [[ $goodbye == "Y" ]]; then
           bye
         fi
 
@@ -235,8 +234,6 @@
         echo "*** Completed Successfully ***"
         return 0
       }
-      alias firmware-update="update-firmware"
-      alias firmware-updater="update-firmware"
     alias_sync: alias sync='date && echo "Syncing!" && sync && date'
     export_editor: export EDITOR='vi'
     init_aliases: |
@@ -254,12 +251,8 @@
       '
       alias init-prog=init-program
     bye_aliases: |
-      function bye {
-        {{ shutdown_command }}
-      }
-      function goodbye {
-        update -yg
-      }
+      alias bye="{{ shutdown_command }}"
+      alias goodbye="update -yg"
     metasploit_aliases: |
       alias metasploit="msfconsole"
       alias hax="metasploit"
@@ -288,20 +281,16 @@
         unset OPTIND
         unset clean
         unset network
-        du_params="-ha"
         while (( $# > 0 )); do
           case $1 in
             -c | -y | --clean )
               clean="Y" ;;
             -n | -net | --network )
               network="Y" ;;
-            -s | -sum | --summarize )
-              du_params="-sh" ;;
             * )
               echo "
                 ERROR: Option '$1' with value '$2' not recognized.
-                $PROG [-c | -y | --clean] [-n | -net | --network] \
-                [-s | -sum | --summarize]
+                $PROG [-c|-y|--clean] [-n|-net|--network]
               " >&2
               return 1
               ;;
@@ -329,8 +318,8 @@
           echo "Checking $dir..."
           $sudo find $dir -name TRASH | while read trash; do
             if [[ "$trash" != "" && `$sudo ls -a $trash` ]]; then
-              echo "Found $trash:"
-              $sudo du $du_params $trash | sort -h
+              echo "Found $trash with contents:"
+              $sudo du -ha $trash | sort -h
               if [[ "$clean" == "Y" ]]; then
                 echo "Cleaning trash..."
                 $sudo sh -c "cd $trash; rm -rfv ..?* .[!.]* *"
@@ -339,8 +328,8 @@
           done
           $sudo find $dir $maxdepth -name "*"Trash"*" | while read trash; do
             if [[ "$trash" != "" && `$sudo ls -a $trash` ]]; then
-              echo "Found $trash:"
-              $sudo du $du_params $trash | sort -h
+              echo "Found $trash with contents:"
+              $sudo du -ha $trash | sort -h
               if [[ "$clean" == "Y" ]]; then
                 echo "Cleaning trash..."
                 $sudo sh -c "cd $trash; rm -rfv ..?* .[!.]* *"
@@ -356,8 +345,8 @@
             echo "Checking $dir..."
             sudo find $dir -name TRASH | while read trash; do
               if [[ "$trash" != "" && `sudo ls -a $trash` ]]; then
-                echo "Found $trash:"
-                sudo du $du_params $trash | sort -h
+                echo "Found $trash with contents:"
+                sudo du -ha $trash | sort -h
                 if [[ "$clean" == "Y" ]]; then
                   echo "Cleaning trash..."
                   sudo sh -c "cd $trash; rm -rfv ..?* .[!.]* *"
@@ -366,8 +355,8 @@
             done
             sudo find $dir -name .Trash"*" | while read trash; do
               if [[ "$trash" != "" && `sudo ls -a $trash` ]]; then
-                echo "Found $trash:"
-                sudo du $du_params $trash | sort -h
+                echo "Found $trash with contents:"
+                sudo du -ha $trash | sort -h
                 if [[ "$clean" == "Y" ]]; then
                   echo "Cleaning trash..."
                   sudo sh -c "cd $trash; rm -rfv ..?* .[!.]* *"
@@ -420,63 +409,23 @@
       }
     alias_vim: alias vi=vim
     alias_here: alias here='ls -alh `pwd`/*'
-    function_docker_reload: |
-      function docker-reload() {
-        if [[ "$1" == "-h" || "$1" == "--help" ]]; then
-          cat <<- EOF
-            Usage: docker-reload [container_name]
-            Providing the container name starts a log follow after the command.
-            A reload is characterized by a DOWN, BUILD, and UP.
-      EOF
-          return 0
-        fi
-
+    alias_docker_reload: |
+      alias docker-reload='
         docker compose down &&
         docker compose build &&
         docker compose up -d
-
-        if [[ -n "$1" ]]; then
-          docker logs -f $1
-        fi
-
-        return 0
-      }
-    function_docker_update: |
-      function docker-update() {
-        if [[ "$1" == "-h" || "$1" == "--help" ]]; then
-          cat <<- EOF
-            Usage: docker-update [container_name]
-            Providing the container name starts a log follow after the command.
-            An update is characterized by a DOWN, PULL, BUILD, and UP.
-      EOF
-          return 0
-        fi
-
+      '
+    alias_docker_update: |
+      alias docker-update='
         docker compose down &&
         docker compose pull &&
         docker compose build &&
         docker compose up -d
-
-        if [[ -n "$1" ]]; then
-          docker logs -f $1
-        fi
-
-        return 0
-      }
+      '
     function_docker_upgrade: |
       function docker-upgrade() {
         # Wrapper for a full-scale upgrade and log view of a container.
-
-        if [[ "$1" == "-h" || "$1" == "--help" ]]; then
-          cat <<- EOF
-            Usage: docker-upgrade [container_name]
-            Providing the container name starts a log follow after the command.
-            An upgrade is characterized by a DOWN, PULL, BUILD, and UP.
-      EOF
-          return 0
-        fi
-
-        # Parameters:
+        # Paramaters:
         #   1) Container ID or Container Name, as seen in 'docker ps' command.
         container=$1
         if [[ -z $container ]]; then
@@ -506,37 +455,13 @@
         echo "*** Following Log ***" &&
           echo "Press ^C to escape." &&
           docker logs -f $container
-
-        return 0
-      }
-    function_docker_restart: |
-      function docker-restart() {
-        if [[ "$1" == "-h" || "$1" == "--help" ]]; then
-          cat <<- EOF
-            Usage: docker-restart [container_name]
-            Providing the container name starts a log follow after the command.
-            A restart is characterized by a DOWN and UP.
-      EOF
-          return 0
-        fi
-
-        docker compose down &&
-        docker compose up -d
-
-        if [[ -n "$1" ]]; then
-          docker logs -f $1
-        fi
-
-        return 0
       }
+    alias_docker_restart: |
+      alias docker-restart='docker compose down && docker compose up -d'
     alias_code_check: |
       alias code-check='
-        echo "Checking ~/Code directory for git changes."
         ls -d ~/Code/* | while read project; do
-          if [[ ! -d $project ]]; then
-            continue
-          fi
-          echo -e "\n*** `basename $project` ***"
+          echo "*** `basename $project` ***"
           cd $project
           if [[ -d .git ]]; then
             git pull
@@ -545,7 +470,6 @@
             echo "Not a Git project, skipping!"
           fi
         done
-        echo -e "\nDone!"
       '
     alias_code_reset: |
       alias code-reset='
@@ -561,46 +485,29 @@
       '
     function_code_reseed: |
       function git_projects_to_sync {
-        # Projects should be followed by the current development branch name.
         cat <<- EOF
-          env-ansible dev
-          env-docker dev
-          env-termux dev
-          nodejs-website dev
-          ebook-health-protocol dev
-          flutter-expense-tracker dev
-          flutter-social-traveler-app dev
-          nodejs-social-traveler-server dev
-          misc-spare-change main
-          flutter-buddy-website dev
+          env-ansible
+          env-docker
+          env-termux
+          nodejs-website
+          android-break-the-habit
+          android-tictactoe
+          android-expense-tracker
+          android-example-database-room
+          android-carb-up
+          ebook-health-protocol
       EOF
       }
       function code-reseed {
-        # Unseed current projects.
-        echo -e "\n*** Move old projects to TRASH ***"
-        unseed_dir="$HOME/TRASH/`date +%Y%m%d_%H%M%S`_UnseededCodeProjects"
+        unseed_dir="$HOME/TRASH/`date +%Y-%m-%d`_UnseededCodeProjects"
         mkdir -pv "$unseed_dir"
         mv -v ~/Code/* "$unseed_dir"/ 2>/dev/null
-
-        # Git repo information.
         git_repo_ssh={{ git_repo_ssh }}
         git_main_project={{ git_project }}
         git_repo_ssh_basename=${git_repo_ssh//$git_main_project/}
-
-        # Loop over project list.
-        git_projects_to_sync | while read git_project git_branch; do
-          echo -e "\n*** $git_project ***"
-
-          # Project folder manipulation.
-          dest_folder="$git_project"
-          if [[ "$dest_folder" == "flutter-"* ]]; then
-            echo "Using '_' for Flutter Project"
-            dest_folder="${dest_folder//-/_}"
-          fi
-
-          # Download of the project.
+        git_projects_to_sync | while read git_project; do
           git clone ${git_repo_ssh_basename}${git_project} \
-            --branch $git_branch ~/Code/$dest_folder
+            --branch dev ~/Code/$git_project
         done
       }
     function_clean_filenames: |
@@ -633,7 +540,7 @@
         echo -e "\nDone!\n"
       }
     alias_clone: |
-      alias clone="rsync -auPhz --delete --exclude '.gradle' --exclude 'app/build'"
+      alias clone="rsync -auPhz --delete"
     export_hyperling: |
       export HYPERLING6="2a07:e03:3:80::1"
       export HYPERLING4="185.130.47.173"
@@ -645,100 +552,10 @@
       fi
     alias_scan: |
       alias scan="nmap -A -p- --script=vuln"
-    alias_prod: |
-      alias prod="ssh -p {{ prod_port }} {{ prod_user }}@{{ prod_host }}"
-    function_clean_code: |
-      function clean-code {
-        echo -e "******* Android *******\n*** Build Caches ***"
-        find ~/Code/android-*/app -maxdepth 1 -type d -name "build" \
-          -exec du -hs {} \; -exec rm -rf {} \;
-        echo -e "\n*** Gradle Caches ***"
-        find ~/Code/android-*/ -maxdepth 1 -type d -name ".gradle" \
-          -exec du -hs {} \; -exec rm -rf {} \;
-
-        echo -e "******* Flutter *******"
-        ls ~/Code | grep flutter | while read project; do
-          cd ~/Code/$project
-          pwd
-          flutter clean
-          echo -e "\n"
-        done
-        cd
-
-        echo -e "\n*** Done! ***"
-      }
-      alias code-clean="clean-code"
-    alias_kill_battery: |
-      alias kill-battery="stress -c 1k"
-      alias waste-battery="kill-battery"
-      alias battery-killer="kill-battery"
-      alias battery-waster="kill-battery"
-    alias_kill_system: |
-      alias kill-system="stress -c 1k -i 1k -m 1k -d 1k"
-      alias die="kill-system"
-      alias lockup="kill-system"
-      alias freeze="kill-system"
-      alias system-killer="kill-system"
-    function_update_sdks: |
-      if [[ "$workstation" == "true" && "$coding" == "true" ]]; then
-        function update-sdks {
-          echo -e "******* Update SDKs *******\n*** Android - START ***"
-          yes | sdkmanager --update
-          yes | sdkmanager --licenses
-          echo -ne "*** Android - END ***"
-
-          echo -e "\n*** Flutter - START ***"
-          flutter upgrade
-          yes | flutter doctor --android-licenses
-          echo -ne "*** Flutter - END ***"
-
-          echo -e "\n******* Done! *******"
-        }
-        alias update-sdk="update-sdks"
-        alias sdk-update="update-sdks"
-        alias sdk-updater="update-sdks"
-      fi
-    function_ansible_vars: |
-      function ansible-var-list {
-        cat << EOF
-          provision
-          battery
-          workstation
-          coding
-          editing
-          gaming
-          mobile
-          server
-          domain
-      EOF
-      }
-      function ansible-vars {
-        ansible-var-list | while read var; do
-          echo "$var = ${!var}"
-        done
-      }
-    alias_permission_commands: |
-      alias chown='chown -c'
-      alias chmod='chmod -c'
 
 - name: General | Account Management | Users | Files | Common Variable
   set_fact:
     rc_common: |
-      # Fixes "command not found" when using aliases within functions.
-      shopt -s expand_aliases
-
-      # Variables for conditionals and quickly checking system setup.
-      typeset -l provision battery workstation coding editing gaming mobile server domain
-      export provision="{{ provision }}"
-      export battery="{{ battery }}"
-      export workstation="{{ workstation }}"
-      export coding="{{ coding }}"
-      export editing="{{ editing }}"
-      export gaming="{{ gaming }}"
-      export mobile="{{ mobile }}"
-      export server="{{ server }}"
-      export domain="{{ domain }}"
-
       {{ export_path_additions }}
       {{ alias_cp }}
       {{ alias_mv }}
@@ -763,10 +580,10 @@
       {{ function_flatpak_purge }}
       {{ alias_vim }}
       {{ alias_here }}
-      {{ function_docker_reload }}
-      {{ function_docker_update }}
+      {{ alias_docker_reload }}
+      {{ alias_docker_update }}
       {{ function_docker_upgrade }}
-      {{ function_docker_restart }}
+      {{ alias_docker_restart }}
       {{ alias_code_check }}
       {{ alias_code_reset }}
       {{ function_code_reseed }}
@@ -776,13 +593,6 @@
       {{ export_hyperling }}
       {{ source_docker_env }}
       {{ alias_scan }}
-      {{ alias_prod }}
-      {{ function_clean_code }}
-      {{ alias_kill_battery }}
-      {{ alias_kill_system }}
-      {{ function_update_sdks }}
-      {{ function_ansible_vars }}
-      {{ alias_permission_commands }}
 
 - name: General | Account Management | Users | Files | .bashrc
   blockinfile:

tasks/general/scripts/root.yml

@@ -6,7 +6,9 @@
     path: "{{ user_root.home }}/bin/scm.sh"
     block: |
       # 20210211 - Make life easier!
-      time {{ ansible_pull_exec.stdout }} -U {{ git_repo_http }}
+      git clone {{ git_repo_http }} ansible-pull
+      ansible-pull/setup.sh
+      mv ansible-pull ~/TRASH/
     marker: '{mark}'
     marker_begin: "#!{{ bash_exec.stdout }}"
     marker_end: "exit 0"

tasks/general/scripts/user.yml

@@ -6,7 +6,9 @@
     path: "{{ user_user.home }}/bin/scm.sh"
     block: |
       # 20210211 - Make life easier!
-      time {{ ansible_pull_exec.stdout }} -U {{ git_repo_http }}
+      git clone {{ git_repo_http }} ansible-pull
+      ansible-pull/setup.sh
+      mv ansible-pull ~/TRASH/
     marker: '{mark}'
     marker_begin: "#!{{ bash_exec.stdout }}"
     marker_end: "exit 0"

tasks/general/software/hyperling.yml

@@ -1,6 +0,0 @@
----
-# Software that I've written for personal use, to be placed in `~/bin/`.
-
-# TODO TBD - Add content here and place this in local.yml! :)
-
-# Refactor Music Library

tasks/general/software/packages.yml

@@ -137,19 +137,3 @@
     state: absent
   when: ansible_distribution != "Ubuntu"
   ignore_errors: yes
-
-- name: General | Software | Packages | GS Connect (KDE Connect, Android Tool)
-  package:
-    name:
-    - gnome-shell-extension-gsconnect
-    state: present
-  when: ansible_distribution in ("Debian")
-  ignore_errors: yes
-
-- name: General | Software | Packages | Other Debian Packages
-  package:
-    name:
-    - usbutils
-    state: present
-  when: ansible_distribution in ("Debian")
-  ignore_errors: yes

tasks/general/tests/lynis.yml

@@ -9,6 +9,10 @@
   set_fact:
     lynis_temp_file: "{{ lynis_file }}.tmp"
 
+- name: General | Tests | Lynis | Rename Old Install
+  shell: mv "/usr/local/lynis" "/usr/local/src/"
+  ignore_errors: yes
+
 - name: General | Tests | Lynis | Install
   git: 
     repo: https://github.com/CISOfy/lynis

tasks/workstation/freebsd/software/packages.yml

@@ -44,7 +44,7 @@
     - shotcut
     - obs-studio
     state: present
-  when: editing in (true, "video")
+  when: editing == true
 
 - name: Workstation | FreeBSD | Software | Packages | Editing | Install
   package: 
@@ -53,7 +53,7 @@
     - shotcut
     - obs-studio
     state: absent
-  when: not editing in (true, "video")
+  when: not editing == true
 
 # Gaming #
 

tasks/workstation/linux/software/android.yml

@@ -1,223 +0,0 @@
----
-# Android Studio (and SDK?). Copied and adjusted from Flutter playbook.
-# https://wiki.debian.org/AndroidStudio
-# https://developer.android.com/studio/install
-
-## Facts ##
-
-# Studio download URLs:
-#   https://developer.android.com/studio/archive
-# Current version:
-#   https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2024.2.2.14/android-studio-2024.2.2.14-linux.tar.gz
-# Command-line tools is all Flutter actually needs:
-#   https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip
-
-- name: Workstation | Linux | Software | Android | Facts [1/3]
-  set_fact:
-    android_url: "https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip"
-    android_download_file: "{{ user_user.home }}/Downloads/android-cmdline-tools.tar.xz"
-    android_sdk_location: "{{ user_user.home }}/SDKs/Android/Sdk"
-
-- name: Workstation | Linux | Software | Android | Facts [2/3]
-  set_fact:
-    android_bin_location: "{{ android_sdk_location }}/platform-tools"
-    android_sdk_cmdline_temp: "{{ android_sdk_location }}/ansible"
-    android_sdk_cmdline_final: "{{ android_sdk_location }}/cmdline-tools/latest/bin"
-
-- name: Workstation | Linux | Software | Android | Facts [3/3]
-  set_fact:
-    android_sdkmanager_temp: "{{ android_sdk_cmdline_temp }}/cmdline-tools/bin/sdkmanager"
-    android_sdkmanager_final: "{{ android_sdk_cmdline_final }}/sdkmanager"
-
-## Checks ##
-
-- name: Workstation | Linux | Software | Android | Check SDK Manager Exists [1/2]
-  stat:
-    path: "{{ android_sdkmanager_temp }}"
-  register: android_sdkmanager_temp_stat
-  when: coding == true
-
-- name: Workstation | Linux | Software | Android | Check SDK Manager Exists [2/2]
-  stat:
-    path: "{{ android_sdkmanager_final }}"
-  register: android_sdkmanager_final_stat
-  when: coding == true
-
-- name: Workstation | Linux | Software | Android | Check Download Exists
-  stat:
-    path: "{{ android_download_file }}"
-  register: android_download_stat
-  when: coding == true
-
-## Packages ##
-
-# https://docs.flutter.dev/get-started/install/linux/android
-- name: Workstation | Linux | Software | Android | Dependencies [Install]
-  package:
-    name:
-      - default-jdk
-      - libc6
-      - libncurses5
-      - libstdc++6
-      - lib32z1
-      - libbz2-1.0
-    state: present
-  when: coding == true
-
-- name: Workstation | Linux | Software | Android | Dependencies [Remove]
-  package:
-    name:
-      - sdkmanager
-    state: absent
-  when: coding == true
-
-## Install SDK ##
-
-- name: Workstation | Linux | Software | Android | SDK
-  block:
-
-  - name: Workstation | Linux | Software | Android | Download Commandline Tools
-    get_url:
-      url: "{{ android_url }}"
-      dest: "{{ android_download_file }}"
-      owner: "{{ user }}"
-      group: "{{ user }}"
-      mode: '0664'
-    when: not android_download_stat.stat.exists
-
-  - name: Workstation | Linux | Software | Android | Create Folder
-    file:
-      path: "{{ android_sdk_cmdline_temp }}"
-      state: directory
-      owner: "{{ user }}"
-      group: "{{ user }}"
-      mode: '0755'
-
-  - name: Workstation | Linux | Software | Android | Extract Tools
-    unarchive:
-      src: "{{ android_download_file }}"
-      dest: "{{ android_sdk_cmdline_temp }}"
-      owner: "{{ user }}"
-      group: "{{ user }}"
-
-  become_user: "{{ user }}"
-  when: coding == true and not android_sdkmanager_temp_stat.stat.exists
-
-- name: Workstation | Linux | Software | Android | Delete Archive
-  file:
-    path: "{{ android_download_file }}"
-    state: absent
-
-## Configure Modules ##
-
-# This can only be run once, otherwise cmdline-tools creates latest-* folders.
-- name: Workstation | Linux | Software | Android | Install Consistent Modules
-  shell: "yes | {{ android_sdkmanager_temp }} --install '{{ item }}' --sdk_root={{ android_sdk_location }}"
-  loop:
-    # Current
-    - cmdline-tools;latest
-    - platform-tools
-    - emulator
-  become_user: "{{ user }}"
-  when: coding == true and not android_sdkmanager_final_stat.stat.exists
-
-# These are safe to run multiple times, and uses the new `latest` version.
-- name: Workstation | Linux | Software | Android | Install Modules
-  shell: "yes | {{ android_sdkmanager_final }} --install '{{ item }}' --sdk_root={{ android_sdk_location }}"
-  loop:
-    # 34
-    - build-tools;34.0.0
-    - platforms;android-34
-    - sources;android-34
-    # 35
-    - build-tools;35.0.0
-    - build-tools;35.0.1
-    - platforms;android-35
-    - sources;android-35
-    # Images
-    #- system-images;android-35;default;x86_64
-    #- system-images;android-35;aosp_atd;x86_64
-    - system-images;android-35;google_apis_playstore;x86_64
-  become_user: "{{ user }}"
-  when: coding == true
-
-- name: Workstation | Linux | Software | Android | Inform Flutter
-  shell: "{{ flutter }} config --android-sdk={{ android_sdk_location }}"
-  become_user: "{{ user }}"
-  when: coding == true
-
-- name: Workstation | Linux | Software | Android | Licenses Agreements [1/2]
-  shell: "yes | {{ android_sdkmanager_final }} --licenses --sdk_root={{ android_sdk_location }}"
-  become_user: "{{ user }}"
-  when: coding == true
-
-- name: Workstation | Linux | Software | Android | License Agreements [2/2]
-  shell: "yes | {{ flutter }} doctor --android-licenses"
-  become_user: "{{ user }}"
-  when: coding == true
-
-- name: Workstation | Linux | Software | Android | Refresh Flutter Doctor Report
-  shell: "{{ item }}"
-  loop: "{{ flutter_report_commands }}"
-  become_user: "{{ user }}"
-  when: coding == true
-
-## Configure Environment ##
-
-- name: Workstation | Linux | Software | Android | Modify PATH (.bashrc)
-  blockinfile:
-    path: "{{ item }}/.bashrc"
-    block: |
-      export PATH="$PATH:{{ android_bin_location }}:{{ android_sdk_cmdline_final }}"
-    marker: '# {mark} MANAGED BY ANSIBLE | Android'
-    state: present
-    create: yes
-    backup: yes
-  loop:
-    - "{{ user_root.home }}"
-    - "{{ user_user.home }}"
-  ignore_errors: yes
-  when: coding == true and user_root.home != "" and user_user.home != ""
-
-- name: Workstation | Linux | Software | Android | Modify PATH (.zshrc)
-  blockinfile:
-    path: "{{ item }}/.zshrc"
-    block: |
-      export PATH="$PATH:{{ android_bin_location }}:{{ android_sdk_cmdline_final }}"
-    marker: '# {mark} MANAGED BY ANSIBLE | Android'
-    state: present
-    create: yes
-    backup: yes
-  loop:
-    - "{{ user_root.home }}"
-    - "{{ user_user.home }}"
-  ignore_errors: yes
-  when: coding == true and user_root.home != "" and user_user.home != ""
-
-## Uninstall SDK ##
-
-- name: Workstation | Linux | Software | Android | Remove SDK
-  file:
-    path: "{{ android_sdk_location }}"
-    state: absent
-  when: not coding == true
-
-## User Tools ##
-#   Only needed from repo if not a development device,
-#   otherwise better versions are in the SDK.
-
-- name: Workstation | Linux | Software | Android | System Tools [Install]
-  package:
-    name:
-      - fastboot
-      - adb
-    state: present
-  when: not coding == true
-
-- name: Workstation | Linux | Software | Android | System Tools [Remove]
-  package:
-    name:
-      - fastboot
-      - adb
-    state: absent
-  when: coding == true

tasks/workstation/linux/software/brave.yml

@@ -60,21 +60,28 @@
       - brave-browser
       - brave-keyring
     state: absent
+  ignore_errors: yes
 
 - name: Workstation | Software | Brave | Remove Repo [apt]
-  shell: rm /etc/apt/sources.list.d/brave-browser-*.list && apt update || echo "Not Needed"
+  shell: "{{ item }}"
+  loop:
+    - rm /etc/apt/sources.list.d/brave-browser-*.list
+    - apt update
   when: ansible_pkg_mgr == "apt"
+  ignore_errors: yes
 
 - name: Workstation | Software | Brave | Remove Repo [dnf]
   shell: "{{ item }}"
   loop:
-    - rm /etc/yum.repos.d/brave-browser-*.repo || echo "Not Needed"
-    - rpm -e gpg-pubkey-c2d4e821-5e7252b8 || echo "Not Needed"
+    - rm /etc/yum.repos.d/brave-browser-*.repo
+    - rpm -e gpg-pubkey-c2d4e821-5e7252b8
   when: ansible_pkg_mgr == "dnf"
+  ignore_errors: yes
 
 - name: Workstation | Software | Brave | Remove Repo [zypper]
   shell: "{{ item }}"
   loop:
-    - zypper removerepo brave-browser || echo "Not Needed"
-    - rpm -e gpg-pubkey-c2d4e821-5e7252b8 || echo "Not Needed"
+    - zypper removerepo brave-browser
+    - rpm -e gpg-pubkey-c2d4e821-5e7252b8
   when: ansible_pkg_mgr == "zypper"
+  ignore_errors: yes

tasks/workstation/linux/software/flatpaks.yml

@@ -24,6 +24,7 @@
     method: system
     flatpakrepo_url: https://flathub.org/repo/flathub.flatpakrepo
 
+
 ## Flatpak Installs ##
 
 - name: Workstation | Linux | Flatpak Distro | Flatpak | Variables
@@ -39,18 +40,17 @@
       - { app: "org.signal.Signal", name: "signal", extra: "" }
       - { app: "org.mozilla.firefox", name: "firefox-flatpak", extra: "" }
       - { app: "com.transmissionbt.Transmission", name: "transmission", extra: "" }
-      - { app: "org.gimp.GIMP", name: "gimp", extra: "" }
     flatpaks_coding:
-      - { app: "com.vscodium.codium", name: "codium-flatpak", extra: "" }
+      - { app: "com.vscodium.codium", name: "codium", extra: "" }
       - { app: "com.google.AndroidStudio", name: "android-studio", extra: "" }
       - { app: "io.dbeaver.DBeaverCommunity", name: "dbeaver", extra: "" }
       - { app: "org.godotengine.Godot", name: "godot", extra: "" }
       - { app: "com.visualstudio.code-oss", name: "code", extra: "" }
-    flatpaks_editing_video:
+    flatpaks_editing:
       - { app: "org.shotcut.Shotcut", name: "shotcut", extra: "" }
       - { app: "com.obsproject.Studio", name: "obs", extra: "" }
+      - { app: "org.gimp.GIMP", name: "gimp", extra: "" }
       - { app: "org.openshot.OpenShot", name: "openshot", extra: "" }
-    flatpaks_editing_audio:
       - { app: "org.tenacityaudio.Tenacity", name: "tenacity", extra: "" }
       - { app: "io.lmms.LMMS", name: "lmms", extra: "" }
       - { app: "net.sourceforge.VMPK", name: "vmpk", extra: "" }
@@ -158,62 +158,14 @@
 
 # Media Editors #
 
-- name: Workstation | Linux | Flatpak Distro | Flatpak | Video Editors | Installs
+- name: Workstation | Linux | Flatpak Distro | Flatpak | Audio/Video Editors | Installs
   flatpak:
     name: "{{ item.app }}"
     remote: flathub
     state: present
-  loop: "{{ flatpaks_editing_video }}"
+  loop: "{{ flatpaks_editing }}"
   ignore_errors: yes
-  when: editing in (true, "video")
-
-- name: Workstation | Linux | Flatpak Distro | Flatpak | Video Editors | Executables
-  blockinfile:
-    path: "{{ flatpak_exec_dir }}/{{ item.name }}"
-    block: |
-      {{ item.extra }} {{ flatpak_exec }} {{ item.app }}
-    marker: '{mark}'
-    marker_begin: "#!{{ bash_exec.stdout }}"
-    marker_end: "exit 0"
-    state: present
-    create: yes
-  loop: "{{ flatpaks_editing_video }}"
-  become_user: "{{ user }}"
-  when: editing in (true, "video")
-
-- name: Workstation | Linux | Flatpak Distro | Flatpak | Video Editors | Executable Permissions
-  file:
-    path: "{{ flatpak_exec_dir }}/{{ item.name }}"
-    state: file
-    mode: '0755'
-  loop: "{{ flatpaks_editing_video }}"
-  when: editing in (true, "video")
-
-- name: Workstation | Linux | Flatpak Distro | Flatpak | Video Editor Uninstalls
-  flatpak:
-    name: "{{ item.app }}"
-    remote: flathub
-    state: absent
-  loop: "{{ flatpaks_editing_video }}"
-  ignore_errors: yes
-  when: not editing in (true, "video")
-
-- name: Workstation | Linux | Flatpak Distro | Flatpak | Video Editors | Remove Executables
-  file:
-    path: "{{ flatpak_exec_dir }}/{{ item.name }}"
-    state: absent
-  loop: "{{ flatpaks_editing_video }}"
-  ignore_errors: yes
-  when: not editing in (true, "video")
-
-- name: Workstation | Linux | Flatpak Distro | Flatpak | Audio Editors | Installs
-  flatpak:
-    name: "{{ item.app }}"
-    remote: flathub
-    state: present
-  loop: "{{ flatpaks_editing_audio }}"
-  ignore_errors: yes
-  when: editing in (true, "audio")
+  when: editing == true
 
 - name: Workstation | Linux | Flatpak Distro | Flatpak | Audio/Video Editors | Executables
   blockinfile:
@@ -225,34 +177,34 @@
     marker_end: "exit 0"
     state: present
     create: yes
-  loop: "{{ flatpaks_editing_audio }}"
+  loop: "{{ flatpaks_editing }}"
   become_user: "{{ user }}"
-  when: editing in (true, "audio")
+  when: editing == true
 
 - name: Workstation | Linux | Flatpak Distro | Flatpak | Audio/Video Editors | Executable Permissions
   file:
     path: "{{ flatpak_exec_dir }}/{{ item.name }}"
     state: file
     mode: '0755'
-  loop: "{{ flatpaks_editing_audio }}"
-  when: editing in (true, "audio")
+  loop: "{{ flatpaks_editing }}"
+  when: editing == true
 
 - name: Workstation | Linux | Flatpak Distro | Flatpak | Audio/Video Editor Uninstalls
   flatpak:
     name: "{{ item.app }}"
     remote: flathub
     state: absent
-  loop: "{{ flatpaks_editing_audio }}"
+  loop: "{{ flatpaks_editing }}"
   ignore_errors: yes
-  when: not editing in (true, "audio")
+  when: not editing == true
 
 - name: Workstation | Linux | Flatpak Distro | Flatpak | Audio/Video Editors | Remove Executables
   file:
     path: "{{ flatpak_exec_dir }}/{{ item.name }}"
     state: absent
-  loop: "{{ flatpaks_editing_audio }}"
+  loop: "{{ flatpaks_editing }}"
   ignore_errors: yes
-  when: not editing in (true, "audio")
+  when: not editing == true
 
 # Gaming #
 

tasks/workstation/linux/software/flutter.yml

@@ -1,171 +0,0 @@
----
-# Packages specific to workstations developing Flutter apps.
-
-## Facts ##
-
-- name: Workstation | Linux | Software | Flutter | Facts [1/4]
-  set_fact:
-    flutter_url: "https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.27.2-stable.tar.xz"
-    flutter_download_file: "{{ user_user.home }}/Downloads/flutter.tar.xz"
-    flutter_sdk_location: "{{ user_user.home }}/SDKs/Flutter"
-    flutter_report: "{{ user_user.home }}/Reports/flutter.txt"
-  when: coding == true
-
-- name: Workstation | Linux | Software | Flutter | Facts [2/4]
-  set_fact:
-    flutter_bin_location: "{{ flutter_sdk_location }}/flutter/bin"
-  when: coding == true
-
-- name: Workstation | Linux | Software | Flutter | Facts [3/4]
-  set_fact:
-    flutter: "{{ flutter_bin_location }}/flutter"
-  when: coding == true
-
-- name: Workstation | Linux | Software | Flutter | Facts [3/3]
-  set_fact:
-    flutter_report_commands:
-      - "date > {{ flutter_report }}"
-      - "{{ flutter }} --disable-analytics >> {{ flutter_report }}"
-      - "date >> {{ flutter_report }}"
-      - "{{ flutter }} doctor -v >> {{ flutter_report }}"
-      - "date >> {{ flutter_report }}"
-  when: coding == true
-
-## Checks ##
-
-- name: Workstation | Linux | Software | Flutter | Check SDK Exists
-  stat:
-    path: "{{ flutter_sdk_location }}"
-  register: flutter_sdk_stat
-  when: coding == true
-
-- name: Workstation | Linux | Software | Flutter | Check Download Exists
-  stat:
-    path: "{{ flutter_download_file }}"
-  register: flutter_download_stat
-  when: coding == true
-
-## Packages ##
-
-- name: Workstation | Linux | Software | Flutter | Necessities
-  package:
-    name:
-    - curl
-    - git
-    - unzip
-    - xz-utils
-    - zip
-    - libglu1-mesa
-    state: present
-  when: coding == true
-
-# https://docs.flutter.dev/get-started/install/linux/desktop
-- name: Workstation | Linux | Software | Flutter | Linux App Dependencies
-  package:
-    name:
-    - clang
-    - cmake
-    - git
-    - ninja-build
-    - pkg-config
-    - libgtk-3-dev
-    - liblzma-dev
-    - libstdc++-12-dev
-    state: present
-  when: coding == true
-
-# https://docs.flutter.dev/get-started/install/linux/android
-- name: Workstation | Linux | Software | Flutter | Android App Dependencies
-  package:
-    name:
-      - libc6:amd64
-      - libstdc++6
-      - lib32z1
-      - libbz2-1.0
-    state: present
-  when: coding == true
-
-## Install SDK ##
-
-- name: Workstation | Linux | Software | Flutter | SDK
-  block:
-
-  - name: Workstation | Linux | Software | Flutter | Download SDK
-    get_url:
-      url: "{{ flutter_url }}"
-      dest: "{{ flutter_download_file }}"
-      owner: "{{ user }}"
-      group: "{{ user }}"
-      mode: '0664'
-    when: not flutter_download_stat.stat.exists
-
-  - name: Workstation | Linux | Software | Flutter | Create Folder
-    file:
-      path: "{{ flutter_sdk_location }}"
-      state: directory
-      owner: "{{ user }}"
-      group: "{{ user }}"
-      mode: '0755'
-
-  - name: Workstation | Linux | Software | Flutter | Extract SDK
-    unarchive:
-      src: "{{ flutter_download_file }}"
-      dest: "{{ flutter_sdk_location }}"
-      owner: "{{ user }}"
-      group: "{{ user }}"
-
-  become_user: "{{ user }}"
-  when: coding == true and not flutter_sdk_stat.stat.exists
-
-- name: Workstation | Linux | Software | Flutter | Delete Archive
-  file:
-    path: "{{ flutter_download_file }}"
-    state: absent
-
-## Configure Environment ##
-
-- name: Workstation | Linux | Software | Flutter | Modify PATH (.bashrc)
-  blockinfile:
-    path: "{{ item }}/.bashrc"
-    block: |
-      export PATH="$PATH:{{ flutter_bin_location }}"
-    marker: '# {mark} MANAGED BY ANSIBLE | Flutter'
-    state: present
-    create: yes
-    backup: yes
-  loop:
-    - "{{ user_root.home }}"
-    - "{{ user_user.home }}"
-  ignore_errors: yes
-  when: coding == true and user_root.home != "" and user_user.home != ""
-
-- name: Workstation | Linux | Software | Flutter | Modify PATH (.zshrc)
-  blockinfile:
-    path: "{{ item }}/.zshrc"
-    block: |
-      export PATH="$PATH:{{ flutter_bin_location }}"
-    marker: '# {mark} MANAGED BY ANSIBLE | Flutter'
-    state: present
-    create: yes
-    backup: yes
-  loop:
-    - "{{ user_root.home }}"
-    - "{{ user_user.home }}"
-  ignore_errors: yes
-  when: coding == true and user_root.home != "" and user_user.home != ""
-
-## Test SDK ##
-
-- name: Workstation | Linux | Software | Flutter | Doctor Report
-  shell: "{{ item }}"
-  loop: "{{ flutter_report_commands }}"
-  become_user: "{{ user }}"
-  when: coding == true
-
-## Uninstall SDK ##
-
-- name: Workstation | Linux | Software | Flutter | Remove SDK
-  file:
-    path: "{{ flutter_sdk_location }}"
-    state: absent
-  when: not coding == true

tasks/workstation/linux/software/lutris.yml

@@ -1,76 +0,0 @@
----
-# Lutris for running Windows games not in Steam.
-#   https://lutris.net/downloads
-
-# Paths
-
-- name: Workstation | Linux | Software | Lutris | Facts
-  set_fact:
-    lutris_source_list: "/etc/apt/sources.list.d/lutris.list"
-    lutris_keyfile: "/usr/share/keyrings/lutris.gpg"
-  when: ansible_pkg_mgr == "apt"
-
-# Checks
-
-- name: Workstation | Linux | Software | Lutris | Check PPA
-  stat:
-    path: "{{ lutris_source_list }}"
-  register: lutris_source_exists
-  when: ansible_pkg_mgr == "apt"
-
-## Install Repo ##
-
-- name: Workstation | Linux | Software | Lutris | Add PPA (Ubuntu)
-  apt_repository:
-    repo: ppa:lutris-team/lutris
-    update_cache: yes
-    state: present
-  when: ansible_distribution in ("Ubuntu") and gaming == true
-  ignore_errors: yes
-
-- name: Workstation | Linux | Software | Lutris | Add PPA (Debian)
-  shell: "{{ item }}"
-  loop:
-    - "wget -q -O- https://download.opensuse.org/repositories/home:/strycore/Debian_12/Release.key \
-      | gpg --dearmor \
-      | sudo tee {{ lutris_keyfile }} > /dev/null"
-    - "echo 'deb [signed-by={{ lutris_keyfile }}] https://download.opensuse.org/repositories/home:/strycore/Debian_12/ ./' \
-      | sudo tee {{ lutris_source_list }} > /dev/null"
-    - "sudo apt update"
-  when: ansible_distribution in ("Debian") and gaming == true and not lutris_source_exists.stat.exists
-
-## Install Package ##
-
-- name: Workstation | Linux | Software | Lutris | Install (besides ARM)
-  package:
-    name:
-      - lutris
-    state: present
-  when: ansible_architecture != "aarch64" and gaming == true
-
-## Uninstall Package ##
-
-- name: Workstation | Linux | Software | Lutris | Uninstall (besides ARM)
-  package:
-    name:
-      - lutris
-    state: absent
-  when: ansible_architecture != "aarch64" and gaming != true
-
-## Uninstall Repo ##
-
-- name: Workstation | Linux | Software | Lutris | Remove PPA (Ubuntu)
-  apt_repository:
-    repo: ppa:lutris-team/lutris
-    update_cache: yes
-    state: absent
-  when: ansible_distribution in ("Ubuntu") and gaming != true
-  ignore_errors: yes
-
-- name: Workstation | Linux | Software | Lutris | Remove PPA (Debian)
-  shell: "{{ item }}"
-  loop:
-    - "mv {{ lutris_source_list }} ~/TRASH/"
-    - "mv {{ lutris_keyfile }} ~/TRASH/"
-    - "sudo apt update"
-  when: ansible_distribution in ("Debian") and gaming != true and lutris_source_exists.stat.exists

tasks/workstation/linux/software/packages.yml

@@ -24,7 +24,7 @@
     name:
     - "{{ ffmpeg }}"
     state: present
-  when: editing in (true, "video", "audio")
+  when: editing == true
 
 
 ## Other Stuff
@@ -38,9 +38,42 @@
       - "{{ appimagelauncher }}"
       - "{{ evolution }}"
       - "{{ evolution }}*"
-      - gparted
     state: present
 
+# Lutris #
+
+- name: Workstation | Linux | Software | Packages | Add Lutris PPA (Ubuntu)
+  apt_repository:
+    repo: ppa:lutris-team/lutris
+    update_cache: yes
+    state: present
+  when: ansible_distribution == "Ubuntu" and gaming == true
+  ignore_errors: yes
+
+- name: Workstation | Linux | Software | Packages | Add Lutris (besides ARM)
+  package:
+    name:
+      - lutris
+    state: present
+  when: ansible_architecture != "aarch64" and gaming == true
+  ignore_errors: yes
+
+- name: Workstation | Linux | Software | Packages | Remove Lutris (besides ARM)
+  package:
+    name:
+      - lutris
+    state: absent
+  when: ansible_architecture != "aarch64" and gaming is not defined
+  ignore_errors: yes
+
+- name: Workstation | Linux | Software | Packages | Remove Lutris PPA (Ubuntu)
+  apt_repository:
+    repo: ppa:lutris-team/lutris
+    update_cache: yes
+    state: absent
+  when: ansible_distribution == "Ubuntu" and gaming is not defined
+  ignore_errors: yes
+
 # Remove Repo Software #
 
 - name: Workstation | Linux | Software | Packages | Remove Applications

tasks/workstation/linux/software/vscodium.yml

@@ -1,67 +0,0 @@
----
-# Install version of Codium which can use local compilers and SDKs like Flutter
-#   properly. Flatpaks need workarounds to do this. This also lets us remove
-#   CodeOSS and use Codium in 2 ways.
-# Commands sourced and modified based on:
-#   https://vscodium.com/#install-on-debian-ubuntu-deb-package
-# This also exists but was not utilized:
-#   https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo
-
-## Facts ##
-
-# Paths
-
-- name: Workstation | Linux | Software | VS Codium | Facts
-  set_fact:
-    vscodium_source_list: "/etc/apt/sources.list.d/vscodium.list"
-    vscodium_keyfile: "/usr/share/keyrings/vscodium.gpg"
-  when: ansible_pkg_mgr == "apt"
-
-# Checks
-
-- name: Workstation | Linux | Software | VS Codium | Check PPA
-  stat:
-    path: "{{ vscodium_source_list }}"
-  register: vscodium_source_exists
-  when: ansible_pkg_mgr == "apt"
-
-## Install Repo ##
-
-- name: Workstation | Linux | Software | VS Codium | Add PPA
-  shell: "{{ item }}"
-  loop:
-    - "wget -qO - https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/raw/master/pub.gpg \
-      | gpg --dearmor \
-      | sudo tee {{ vscodium_keyfile }} > /dev/null"
-    - "echo 'deb [arch=amd64,arm64 signed-by={{ vscodium_keyfile }}] https://download.vscodium.com/debs vscodium main' \
-      | sudo tee {{ vscodium_source_list }}"
-    - "sudo apt update"
-  when: ansible_pkg_mgr == "apt" and coding == true and not vscodium_source_exists.stat.exists
-
-## Install Package ##
-
-- name: Workstation | Linux | Software | VS Codium | Install
-  package:
-    name:
-      - codium
-    state: present
-  when: ansible_pkg_mgr == "apt" and coding == true
-
-## Remove Package ##
-
-- name: Workstation | Linux | Software | VS Codium | Uninstall
-  package:
-    name:
-      - codium
-    state: absent
-  when: ansible_pkg_mgr == "apt" and coding != true
-
-## Remove Repo ##
-
-- name: Workstation | Linux | Software | VS Codium | Remove PPA
-  shell: "{{ item }}"
-  loop:
-    - "mv {{ vscodium_source_list }} ~/TRASH/"
-    - "mv /etc/apt/keyrings/vscodium*.gpg ~/TRASH/"
-    - "sudo apt update"
-  when: ansible_pkg_mgr == "apt" and coding != true and vscodium_source_exists.stat.exists

tasks/workstation/mac-os/software/brew.yml

@@ -22,19 +22,13 @@
     status: present
   when: coding == true
 
-- name: Workstation | Mac OS | Software | Brew | Install Packages (Editing:Video)
-  package:
-    name:
-      - shotcut
-    status: present
-  when: editing in (true, "video")
-
-- name: Workstation | Mac OS | Software | Brew | Install Packages (Editing:Audio)
+- name: Workstation | Mac OS | Software | Brew | Install Packages (Editing)
   package:
     name:
       - audacity
+      - shotcut
     status: present
-  when: editing in (true, "audio")
+  when: editing == true
 
 - name: Workstation | Mac OS | Software | Brew | Install Packages (Gaming)
   package:

tasks/workstation/shared/settings/gnome.yml

@@ -17,12 +17,11 @@
                       , 'org.telegram.desktop.desktop'
                       , 'com.discordapp.Discord.desktop'
                       , 'com.vscodium.codium.desktop'
-                      , 'codium.desktop'
+                      , 'com.google.AndroidStudio.desktop'
                       , 'org.shotcut.Shotcut.desktop'
                       , 'io.lmms.LMMS.desktop'
                       , 'io.lbry.lbry-app.desktop', 'lbry.desktop'
                       , 'com.valvesoftware.Steam.desktop'
-                      , 'net.lutris.Lutris.desktop'
                       ]"
     dconf_terminal: gnome-terminal
     dconf_theme: Adwaita-dark
@@ -34,11 +33,8 @@
 #, 'org.mozilla.Thunderbird.desktop'
 # 2025-01-01
 # Reduce the amount of icons on the sidebar, things that may get added back.
-#, 'org.godotengine.Godot.desktop'
-# 2025-03-07 Removed in place of a 2nd VS Codium install (apt version).
 #, 'com.visualstudio.code-oss.desktop', 'code-oss.desktop'
-# 2025-03-21 Not really using Android Studio now that Flutter is working.
-#, 'com.google.AndroidStudio.desktop'
+#, 'org.godotengine.Godot.desktop'
 
 - name: Workstation | Account Management | GNOME | Facts (NixOS)
   set_fact: