From ca09628ea8a43f6a6339296d628d5525938285c6 Mon Sep 17 00:00:00 2001
From: Brian Lee <blee@satstack.cloud>
Date: Thu, 20 Jul 2023 10:13:19 -0700
Subject: [PATCH] Simplify tasks by moving let over to vimrc.local, also fix
 Debian

---
 files/vimrc.local | 2 ++
 tasks/main.yml    | 7 +++++++
 tasks/vim.yml     | 1 -
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/files/vimrc.local b/files/vimrc.local
index 5f681f9..0802c5e 100644
--- a/files/vimrc.local
+++ b/files/vimrc.local
@@ -1,3 +1,5 @@
+let skip_defaults_vim=1
+
 " -- General Settings
 set mouse-=a        " No mouse, see https://github.com/vim/vim/issues/12621
 set encoding=utf-8  " Necessary to show Unicode glyphs
diff --git a/tasks/main.yml b/tasks/main.yml
index ad13f19..3e02b80 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -13,6 +13,13 @@
     - /etc/skel
     - /root
 
+- name: Ensure Arch Linux sources bash_aliases
+  lineinfile:
+    path: /root/.bashrc
+    line: '[ -f ~/.bash_aliases ]  && source ~/.bash_aliases'
+    create: yes
+  when: ansible_os_family == 'Archlinux'
+
 - name: Copy shell configuration
   ansible.builtin.copy:
     src: inputrc
diff --git a/tasks/vim.yml b/tasks/vim.yml
index b4fc122..9f55267 100644
--- a/tasks/vim.yml
+++ b/tasks/vim.yml
@@ -19,7 +19,6 @@
     path: /etc/vimrc
     marker: '" {mark} ANSIBLE MANAGED BLOCK'
     block: |
-      let skip_defaults_vim=1
       set runtimepath+=/var/lib/vim/addons
       if filereadable("/etc/vimrc.local")
         source /etc/vimrc.local