Move log functions to shared.

tasks/general/acct_mgmt/users.yml

@@ -892,13 +892,6 @@
       alias prod-backup="pull_prod_backups"
       alias pull-prod="pull_prod_backups"
       alias prod-pull="pull_prod_backups"
-    function_log: |
-      function log {
-        echo -e "$1"
-      }
-      function blog {
-        echo -e "\n\n$1\n\n"
-      }
     function_debian_upgrade: |
       function debian-upgrade {
         typeset -l OLD NEW
@@ -1177,7 +1170,6 @@
       {{ alias_ansible_facts }}
       {{ function_backup }}
       {{ function_pull_prod_backups }}
-      {{ function_log }}
       {{ function_debian_upgrade }}
       {{ function_ebook_convert }}
       {{ alias_sudo }}

tasks/general/software/metasploit.yml

@@ -6,6 +6,11 @@
     metasploit_installer: msfinstall
   when: ansible_system in ("Linux", "Darwin")
 
+- name: General | Software | Metasploit | Check Install Status
+  stat:
+    path: /usr/bin/msfconsole
+  register: metasploit_status
+
 - name: General | Software | Metasploit | Refresh Apt Files
   shell: "{{ item }}"
   loop:
@@ -13,7 +18,8 @@
     - "mv -fv /usr/share/keyrings/metasploit-framework.gpg /tmp/apt/metasploit-framework.gpg.old"
     - "mv -fv /etc/apt/sources.list.d/metasploit-framework.list /tmp/apt/metasploit-framework.list.old"
     - "mv -fv /etc/apt/preferences.d/pin-metasploit.pref /tmp/apt/pin-metasploit.pref.old"
-  when: ansible_system in ("Linux")
+  when: ansible_system in ("Linux") and
+        not metasploit_status.stat.exists
   ignore_errors: true
 
 - name: General | Software | Metasploit | Install
@@ -24,4 +30,5 @@
     - "mkdir -p {{ global_bin }}"
     - "mv -fv ./msfinstall {{ global_bin }}/{{ metasploit_installer }}"
     - yes y | "{{ global_bin }}/{{ metasploit_installer }}"
-  when: ansible_system in ("Linux", "Darwin")
+  when: ansible_system in ("Linux", "Darwin") and
+        not metasploit_status.stat.exists

tasks/general/software/services.yml

@@ -98,14 +98,15 @@
 
 ## Bluetooth ##
 # Do people seriously depend on Bluetooth? Plug your devices in, silly!
+# Hehe, I use it now for a few rare things so disabling this for now.
 
-- name: General | Software | Services | Bluetooth | Disable
+#- name: General | Software | Services | Bluetooth | Disable
-  service:
+#  service:
-    name: "{{ bluetooth }}"
+#    name: "{{ bluetooth }}"
-    pattern: "{{ bluetooth_pattern }}"
+#    pattern: "{{ bluetooth_pattern }}"
-    state: stopped
+#    state: stopped
-    enabled: no
+#    enabled: no
-  ignore_errors: yes
+#  ignore_errors: yes
 
 ## NTP ##
 

tasks/workstation/shared/settings/gnome.yml

@@ -289,14 +289,62 @@
         true && inc_dconf &&
       dconf write /org/gnome/desktop/screen-time-limits/daily-limit-seconds \
         "uint32 21600" && inc_dconf &&
+      dconf write /org/gnome/desktop/screen-time-limits/grayscale \
+        true && inc_dconf &&
+      dconf write /org/gnome/desktop/screen-time-limits/history-enabled \
+        true && inc_dconf &&
 
+      #dconf write /org/gnome/desktop/break-reminders/selected-breaks \
+      #  "['eyesight', 'movement']" && inc_dconf &&
       dconf write /org/gnome/desktop/break-reminders/selected-breaks \
-        "['eyesight', 'movement']" && inc_dconf &&
+        "['movement']" && inc_dconf &&
+
+      #dconf write /org/gnome/desktop/break-reminders/eyesight/duration-seconds \
+      #  "uint32 180" && inc_dconf &&
+      #dconf write /org/g
+
+      #dconf write /org/gnome/desktop/break-reminders/eyesight/duration-seconds \
+      #  "uint32 180" && inc_dconf &&
+      #dconf write /org/gnome/desktop/break-reminders/eyesight/interval-seconds \
+      #  "uint32 1800" && inc_dconf &&
+      #
+      #dconf write /org/gnome/desktop/break-reminders/eyesight/countdown \
+      #  false && inc_dconf &&
+      #dconf write /org/gnome/desktop/break-reminders/eyesight/delay-seconds \
+      #  "uint32 180" && inc_dconf &&
+      #dconf write /org/gnome/desktop/break-reminders/eyesight/fade-screen \
+      #  true && inc_dconf &&
+      #dconf write /org/gnome/desktop/break-reminders/eyesight/notify \
+      #  false && inc_dconf &&
+      #dconf write /org/gnome/desktop/break-reminders/eyesight/notify-overdue \
+      #  false && inc_dconf &&
+      #dconf write /org/gnome/desktop/break-reminders/eyesight/notify-upcoming \
+      #  false && inc_dconf &&
+      #dconf write /org/gnome/desktop/break-reminders/eyesight/play-sound \
+      #  false && inc_dconf &&
+      #dconf write /org/gnome/desktop/break-reminders/eyesight/interval-seconds \
+      #  "uint32 1800" && inc_dconf &&
+
       dconf write /org/gnome/desktop/break-reminders/movement/duration-seconds \
         "uint32 180" && inc_dconf &&
       dconf write /org/gnome/desktop/break-reminders/movement/interval-seconds \
         "uint32 1800" && inc_dconf &&
 
+      dconf write /org/gnome/desktop/break-reminders/movement/countdown \
+        true && inc_dconf &&
+      dconf write /org/gnome/desktop/break-reminders/movement/delay-seconds \
+        "uint32 60" && inc_dconf &&
+      dconf write /org/gnome/desktop/break-reminders/movement/fade-screen \
+        true && inc_dconf &&
+      dconf write /org/gnome/desktop/break-reminders/movement/notify \
+        true && inc_dconf &&
+      dconf write /org/gnome/desktop/break-reminders/movement/notify-overdue \
+        true && inc_dconf &&
+      dconf write /org/gnome/desktop/break-reminders/movement/notify-upcoming \
+        true && inc_dconf &&
+      dconf write /org/gnome/desktop/break-reminders/movement/play-sound \
+        true && inc_dconf &&
+
       ## Success ##
 
       sleep 0 ||