From fb45407fa5dcd9ee2bd16c1d20ac8c4c35bebcb9 Mon Sep 17 00:00:00 2001
From: Scott Wallace <scott@wallace.sh>
Date: Sun, 13 Jan 2019 18:04:27 +0000
Subject: [PATCH] Ansible tidy-up

---
 .../roles/linux_desktop/tasks/software.yaml   | 25 +++++++++++--------
 .ansible/roles/linux_desktop/vars/main.yaml   | 19 ++++++--------
 .ansible/roles/mac_desktop/tasks/prefs.yaml   | 14 +++++------
 3 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/.ansible/roles/linux_desktop/tasks/software.yaml b/.ansible/roles/linux_desktop/tasks/software.yaml
index 0ca0a50..d405572 100644
--- a/.ansible/roles/linux_desktop/tasks/software.yaml
+++ b/.ansible/roles/linux_desktop/tasks/software.yaml
@@ -1,5 +1,6 @@
 - name: Adding repositories
-  tags: install
+  tags:
+    - install
   apt_repository:
     repo: "{{ item }}"
     state: present
@@ -7,7 +8,8 @@
   become: true
 
 - name: Installing packages
-  tags: install
+  tags:
+    - install
   package:
     name: "{{ item }}"
     state: present
@@ -15,7 +17,8 @@
   become: true
 
 - name: Installing Snaps
-  tags: install
+  tags:
+    - install
 #   snap:
 #     name: "{{ item }}"
 #     state: present
@@ -24,18 +27,20 @@
   become: true
 
 - name: Checking for Modern Pictogram font
-  tags: install
+  tags:
+    - install
   stat:
-    path: "~/.local/share/fonts/modernpics.otf"
+    path: '~/.local/share/fonts/modernpics.otf'
   register: fontfile
 
 - name: Installing fonts
-  tags: install
+  tags:
+    - install
   block:
     - name: Create temporary file for Modern Pictograms font
       tempfile:
         state: file
-        suffix: ".zip"
+        suffix: '.zip'
       register: fontzip
 
     - name: Download Modern Pictograms font
@@ -48,8 +53,8 @@
     - name: Unzip Modern Pictograms font
       unarchive:
         src: "{{ fontzip.path }}"
-        dest: "~/.local/share/fonts"
-        exclude: "*.txt"
+        dest: '~/.local/share/fonts'
+        exclude: '*.txt'
 
     - name: Remove temporary file
       file:
@@ -57,5 +62,5 @@
         state: absent
 
     - name: Refresh font cache
-      command: "fc-cache -f"
+      command: 'fc-cache -f'
   when: fontfile.stat.exists == false
diff --git a/.ansible/roles/linux_desktop/vars/main.yaml b/.ansible/roles/linux_desktop/vars/main.yaml
index 2d6ecf8..edd7a8b 100644
--- a/.ansible/roles/linux_desktop/vars/main.yaml
+++ b/.ansible/roles/linux_desktop/vars/main.yaml
@@ -1,17 +1,14 @@
 config_repos:
-  # - name: "dotfiles"
-  #   repo: "git@github.com:scottwallacesh/dotfiles.git"
-  #   dest: "~/"
-  - name: "albert"
-    repo: "git@github.com:scottwallacesh/albert.git"
-    dest: "~/.local/share/albert"
+  - name: 'albert'
+    repo: 'git@github.com:scottwallacesh/albert.git'
+    dest: '~/.local/share/albert'
 
 linux_repos:
-  - "deb [arch=amd64] https://packages.microsoft.com/repos/vscode stable main"             # Visual Studio Code
-  - "deb http://download.opensuse.org/repositories/home:/manuelschneid3r/xUbuntu_18.10/ /" # Albert
-  - "deb http://linux-packages.resilio.com/resilio-sync/deb resilio-sync non-free"         # Resilio Sync
-  - "deb http://prerelease.keybase.io/deb stable main"                                     # Keybase
-  - "deb https://apt.enpass.io/ stable main"                                               # Enpass
+  - 'deb [arch=amd64] https://packages.microsoft.com/repos/vscode stable main'             # Visual Studio Code
+  - 'deb http://download.opensuse.org/repositories/home:/manuelschneid3r/xUbuntu_18.10/ /' # Albert
+  - 'deb http://linux-packages.resilio.com/resilio-sync/deb resilio-sync non-free'         # Resilio Sync
+  - 'deb http://prerelease.keybase.io/deb stable main'                                     # Keybase
+  - 'deb https://apt.enpass.io/ stable main'                                               # Enpass
 
 linux_packages:
   - albert
diff --git a/.ansible/roles/mac_desktop/tasks/prefs.yaml b/.ansible/roles/mac_desktop/tasks/prefs.yaml
index d9eab75..658f4eb 100644
--- a/.ansible/roles/mac_desktop/tasks/prefs.yaml
+++ b/.ansible/roles/mac_desktop/tasks/prefs.yaml
@@ -19,7 +19,7 @@
       user_pref("privacy.window.maxInnerWidth", 1400);
       user_pref("privacy.window.maxInnerHeight", 900);
     dest: "{{ firefox_path  }}/{{ profile_path }}/user.js"
-    mode: 0440
+    mode: '0600'
 
 - name: 'OS X: Dock orientation'
   tags:
@@ -37,7 +37,7 @@
     domain: com.apple.dock
     type: float
     key: tilesize
-    value: 35
+    value: '35'
 
 - name: 'OS X: Smart quotes off'
   tags:
@@ -46,7 +46,7 @@
       domain: NSGlobalDomain
       type: int
       key: NSAutomaticQuoteSubstitutionEnabled
-      value: 0
+      value: '0'
 
 - name: 'OS X: Smart dashes off'
   tags:
@@ -55,7 +55,7 @@
       domain: NSGlobalDomain
       type: int
       key: NSAutomaticDashSubstitutionEnabled
-      value: 0
+      value: '0'
 
 - name: 'OS X: Spell correction off'
   tags:
@@ -64,7 +64,7 @@
       domain: NSGlobalDomain
       type: int
       key: NSAutomaticSpellingCorrectionEnabled
-      value: 0
+      value: '0'
 
 - name: 'OS X: Web spell correction off'
   tags:
@@ -73,9 +73,9 @@
       domain: NSGlobalDomain
       type: int
       key: WebAutomaticSpellingCorrectionEnabled
-      value: 0
+      value: '0'
 
 - name: 'OS X: Clear preferences cache'
   tags:
     - config
-  command: pkill -u ${USER} cfprefsd
+  command: 'pkill -u ${USER} cfprefsd'