working

Author: johnstcn

.bash_aliases renamed to ansible/files/bash_aliases

@@ -1,13 +1,13 @@
 [user]
 	email = [email protected]
 	name = Cian Johnston
-
+	signingkey = /home/cian/.ssh/id_ed25519.pub
 [url "[email protected]:"]
 	insteadOf = https://github.com/
 
 [aliases]
 	add = "add -p" #ALWAYS
-	as = "! git rebase -i --autosquash main"
+	as = "! git rebase -i --autosquash master"
 	diff-file-last-commit = "!f() { \
             project_root_dir=$(git rev-parse --show-toplevel); \
             echo finding full file path of $1 in $project_root_dir; \
@@ -23,9 +23,11 @@
 	pu = "pull --all --rebase"
 	releasenotes = "! set -u; f() { git log  --no-merges --pretty=format:\"- %h %s\" $1; }; f"
 	subup = "submodule update --recursive"
+	sup = "submodule update --recursive"
 
 [rerere]
         enabled = true
 [pull]
 	ff = only
-
+[gpg]
+	format = ssh

.bash_profile renamed to ansible/files/bash_profile

@@ -10,27 +10,81 @@
 
   tasks:
     - name: Ensure required packages are available for {{ hostname }}
+      become: true
       ansible.builtin.package:
         name: "{{ item }}"
         state: present
       with_items:
         - git
+
     - name: Load vars for {{ hostname }}
       ansible.builtin.include_vars: "{{ hostname }}.yaml"
+
+    - name: Copy files for {{ hostname }}
+      ansible.builtin.copy:
+        src: "{{ item.src }}"
+        dest: "{{ item.dest }}"
+      with_items: "{{ dotfiles_files }}"
+
     - name: Ensure src dir is present on {{ hostname }}
       ansible.builtin.file:
         path: "{{ dotfiles_src_dir }}"
         state: directory
-        mode: '0755'
+        mode: "0755"
+
     - name: Clone git repos for {{ hostname }}
+      async: 600
+      poll: 0
       ansible.builtin.git:
         repo: "{{ item.src }}"
         dest: "{{ item.dest }}"
         version: "{{ item.version }}"
         force: false
       with_items: "{{ dotfiles_git_repos }}"
+      register: "async_git_status"
+
+    - name: Fetch binaries for {{ hostname }}
+      async: 600
+      poll: 0
+      ansible.builtin.get_url:
+        url: "{{ item.url }}"
+        dest: "{{ item.dest }}"
+        mode: "0755"
+      with_items: "{{ dotfiles_binaries }}"
+      register: "async_binaries_status"
+
     - name: Install required packages for {{ hostname }}
+      async: 600
+      poll: 0
+      become: true
       ansible.builtin.package:
-        name: "{{ item }}"
+        name: "{{ dotfiles_packages }}"
         state: present
-      with_items: "{{ dotfiles_packages }}"
+      register: "async_package_status"
+
+    - name: Wait for package installation to finish
+      become: true
+      async_status:
+        jid: "{{ async_package_status.ansible_job_id }}"
+      register: "package_result"
+      until: "package_result.finished"
+      retries: 30
+      delay: 1
+
+    - name: Wait for git to finish
+      async_status:
+        jid: "{{ item.ansible_job_id }}"
+      with_items: "{{ async_git_status.results }}"
+      register: "git_result"
+      until: "git_result.finished"
+      retries: 30
+      delay: 1
+
+    - name: Wait for binaries to finish
+      async_status:
+        jid: "{{ item.ansible_job_id }}"
+      with_items: "{{ async_binaries_status.results }}"
+      register: "binaries_result"
+      until: "binaries_result.finished"
+      retries: 30
+      delay: 1

.bashrc renamed to ansible/files/bashrc

@@ -0,0 +1,38 @@
+dotfiles_src_dir: ~/src
+dotfiles_git_repos:
+  - src: [email protected]:johnstcn/flux
+    dest: ~/src/flux
+    version: main
+  - src: [email protected]:johnstcn/cianjohnston.ie
+    dest: ~/src/cianjohnston.ie
+    version: main
+  - src: [email protected]:johnstcn/cv.git
+    dest: ~/src/cv
+    version: master
+dotfiles_packages:
+  - bat
+  - byobu
+  - fd-find
+  - fzf
+  - jq
+  - less
+  - neovim
+  - shellcheck
+  - tree
+  - vim
+dotfiles_binaries:
+  - url: https://github.com/ahmetb/kubectx/releases/download/v0.9.5/kubectx_v0.9.5_linux_x86_64.tar.gz
+    dest: "~/bin/kubectx"
+  - url: https://github.com/ahmetb/kubectx/releases/download/v0.9.5/kubens_v0.9.5_linux_x86_64.tar.gz
+    dest: "~/bin/kubens"
+dotfiles_files:
+  - src: bashrc
+    dest: ~/.bashrc
+  - src: bash_profile
+    dest: ~/.bash_profile
+  - src: bash_aliases
+    dest: ~/.bash_aliases
+  - src: gitconfig
+    dest: ~/.gitconfig
+  - src: vimrc
+    dest: ~/.vimrc

.gitconfig renamed to ansible/files/gitconfig

@@ -6,16 +6,30 @@ set -euo pipefail
 
 REPO_ROOT=$(git rev-parse --show-toplevel)
 
+
+install_package() {
+    if [[ -f "/etc/debian-release" ]]; then
+        DEBIAN_FRONTEND=noninteractive sudo apt-get install --no-install-recommends -y "$@"
+    elif [[ -f "/etc/fedora-release" ]]; then
+        sudo dnf install -y "$@"
+    elif [[ -f "/etc/redhat-release" ]]; then
+        sudo yum install -y "$@"
+    else
+        echo "ERROR: Unsupported OS"
+        exit 1
+    fi
+}
+
 # Ensure python3 is available
 if ! command -v python3; then
   echo "INFO: installing python3"
-  DEBIAN_FRONTEND=noninteractive sudo apt-get install --no-install-recommends -y python3 python3-virtualenv python3-apt
+  install_package python3 python3-virtualenv python3-apt
 fi
 
 # Ensure virtualenv  is available
 if ! command -v virtualenv; then
   echo "INFO: installing virtualenv"
-  DEBIAN_FRONTEND=noninteractive sudo apt-get install --no-install-recommends -y python3-virtualenv
+  install_package python3-virtualenv
 fi
 
 # Create a virtualenv
@@ -46,4 +60,4 @@ fi
 
 # Run the playbook
 cd "${REPO_ROOT}/ansible"
-ansible-playbook playbook.yaml ${ANSIBLE_VERBOSE}
+ansible-playbook playbook.yaml --forks $(nproc) ${ANSIBLE_VERBOSE}