diff --git a/ansible/.yamllint b/.yamllint similarity index 100% rename from ansible/.yamllint rename to .yamllint diff --git a/README.md b/README.md index 1119f9b..1258a3d 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,7 @@ Boot the live iso and set a root password, something simple is fine as it's changed to key based auth anyway. Find the ip address (e.g. by `ip a`) and add to `inventory/hosts.yml` under the `all` group. -Enter the `ansible` directory. Before running any playbook, generate a new SSH -key-pair: +Before running any playbook, generate a new SSH key-pair: ```bash $ ssh-keygen -t ed25519 -f .ssh/id_ed25519 -N "" @@ -20,4 +19,8 @@ $ ansible-playbook install.yml -k ``` When the `install` playbook finishes, wait for the restart. Then find the new -ip address and put in the inventory file under the `all` group +ip address and put in the inventory file under the `all` group. Then run: + +```bash +$ ansible-playbook configure.yml +``` diff --git a/ansible/ansible.cfg b/ansible.cfg similarity index 100% rename from ansible/ansible.cfg rename to ansible.cfg diff --git a/ansible/configure.yml b/configure.yml similarity index 100% rename from ansible/configure.yml rename to configure.yml diff --git a/ansible/group_vars/all/00-defaults.yml b/group_vars/all/00-defaults.yml similarity index 100% rename from ansible/group_vars/all/00-defaults.yml rename to group_vars/all/00-defaults.yml diff --git a/ansible/install.yml b/install.yml similarity index 100% rename from ansible/install.yml rename to install.yml diff --git a/ansible/inventory/hosts.yml b/inventory/hosts.yml similarity index 100% rename from ansible/inventory/hosts.yml rename to inventory/hosts.yml diff --git a/ansible/library/modules/mkinitcpio/mkinitcpio.py b/library/modules/mkinitcpio/mkinitcpio.py similarity index 100% rename from ansible/library/modules/mkinitcpio/mkinitcpio.py rename to library/modules/mkinitcpio/mkinitcpio.py diff --git a/ansible/roles/audio/tasks/main.yml b/roles/audio/tasks/main.yml similarity index 98% rename from ansible/roles/audio/tasks/main.yml rename to roles/audio/tasks/main.yml index 9a7b9a9..ac64170 100644 --- a/ansible/roles/audio/tasks/main.yml +++ b/roles/audio/tasks/main.yml @@ -1,3 +1,4 @@ +--- - name: Install pulse audio packages. become: true become_user: "{{ user_name }}" diff --git a/ansible/roles/base_packages/defaults/main.yml b/roles/base_packages/defaults/main.yml similarity index 100% rename from ansible/roles/base_packages/defaults/main.yml rename to roles/base_packages/defaults/main.yml diff --git a/ansible/roles/base_packages/tasks/main.yml b/roles/base_packages/tasks/main.yml similarity index 100% rename from ansible/roles/base_packages/tasks/main.yml rename to roles/base_packages/tasks/main.yml diff --git a/ansible/roles/bluetooth/tasks/main.yml b/roles/bluetooth/tasks/main.yml similarity index 98% rename from ansible/roles/bluetooth/tasks/main.yml rename to roles/bluetooth/tasks/main.yml index ab10dbe..8e3a848 100644 --- a/ansible/roles/bluetooth/tasks/main.yml +++ b/roles/bluetooth/tasks/main.yml @@ -1,3 +1,4 @@ +--- - name: Install bluetooth packages. become: true become_user: "{{ user_name }}" diff --git a/ansible/roles/common_software/tasks/main.yml b/roles/common_software/tasks/main.yml similarity index 100% rename from ansible/roles/common_software/tasks/main.yml rename to roles/common_software/tasks/main.yml diff --git a/ansible/roles/configure/defaults/main.yml b/roles/configure/defaults/main.yml similarity index 100% rename from ansible/roles/configure/defaults/main.yml rename to roles/configure/defaults/main.yml diff --git a/ansible/roles/configure/tasks/main.yml b/roles/configure/tasks/main.yml similarity index 100% rename from ansible/roles/configure/tasks/main.yml rename to roles/configure/tasks/main.yml diff --git a/ansible/roles/create_user/tasks/main.yml b/roles/create_user/tasks/main.yml similarity index 99% rename from ansible/roles/create_user/tasks/main.yml rename to roles/create_user/tasks/main.yml index d660da4..abae9ce 100644 --- a/ansible/roles/create_user/tasks/main.yml +++ b/roles/create_user/tasks/main.yml @@ -1,3 +1,4 @@ +--- - name: Allow wheel to sudo without password. copy: dest: /etc/sudoers.d/00-tmp-sudo-full-access diff --git a/ansible/roles/disksetup/defaults/main.yml b/roles/disksetup/defaults/main.yml similarity index 100% rename from ansible/roles/disksetup/defaults/main.yml rename to roles/disksetup/defaults/main.yml diff --git a/ansible/roles/disksetup/efi_gpt_btrfs/bootloader/files/grub b/roles/disksetup/efi_gpt_btrfs/bootloader/files/grub similarity index 100% rename from ansible/roles/disksetup/efi_gpt_btrfs/bootloader/files/grub rename to roles/disksetup/efi_gpt_btrfs/bootloader/files/grub diff --git a/ansible/roles/disksetup/efi_gpt_btrfs/bootloader/tasks/main.yml b/roles/disksetup/efi_gpt_btrfs/bootloader/tasks/main.yml similarity index 100% rename from ansible/roles/disksetup/efi_gpt_btrfs/bootloader/tasks/main.yml rename to roles/disksetup/efi_gpt_btrfs/bootloader/tasks/main.yml diff --git a/ansible/roles/disksetup/efi_gpt_btrfs/partitioning/defaults/main.yml b/roles/disksetup/efi_gpt_btrfs/partitioning/defaults/main.yml similarity index 100% rename from ansible/roles/disksetup/efi_gpt_btrfs/partitioning/defaults/main.yml rename to roles/disksetup/efi_gpt_btrfs/partitioning/defaults/main.yml diff --git a/ansible/roles/disksetup/efi_gpt_btrfs/partitioning/tasks/format-disk.yml b/roles/disksetup/efi_gpt_btrfs/partitioning/tasks/format-disk.yml similarity index 100% rename from ansible/roles/disksetup/efi_gpt_btrfs/partitioning/tasks/format-disk.yml rename to roles/disksetup/efi_gpt_btrfs/partitioning/tasks/format-disk.yml diff --git a/ansible/roles/disksetup/efi_gpt_btrfs/partitioning/tasks/format-parts.yml b/roles/disksetup/efi_gpt_btrfs/partitioning/tasks/format-parts.yml similarity index 100% rename from ansible/roles/disksetup/efi_gpt_btrfs/partitioning/tasks/format-parts.yml rename to roles/disksetup/efi_gpt_btrfs/partitioning/tasks/format-parts.yml diff --git a/ansible/roles/disksetup/efi_gpt_btrfs/partitioning/tasks/main.yml b/roles/disksetup/efi_gpt_btrfs/partitioning/tasks/main.yml similarity index 100% rename from ansible/roles/disksetup/efi_gpt_btrfs/partitioning/tasks/main.yml rename to roles/disksetup/efi_gpt_btrfs/partitioning/tasks/main.yml diff --git a/ansible/roles/disksetup/efi_gpt_btrfs/partitioning/tasks/mount.yml b/roles/disksetup/efi_gpt_btrfs/partitioning/tasks/mount.yml similarity index 100% rename from ansible/roles/disksetup/efi_gpt_btrfs/partitioning/tasks/mount.yml rename to roles/disksetup/efi_gpt_btrfs/partitioning/tasks/mount.yml diff --git a/ansible/roles/disksetup/efi_gpt_btrfs/partitioning/tasks/mount_btrfs-subvolume.yml b/roles/disksetup/efi_gpt_btrfs/partitioning/tasks/mount_btrfs-subvolume.yml similarity index 100% rename from ansible/roles/disksetup/efi_gpt_btrfs/partitioning/tasks/mount_btrfs-subvolume.yml rename to roles/disksetup/efi_gpt_btrfs/partitioning/tasks/mount_btrfs-subvolume.yml diff --git a/ansible/roles/disksetup/efi_gpt_btrfs/postpartitioning/tasks/main.yml b/roles/disksetup/efi_gpt_btrfs/postpartitioning/tasks/main.yml similarity index 100% rename from ansible/roles/disksetup/efi_gpt_btrfs/postpartitioning/tasks/main.yml rename to roles/disksetup/efi_gpt_btrfs/postpartitioning/tasks/main.yml diff --git a/ansible/roles/disksetup/efi_gpt_luks_btrfs/bootloader/files/grub b/roles/disksetup/efi_gpt_luks_btrfs/bootloader/files/grub similarity index 100% rename from ansible/roles/disksetup/efi_gpt_luks_btrfs/bootloader/files/grub rename to roles/disksetup/efi_gpt_luks_btrfs/bootloader/files/grub diff --git a/ansible/roles/disksetup/efi_gpt_luks_btrfs/bootloader/tasks/main.yml b/roles/disksetup/efi_gpt_luks_btrfs/bootloader/tasks/main.yml similarity index 100% rename from ansible/roles/disksetup/efi_gpt_luks_btrfs/bootloader/tasks/main.yml rename to roles/disksetup/efi_gpt_luks_btrfs/bootloader/tasks/main.yml diff --git a/ansible/roles/disksetup/efi_gpt_luks_btrfs/partitioning/defaults/main.yml b/roles/disksetup/efi_gpt_luks_btrfs/partitioning/defaults/main.yml similarity index 100% rename from ansible/roles/disksetup/efi_gpt_luks_btrfs/partitioning/defaults/main.yml rename to roles/disksetup/efi_gpt_luks_btrfs/partitioning/defaults/main.yml diff --git a/ansible/roles/disksetup/efi_gpt_luks_btrfs/partitioning/tasks/format-disk.yml b/roles/disksetup/efi_gpt_luks_btrfs/partitioning/tasks/format-disk.yml similarity index 100% rename from ansible/roles/disksetup/efi_gpt_luks_btrfs/partitioning/tasks/format-disk.yml rename to roles/disksetup/efi_gpt_luks_btrfs/partitioning/tasks/format-disk.yml diff --git a/ansible/roles/disksetup/efi_gpt_luks_btrfs/partitioning/tasks/format-parts.yml b/roles/disksetup/efi_gpt_luks_btrfs/partitioning/tasks/format-parts.yml similarity index 100% rename from ansible/roles/disksetup/efi_gpt_luks_btrfs/partitioning/tasks/format-parts.yml rename to roles/disksetup/efi_gpt_luks_btrfs/partitioning/tasks/format-parts.yml diff --git a/ansible/roles/disksetup/efi_gpt_luks_btrfs/partitioning/tasks/luks.yml b/roles/disksetup/efi_gpt_luks_btrfs/partitioning/tasks/luks.yml similarity index 100% rename from ansible/roles/disksetup/efi_gpt_luks_btrfs/partitioning/tasks/luks.yml rename to roles/disksetup/efi_gpt_luks_btrfs/partitioning/tasks/luks.yml diff --git a/ansible/roles/disksetup/efi_gpt_luks_btrfs/partitioning/tasks/main.yml b/roles/disksetup/efi_gpt_luks_btrfs/partitioning/tasks/main.yml similarity index 100% rename from ansible/roles/disksetup/efi_gpt_luks_btrfs/partitioning/tasks/main.yml rename to roles/disksetup/efi_gpt_luks_btrfs/partitioning/tasks/main.yml diff --git a/ansible/roles/disksetup/efi_gpt_luks_btrfs/partitioning/tasks/mount.yml b/roles/disksetup/efi_gpt_luks_btrfs/partitioning/tasks/mount.yml similarity index 100% rename from ansible/roles/disksetup/efi_gpt_luks_btrfs/partitioning/tasks/mount.yml rename to roles/disksetup/efi_gpt_luks_btrfs/partitioning/tasks/mount.yml diff --git a/ansible/roles/disksetup/efi_gpt_luks_btrfs/partitioning/tasks/mount_btrfs-subvolume.yml b/roles/disksetup/efi_gpt_luks_btrfs/partitioning/tasks/mount_btrfs-subvolume.yml similarity index 100% rename from ansible/roles/disksetup/efi_gpt_luks_btrfs/partitioning/tasks/mount_btrfs-subvolume.yml rename to roles/disksetup/efi_gpt_luks_btrfs/partitioning/tasks/mount_btrfs-subvolume.yml diff --git a/ansible/roles/disksetup/efi_gpt_luks_btrfs/postpartitioning/tasks/main.yml b/roles/disksetup/efi_gpt_luks_btrfs/postpartitioning/tasks/main.yml similarity index 100% rename from ansible/roles/disksetup/efi_gpt_luks_btrfs/postpartitioning/tasks/main.yml rename to roles/disksetup/efi_gpt_luks_btrfs/postpartitioning/tasks/main.yml diff --git a/ansible/roles/disksetup/tasks/main.yml b/roles/disksetup/tasks/main.yml similarity index 100% rename from ansible/roles/disksetup/tasks/main.yml rename to roles/disksetup/tasks/main.yml diff --git a/ansible/roles/display_manager/lightdm/tasks/main.yml b/roles/display_manager/lightdm/tasks/main.yml similarity index 100% rename from ansible/roles/display_manager/lightdm/tasks/main.yml rename to roles/display_manager/lightdm/tasks/main.yml diff --git a/ansible/roles/display_manager/tasks/main.yml b/roles/display_manager/tasks/main.yml similarity index 96% rename from ansible/roles/display_manager/tasks/main.yml rename to roles/display_manager/tasks/main.yml index abc6de0..095d0eb 100644 --- a/ansible/roles/display_manager/tasks/main.yml +++ b/roles/display_manager/tasks/main.yml @@ -1,3 +1,4 @@ +--- - name: Include display manager strategy. include_role: name: "display_manager/{{ display_manager }}" diff --git a/ansible/roles/display_server/tasks/main.yml b/roles/display_server/tasks/main.yml similarity index 96% rename from ansible/roles/display_server/tasks/main.yml rename to roles/display_server/tasks/main.yml index a39233d..bdbdf4c 100644 --- a/ansible/roles/display_server/tasks/main.yml +++ b/roles/display_server/tasks/main.yml @@ -1,3 +1,4 @@ +--- - name: Include display server xorg. include_role: name: "display_server/xorg" diff --git a/ansible/roles/display_server/xorg/tasks/main.yml b/roles/display_server/xorg/tasks/main.yml similarity index 100% rename from ansible/roles/display_server/xorg/tasks/main.yml rename to roles/display_server/xorg/tasks/main.yml diff --git a/ansible/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml similarity index 98% rename from ansible/roles/docker/tasks/main.yml rename to roles/docker/tasks/main.yml index 4bc4b5a..03a6e48 100644 --- a/ansible/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -1,3 +1,4 @@ +--- - name: Install docker. become: true become_user: "{{ user_name }}" diff --git a/ansible/roles/genfstab/tasks/main.yml b/roles/genfstab/tasks/main.yml similarity index 100% rename from ansible/roles/genfstab/tasks/main.yml rename to roles/genfstab/tasks/main.yml diff --git a/ansible/roles/grub-mkconfig/tasks/main.yml b/roles/grub-mkconfig/tasks/main.yml similarity index 100% rename from ansible/roles/grub-mkconfig/tasks/main.yml rename to roles/grub-mkconfig/tasks/main.yml diff --git a/ansible/roles/grub-theme/defaults/main.yml b/roles/grub-theme/defaults/main.yml similarity index 100% rename from ansible/roles/grub-theme/defaults/main.yml rename to roles/grub-theme/defaults/main.yml diff --git a/ansible/roles/grub-theme/tasks/main.yml b/roles/grub-theme/tasks/main.yml similarity index 100% rename from ansible/roles/grub-theme/tasks/main.yml rename to roles/grub-theme/tasks/main.yml diff --git a/ansible/roles/grub-theme/xenlism/tasks/main.yml b/roles/grub-theme/xenlism/tasks/main.yml similarity index 100% rename from ansible/roles/grub-theme/xenlism/tasks/main.yml rename to roles/grub-theme/xenlism/tasks/main.yml diff --git a/ansible/roles/hostname/tasks/main.yml b/roles/hostname/tasks/main.yml similarity index 98% rename from ansible/roles/hostname/tasks/main.yml rename to roles/hostname/tasks/main.yml index db7332a..774af29 100644 --- a/ansible/roles/hostname/tasks/main.yml +++ b/roles/hostname/tasks/main.yml @@ -1,3 +1,4 @@ +--- - name: Update /etc/hostname. copy: dest: /etc/hostname diff --git a/ansible/roles/locale/tasks/main.yml b/roles/locale/tasks/main.yml similarity index 100% rename from ansible/roles/locale/tasks/main.yml rename to roles/locale/tasks/main.yml diff --git a/ansible/roles/localtime/tasks/main.yml b/roles/localtime/tasks/main.yml similarity index 100% rename from ansible/roles/localtime/tasks/main.yml rename to roles/localtime/tasks/main.yml diff --git a/ansible/roles/mullvad/tasks/main.yml b/roles/mullvad/tasks/main.yml similarity index 100% rename from ansible/roles/mullvad/tasks/main.yml rename to roles/mullvad/tasks/main.yml diff --git a/ansible/roles/pacstrap/tasks/main.yml b/roles/pacstrap/tasks/main.yml similarity index 100% rename from ansible/roles/pacstrap/tasks/main.yml rename to roles/pacstrap/tasks/main.yml diff --git a/ansible/roles/paru/tasks/main.yml b/roles/paru/tasks/main.yml similarity index 98% rename from ansible/roles/paru/tasks/main.yml rename to roles/paru/tasks/main.yml index 989da7b..c4fe21d 100644 --- a/ansible/roles/paru/tasks/main.yml +++ b/roles/paru/tasks/main.yml @@ -1,3 +1,4 @@ +--- - name: Install rust. pacman: name: rustup diff --git a/ansible/roles/passwordless_connection/tasks/main.yml b/roles/passwordless_connection/tasks/main.yml similarity index 100% rename from ansible/roles/passwordless_connection/tasks/main.yml rename to roles/passwordless_connection/tasks/main.yml diff --git a/ansible/roles/prep/tasks/main.yml b/roles/prep/tasks/main.yml similarity index 100% rename from ansible/roles/prep/tasks/main.yml rename to roles/prep/tasks/main.yml diff --git a/ansible/roles/u2f/tasks/main.yml b/roles/u2f/tasks/main.yml similarity index 100% rename from ansible/roles/u2f/tasks/main.yml rename to roles/u2f/tasks/main.yml diff --git a/ansible/roles/window_manager/i3/tasks/main.yml b/roles/window_manager/i3/tasks/main.yml similarity index 100% rename from ansible/roles/window_manager/i3/tasks/main.yml rename to roles/window_manager/i3/tasks/main.yml diff --git a/ansible/roles/window_manager/tasks/main.yml b/roles/window_manager/tasks/main.yml similarity index 96% rename from ansible/roles/window_manager/tasks/main.yml rename to roles/window_manager/tasks/main.yml index dc698cb..593962d 100644 --- a/ansible/roles/window_manager/tasks/main.yml +++ b/roles/window_manager/tasks/main.yml @@ -1,3 +1,4 @@ +--- - name: Include window manager strategy. include_role: name: "window_manager/{{ window_manager }}" diff --git a/ansible/roles/yubikey/tasks/main.yml b/roles/yubikey/tasks/main.yml similarity index 98% rename from ansible/roles/yubikey/tasks/main.yml rename to roles/yubikey/tasks/main.yml index 03dfda9..28510b2 100644 --- a/ansible/roles/yubikey/tasks/main.yml +++ b/roles/yubikey/tasks/main.yml @@ -1,3 +1,4 @@ +--- - name: Install packages. become: true become_user: "{{ user_name }}"