mu
change
commit 63eceb2ae4c6890eea3437b809533c4a7b5df2bd
author Alpha Chen <alpha@kejadlen.dev>
date
parent beca3f49
diff --git a/dev/README.md b/dev/README.md
deleted file mode 100644
index f261fa6..0000000
--- a/dev/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-```sh
-# Run bootstrap
-./bootstrap.sh
-
-# Configure 1Password
-
-# Run Ansible
-ansible-playbook main.yml
-```
diff --git a/dev/main.yml b/dev/main.yml
deleted file mode 100644
index 9cad951..0000000
--- a/dev/main.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-- name: Main playbook
-  hosts: dev
-  tasks:
-
-    - name: Group by OS
-      ansible.builtin.group_by:
-        key: os_{{ ansible_distribution }}
-
-    - name: Check out dotfiles
-      ansible.builtin.git:
-        repo: git@git.kejadlen.dev:alpha/dotfiles.git
-        dest: ~/.dotfiles
-        version: main
-        accept_newhostkey: true
-      # repo can have local changes
-      ignore_errors: true # noqa: ignore-errors
-
-- name: Import dotfiles playbook
-  import_playbook: dotfiles.yml
-
-# First since this installs tooling used later
-- name: Import homebrew playbook
-  import_playbook: homebrew.yml
-
-- name: Import defaults playbook
-  import_playbook: defaults.yml
-
-- name: Import dock playbook
-  import_playbook: dock.yml
-
-- name: Import macos playbook
-  import_playbook: macos.yml
-
-- name: Import ubuntu playbook
-  import_playbook: ubuntu.yml
-
-- name: Misc macOS things
-  hosts: os_MacOSX
-  tasks:
-
-    # https://tratt.net/laurie/blog/2024/faster_shell_startup_with_shell_switching.html
-    # I'm not sure why this doesn't work on my Linux box, but whatever
-    - name: Set default shell to sh
-      ansible.builtin.user:
-        name: alpha
-        shell: /bin/sh --login
-
-    - name: Install Fennel
-      ansible.builtin.command: "luarocks install fennel"
-      args:
-        creates: /opt/homebrew/bin/fennel
-
-# vim: ft=yaml.ansible
diff --git a/local/main.yml b/local/main.yml
index 5aad87c..53e2fb9 100644
--- a/local/main.yml
+++ b/local/main.yml
@@ -1,7 +1,5 @@
-- name: Main playbook
-  hosts: local
+- hosts: local
   tasks:
-
     - name: Check out dotfiles
       ansible.builtin.git:
         repo: https://git.kejadlen.dev/alpha/dotfiles.git
@@ -33,11 +31,17 @@
         - .zshrc
 
     - name: Symlink deep dotfiles
+      vars:
+        dotfiles:
+          - .bundle/config
+          - .cargo/config.toml
+          - .docker/config.json
       block:
         - name: Ensure directory exists
           ansible.builtin.file:
             dest: ~/{{ item | dirname }}
             state: directory
+            mode: "0755"
           loop: "{{ dotfiles }}"
         - name: Symlink dotfile
           ansible.builtin.file:
@@ -45,18 +49,20 @@
             dest: ~/{{ item }}
             state: link
           loop: "{{ dotfiles }}"
-      vars:
-        dotfiles:
-          - .bundle/config
-          - .cargo/config.toml
-          - .docker/config.json
 
 - import_playbook: macos.yml # noqa: name[play]
 
-# needs to go after luarocks is installed
-- name: Main playbook
-  hosts: local
+# Misc things that can (or need to) wait on the above to run
+- hosts: local
   tasks:
+
+    # https://tratt.net/laurie/blog/2024/faster_shell_startup_with_shell_switching.html
+    - name: Set default shell to sh
+      ansible.builtin.user:
+        name: alpha
+        shell: /bin/sh --login
+
+    # needs to go after luarocks is installed
     - name: Install fennel
       ansible.builtin.command: luarocks install fennel
       args: