Update servers.ini after "datacenter" move

Added home variable for the home folder, defaults to username.
Edited neofetch config so it runs faster.
Added mukti and ctrl-c.club variables.

.drone.yml

@@ -0,0 +1,21 @@
+---
+kind: pipeline
+type: docker
+name: run updates
+
+steps:
+- name: run updates
+  image: siverten/ansible
+  environment:
+    ANSIBLE_HOST_KEY_CHECKING: False
+    #ANSIBLE_SSH_PIPELINING: False
+    ANSIBLE_SSH_ARGS: -o StrictHostKeyChecking no -C -o ControlMaster=auto -o ControlPersist=60s
+    PASS:
+      from_secret: pass
+    KEY:
+      from_secret: key
+  commands:
+  - mkdir ~/.ssh && echo "$KEY" > ~/.ssh/id_rsa && chmod 600 -R ~/.ssh
+  - sed -i "1s/^/[all:vars]\nansible_become_pass = $PASS\n/" servers.ini
+  - unbuffer ansible-playbook site.yml -t update | cat
+

docker.ini

@@ -1,4 +1,6 @@
 [alpine]
 docker-alpine-test ansible_connection=docker ansible_user=root ansible_host=ansible
+;[skyid:children]
+;alpine
 [apk:children]
 alpine

group_vars/all.yml

@@ -1,5 +1,6 @@
 name: siv
 group: "{{ name }}"
+home: /home/{{ name }}
 shell: /bin/zsh
 user_groups: [wheel,sudo,adm,kvm,users,libvirt,docker]
 zsh_opt_config: true
@@ -11,9 +12,9 @@ pubkeys: [
   ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDqXa9fIVrQTGV4PMTn7ZyyeTLDVC+H4kV6zJzWBGGZf6DSoumJtbTaD6Ob3Czsf/NZ35iCPy2yrar3/Z7ccDrcfpxlNvj9l3NphEdXIebyQ8VmMWBy4pDPjE1erIEaL+J5RfjidB7xauticUIuNj0vtuvum/f09vGsohys+/llU7T+M42AeCTT5omw0DD8DPIUGxFwsgg0RxtD5ol1i3v0zVqwlbc7gnHws9/JCJZrhdHZWWkqvVQLCbRRCq4ZvRBcMdwJsBOeJpM9tkeJ7peZjAnPh7EIPkWh79+S65m6bsBe9N4lX5Qf2jxMSzgGeHhfJmd5O7UVqxH1a4M10e+CZOsWdTbMFEn+pcA04gehV9mL5gazZTMSjVFRzd/NUWi0Z6kecXW0HvxWzvKs+iZgaqL7qsDQUb23nMyvtiRO7JeTfdlo/dpb3Uz12VfwcHWAw1DpyJk3Sd1xV4sLke34F67e141ed72Piig6UuX2/aXm5Due781zIS8zBKBl4vXORbGjLLBo72RctB3xU9nJmkttdeSSF/yRbY7H3+bsvno/VUSAhnYWlGNrZBc+tTtqjYEQ3k/G8I8nwO4e1GDfo6w5G9dZQQ4YyV4v41NRp0TrtuGBpvGf9anMWUcp63f+fXMOZAnSVg42oZZUYWSPQTnoY1E5I3A6K4wrqEHt4w== siv@craptop,
   ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCuXK610CJq4pQrTOxESRXEyzQgAICHjgjvfl5GpOR1DoBAmp4oAsckJjbUWqdsdJN/bHc3Femcy71jvZADoO1RyJ16gZVbGsrz1Ale1/VHifjh1vtFt93dI7amUsyogKS9Ypy/FOVUpSMEtsiIwku5D2LJXe80qOS+TV8INTaplufwf+mrLavBCmQ2jYvC5U3c40JoUD2fs63S4FGgX/XbxZnhYuiIzQiHuk8VBDYXME0noGB7UTo+3oBjZSHCkdsjPIZ0CrxNdCV+dAVQ1K8OYekBmGsjL131buvX8irLyDzpEBqxkyP7J+qx7Imea1KJHL3JneJWTfiCSSXCxJpEp8xlot0OTfmJ0Kfon49F74yClqy+ztgyF8BiSWcNylD1TbOqDMJApJh7/toTcVT6VJ74z7p+/3q5+K3mSUC6BO5ilyD+k9/Af4NjIcfD/P9AWyVR+UEXAN1TrgZWI3V3KZENg3geqyyRPFLh3p1NvlwvhwcUn+jGLm82ZrBvaDqB1ihqkF/1mZLiUrsij/7sEUxI3ZIiLPEVRHPnOb+6oFomWPOGbhwPbl98lOgarsNQzQaOe36KFGC6zHPwN/d5PT5TNCgUQ7Gg8igTlXKSH/XUNy4ArQrjTisWt6k93zrAn0HK2Mh774Bvf9eAXqkvlIoti+r8X8nbiIpVAKvm8Q== siv@billy,
   ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC6HmJQGvQghh8g8JWoUkQf6d3rokSJad4on69WahrvyBUzDASwOnACX0yztDYYu7UzH8TtJqknbp2P5JSKVR+PFvNxo24QYC671QzGyRq4urL8YDsWj5feSL4MEvFY0ivNRNxAKxLHXg+i0jQtiDwBOkhQl0VFrqsKdGlEVcghVeogBAdzHFQNQ7ENZMS30qzW1wrcwWbUBF8ZSvwEQgCXH0UHcIWi3Rzd0g0LfvfbOtI1UjuBzT0gd5F1RSHh0XJWK7jcVrNShMVQqmWWLuHVd8T2k7flGQDBeZPKo3GXdnB4cXgkfNJrsyNDLoJXimj8UryNpn3ejV9DkreL985uAmkLPY11bkD6vWgdZgXA3aWpLQm05crOu4GEn1bGhbnIORm4mjxlANJB0QC9FliCAVkLk4OY7UGnx4mgqMyYjb2LCdgGKVVto97UAisJxWikLiM5nCNrCaGBe05d2nVxPXVKwALI3E2AeIYSmjE4N3mBgUIxWuGS6KoOZsnoSYS3+blQV0W/POuFw4NhlWgZUi8GAaGPfWj8pM/u9dH8FKxhK/PabVKtltLkn4ntgewaeNl18n1NFkQtcDD7Kkg/ZIQ9SiNchK0SxR0/Pgwo/A5GacF+nwTgxGwDJbQ0OPaVlbQd/cCaXl1AX9s7R5Xd8D35KFHTJ1IVnZohDGVQvQ== mob]
-packages: [neofetch,htop,git,zsh,bat]
+packages: [neofetch,rsync,htop,git,zsh,lsd,bat]
 package_manager: null
-# extra_packages: []
+extra_packages: []
 update: true
 setup: [zsh,extra,system] # ,bash,emacs
 revert: false

group_vars/kjellern.yml

@@ -1 +0,0 @@
-update: false

group_vars/linode.yml

@@ -1 +0,0 @@
-update: false

group_vars/mukti.yml

@@ -0,0 +1,19 @@
+name: 1337h4ckz0r5
+group: "{{ name }}"
+home: /home/coder
+shell: /bin/zsh
+user_groups: [sudo,docker]
+zsh_opt_config: false
+bash_prompt: '[\e[0;34m\u\e[0;32m@\e[1;31m\h\e[0m] \e[0;35m\w \e[0m\$'
+zsh_prompt: "{{ '%F{red}% %n%F{green}% @%F{blue}% %m %F{#bb33bb}% %1~%f >' }}"
+pubkeys: [
+  ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC1O7dXSrkDZ0l2kQMDnUPcALEYrq9l+fCKANb4sKZebRr+CkvO0Yat6f/O1a4OJWKeIpOMNIG60aiQB4Npn1ACosQ5Jgw1GypEr6QWDKdWqTEQ4qQaJk2sAKbUpEHTvtwlRTZy5zxC0TrRSjXcNmPR5O4GGMPLAdWFmD9iIRA+tjGvB6U4NY8KafxzBmje95oVP8erayEZT90IgljLisg29uAofAfAhjP/KV/z1ppmwrL7Et6N2ZcOfFl+KOcefzjt0bdkV0gFXqYKEFK9WEpVXEHE7CpOu/dJZgVvTT+jfHhWhANkl66dDbv80nfHAINASCBCoUi6CFb8TBru4WABeoyKEQnC04IqHXvgOMr5/f9Sx1PHZNxkXNVuSPbkSnA7Qk4OnHG5c/rEeZ850eM8j0or29PyNFvZjWjBrIG1iReRTdSDkzdwojLuCKMrN8qxmDMuYW0Ey9DCsC2iKyYzJ+3dhilXkaUtQYHrtCM4DB4rcAWV2hRS1mRZwWmKH4QWvwVbjipKAzHg3i2hMFIC6HbNxbYHrzFCSCZN07ObLsyMYR28I74JfFxpNg0OQAZ5QVvOe+PletFjqbpVnjrGhEkBCyGIOfZ14PlJhN0CW8/9fTy6EzvruD2yGTUMq+pJhhJ3Zj5J+zaFJsz3tPxf+OVcsGFLEtbJvu6C9yCT5Q== siv@msitoo,
+  ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDYIRUCrS6d8HdsDwsiXUvkHFDkUwrULBhIQzsQD5o8bZdaovvAHbB8wnpIvsDBgxdwlH7W0zPfo4P52n+bsq0jH8vkD+wIlSUrKJfj8IWDAHajxCSRG9h4mHtYvhKnV8ER96sdFh+85ULUa6LynCrixE9tFGHvNmNyMacP8BkdrnRb6Sj6l2EZGtViJ9KK66mfOMW6JSpkCsKT5GNY8l2AM2nMnAFrKWNGjKz5M1j85u5Ieqsk3nXhIxFJOWpqLe1CSWH42StA6QAwiN2j7taEaUiO85BgeulMGJe/feZEJHW/wOEd26k0+j4/vJ7tVUZFUk6gpIW01qkSqI0W6fhMSaAMoGKau3l/pEurfE8dQlHbHzOkUs2Il+AcXSZmxuAZiJ5+MhiaN7MtOT3pirD/uQDkEeA9e9ib++K0mu1pEMcsRGqc5XXqpKpWQqw5ceUSbdP3DOuhYLWo8GfP8vSixcFQKiuue7QLhWplsERsD57fjEq+wViXD8aBFNhPrw8V15rR7xuZe4JyBtTdpyoEx7Ji2hRMy5mYekSW9bINpmhve3KAte5G8iIsBrDxMEj1AJDyIofkSkuR75GvbIqCLxtMIC0ahfH7/DrVDr9xNnzfV1NeQ1GglP0BgUpmRtP6ozXotRqBKbiSoH6K+2HgsgKQZukZ4xzMxrV8fBApUQ== siv@MSI,
+  ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDqXa9fIVrQTGV4PMTn7ZyyeTLDVC+H4kV6zJzWBGGZf6DSoumJtbTaD6Ob3Czsf/NZ35iCPy2yrar3/Z7ccDrcfpxlNvj9l3NphEdXIebyQ8VmMWBy4pDPjE1erIEaL+J5RfjidB7xauticUIuNj0vtuvum/f09vGsohys+/llU7T+M42AeCTT5omw0DD8DPIUGxFwsgg0RxtD5ol1i3v0zVqwlbc7gnHws9/JCJZrhdHZWWkqvVQLCbRRCq4ZvRBcMdwJsBOeJpM9tkeJ7peZjAnPh7EIPkWh79+S65m6bsBe9N4lX5Qf2jxMSzgGeHhfJmd5O7UVqxH1a4M10e+CZOsWdTbMFEn+pcA04gehV9mL5gazZTMSjVFRzd/NUWi0Z6kecXW0HvxWzvKs+iZgaqL7qsDQUb23nMyvtiRO7JeTfdlo/dpb3Uz12VfwcHWAw1DpyJk3Sd1xV4sLke34F67e141ed72Piig6UuX2/aXm5Due781zIS8zBKBl4vXORbGjLLBo72RctB3xU9nJmkttdeSSF/yRbY7H3+bsvno/VUSAhnYWlGNrZBc+tTtqjYEQ3k/G8I8nwO4e1GDfo6w5G9dZQQ4YyV4v41NRp0TrtuGBpvGf9anMWUcp63f+fXMOZAnSVg42oZZUYWSPQTnoY1E5I3A6K4wrqEHt4w== siv@craptop,
+  ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCuXK610CJq4pQrTOxESRXEyzQgAICHjgjvfl5GpOR1DoBAmp4oAsckJjbUWqdsdJN/bHc3Femcy71jvZADoO1RyJ16gZVbGsrz1Ale1/VHifjh1vtFt93dI7amUsyogKS9Ypy/FOVUpSMEtsiIwku5D2LJXe80qOS+TV8INTaplufwf+mrLavBCmQ2jYvC5U3c40JoUD2fs63S4FGgX/XbxZnhYuiIzQiHuk8VBDYXME0noGB7UTo+3oBjZSHCkdsjPIZ0CrxNdCV+dAVQ1K8OYekBmGsjL131buvX8irLyDzpEBqxkyP7J+qx7Imea1KJHL3JneJWTfiCSSXCxJpEp8xlot0OTfmJ0Kfon49F74yClqy+ztgyF8BiSWcNylD1TbOqDMJApJh7/toTcVT6VJ74z7p+/3q5+K3mSUC6BO5ilyD+k9/Af4NjIcfD/P9AWyVR+UEXAN1TrgZWI3V3KZENg3geqyyRPFLh3p1NvlwvhwcUn+jGLm82ZrBvaDqB1ihqkF/1mZLiUrsij/7sEUxI3ZIiLPEVRHPnOb+6oFomWPOGbhwPbl98lOgarsNQzQaOe36KFGC6zHPwN/d5PT5TNCgUQ7Gg8igTlXKSH/XUNy4ArQrjTisWt6k93zrAn0HK2Mh774Bvf9eAXqkvlIoti+r8X8nbiIpVAKvm8Q== siv@billy,
+  ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC6HmJQGvQghh8g8JWoUkQf6d3rokSJad4on69WahrvyBUzDASwOnACX0yztDYYu7UzH8TtJqknbp2P5JSKVR+PFvNxo24QYC671QzGyRq4urL8YDsWj5feSL4MEvFY0ivNRNxAKxLHXg+i0jQtiDwBOkhQl0VFrqsKdGlEVcghVeogBAdzHFQNQ7ENZMS30qzW1wrcwWbUBF8ZSvwEQgCXH0UHcIWi3Rzd0g0LfvfbOtI1UjuBzT0gd5F1RSHh0XJWK7jcVrNShMVQqmWWLuHVd8T2k7flGQDBeZPKo3GXdnB4cXgkfNJrsyNDLoJXimj8UryNpn3ejV9DkreL985uAmkLPY11bkD6vWgdZgXA3aWpLQm05crOu4GEn1bGhbnIORm4mjxlANJB0QC9FliCAVkLk4OY7UGnx4mgqMyYjb2LCdgGKVVto97UAisJxWikLiM5nCNrCaGBe05d2nVxPXVKwALI3E2AeIYSmjE4N3mBgUIxWuGS6KoOZsnoSYS3+blQV0W/POuFw4NhlWgZUi8GAaGPfWj8pM/u9dH8FKxhK/PabVKtltLkn4ntgewaeNl18n1NFkQtcDD7Kkg/ZIQ9SiNchK0SxR0/Pgwo/A5GacF+nwTgxGwDJbQ0OPaVlbQd/cCaXl1AX9s7R5Xd8D35KFHTJ1IVnZohDGVQvQ== mob]
+packages: [neofetch,htop,git,zsh,bat]
+package_manager: apt
+#extra_packages: [emacs]
+update: true
+setup: [zsh,bash,user,extra,system] #,emacs

group_vars/skyid.yml

@@ -1,4 +1,5 @@
-user_groups: [sysadmins]
+user_groups: [sysadmins,systemd-journal]
+zsh_prompt: "{{ '%F{blue}% %n%F{green}% @%F{red}% %m %F{yellow}% %1~%f >' }}"
 setup: [zsh,bash,extra]
 zsh_opt_config: false
 extra_packages: []

host_vars/42069.no.yml

@@ -1 +1,2 @@
-user_groups: [sudo,adm,kvm,users,docker]
+---
+user_groups: [sudo, adm, kvm, users, docker]

host_vars/archy.42069.no.yml

@@ -1,2 +1,3 @@
+---
 zsh_opt_config: true
-user_groups: [wheel,sudo,adm,kvm,users,docker]
+user_groups: [wheel, sudo, adm, kvm, users, docker]

host_vars/ctrl-c.club.yml

@@ -0,0 +1,8 @@
+---
+zsh_opt_config: false
+zsh_prompt: "{{ '%F{blue}% %n%F{green}% @%F{red}% %m %F{#bb33bb}% %1~%f >' }}"
+package_manager: null
+# extra_packages: []
+update: false
+setup: [zsh,extra,system] # ,bash,emacs
+revert: false

host_vars/docker-alpine-test.yml

@@ -1,15 +1,12 @@
-# pubkeys: [
+pubkeys: [
-#   ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC1O7dXSrkDZ0l2kQMDnUPcALEYrq9l+fCKANb4sKZebRr+CkvO0Yat6f/O1a4OJWKeIpOMNIG60aiQB4Npn1ACosQ5Jgw1GypEr6QWDKdWqTEQ4qQaJk2sAKbUpEHTvtwlRTZy5zxC0TrRSjXcNmPR5O4GGMPLAdWFmD9iIRA+tjGvB6U4NY8KafxzBmje95oVP8erayEZT90IgljLisg29uAofAfAhjP/KV/z1ppmwrL7Et6N2ZcOfFl+KOcefzjt0bdkV0gFXqYKEFK9WEpVXEHE7CpOu/dJZgVvTT+jfHhWhANkl66dDbv80nfHAINASCBCoUi6CFb8TBru4WABeoyKEQnC04IqHXvgOMr5/f9Sx1PHZNxkXNVuSPbkSnA7Qk4OnHG5c/rEeZ850eM8j0or29PyNFvZjWjBrIG1iReRTdSDkzdwojLuCKMrN8qxmDMuYW0Ey9DCsC2iKyYzJ+3dhilXkaUtQYHrtCM4DB4rcAWV2hRS1mRZwWmKH4QWvwVbjipKAzHg3i2hMFIC6HbNxbYHrzFCSCZN07ObLsyMYR28I74JfFxpNg0OQAZ5QVvOe+PletFjqbpVnjrGhEkBCyGIOfZ14PlJhN0CW8/9fTy6EzvruD2yGTUMq+pJhhJ3Zj5J+zaFJsz3tPxf+OVcsGFLEtbJvu6C9yCT5Q== siv@msitoo,
+ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC1O7dXSrkDZ0l2kQMDnUPcALEYrq9l+fCKANb4sKZebRr+CkvO0Yat6f/O1a4OJWKeIpOMNIG60aiQB4Npn1ACosQ5Jgw1GypEr6QWDKdWqTEQ4qQaJk2sAKbUpEHTvtwlRTZy5zxC0TrRSjXcNmPR5O4GGMPLAdWFmD9iIRA+tjGvB6U4NY8KafxzBmje95oVP8erayEZT90IgljLisg29uAofAfAhjP/KV/z1ppmwrL7Et6N2ZcOfFl+KOcefzjt0bdkV0gFXqYKEFK9WEpVXEHE7CpOu/dJZgVvTT+jfHhWhANkl66dDbv80nfHAINASCBCoUi6CFb8TBru4WABeoyKEQnC04IqHXvgOMr5/f9Sx1PHZNxkXNVuSPbkSnA7Qk4OnHG5c/rEeZ850eM8j0or29PyNFvZjWjBrIG1iReRTdSDkzdwojLuCKMrN8qxmDMuYW0Ey9DCsC2iKyYzJ+3dhilXkaUtQYHrtCM4DB4rcAWV2hRS1mRZwWmKH4QWvwVbjipKAzHg3i2hMFIC6HbNxbYHrzFCSCZN07ObLsyMYR28I74JfFxpNg0OQAZ5QVvOe+PletFjqbpVnjrGhEkBCyGIOfZ14PlJhN0CW8/9fTy6EzvruD2yGTUMq+pJhhJ3Zj5J+zaFJsz3tPxf+OVcsGFLEtbJvu6C9yCT5Q== siv@msitoo,
-#   ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDqXa9fIVrQTGV4PMTn7ZyyeTLDVC+H4kV6zJzWBGGZf6DSoumJtbTaD6Ob3Czsf/NZ35iCPy2yrar3/Z7ccDrcfpxlNvj9l3NphEdXIebyQ8VmMWBy4pDPjE1erIEaL+J5RfjidB7xauticUIuNj0vtuvum/f09vGsohys+/llU7T+M42AeCTT5omw0DD8DPIUGxFwsgg0RxtD5ol1i3v0zVqwlbc7gnHws9/JCJZrhdHZWWkqvVQLCbRRCq4ZvRBcMdwJsBOeJpM9tkeJ7peZjAnPh7EIPkWh79+S65m6bsBe9N4lX5Qf2jxMSzgGeHhfJmd5O7UVqxH1a4M10e+CZOsWdTbMFEn+pcA04gehV9mL5gazZTMSjVFRzd/NUWi0Z6kecXW0HvxWzvKs+iZgaqL7qsDQUb23nMyvtiRO7JeTfdlo/dpb3Uz12VfwcHWAw1DpyJk3Sd1xV4sLke34F67e141ed72Piig6UuX2/aXm5Due781zIS8zBKBl4vXORbGjLLBo72RctB3xU9nJmkttdeSSF/yRbY7H3+bsvno/VUSAhnYWlGNrZBc+tTtqjYEQ3k/G8I8nwO4e1GDfo6w5G9dZQQ4YyV4v41NRp0TrtuGBpvGf9anMWUcp63f+fXMOZAnSVg42oZZUYWSPQTnoY1E5I3A6K4wrqEHt4w== siv@craptop]
+ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDqXa9fIVrQTGV4PMTn7ZyyeTLDVC+H4kV6zJzWBGGZf6DSoumJtbTaD6Ob3Czsf/NZ35iCPy2yrar3/Z7ccDrcfpxlNvj9l3NphEdXIebyQ8VmMWBy4pDPjE1erIEaL+J5RfjidB7xauticUIuNj0vtuvum/f09vGsohys+/llU7T+M42AeCTT5omw0DD8DPIUGxFwsgg0RxtD5ol1i3v0zVqwlbc7gnHws9/JCJZrhdHZWWkqvVQLCbRRCq4ZvRBcMdwJsBOeJpM9tkeJ7peZjAnPh7EIPkWh79+S65m6bsBe9N4lX5Qf2jxMSzgGeHhfJmd5O7UVqxH1a4M10e+CZOsWdTbMFEn+pcA04gehV9mL5gazZTMSjVFRzd/NUWi0Z6kecXW0HvxWzvKs+iZgaqL7qsDQUb23nMyvtiRO7JeTfdlo/dpb3Uz12VfwcHWAw1DpyJk3Sd1xV4sLke34F67e141ed72Piig6UuX2/aXm5Due781zIS8zBKBl4vXORbGjLLBo72RctB3xU9nJmkttdeSSF/yRbY7H3+bsvno/VUSAhnYWlGNrZBc+tTtqjYEQ3k/G8I8nwO4e1GDfo6w5G9dZQQ4YyV4v41NRp0TrtuGBpvGf9anMWUcp63f+fXMOZAnSVg42oZZUYWSPQTnoY1E5I3A6K4wrqEHt4w== siv@craptop]
-# extra_packages: [openssh,emacs,doas,lsd]
+#extra_packages: [openssh,emacs,doas,lsd]
+extra_packages: [git]
 user_groups: [adm,users]
 setup: [bash,zsh,system,extra] # ,emacs
-# zsh_opt_config: false
+# zsh_opt_config: true
 package_manager: apk
-# user_groups: [sysadmins]
 pubkeys: []
-extra_packages: []
+extra_packages: [doas,lsd]
-packages: []
+# update: false
-update: false
-# name: sivert
-# group: "{{ user_groups[0] }}"

roles/common/files/neofetch/config.conf

@@ -2,35 +2,36 @@ print_info() {
     info title
     info underline
 
-    info "OS" distro
+    info "OS" distro &
-    info "Host" model
+    info "Host" model &
-    info "Kernel" kernel
+    info "Kernel" kernel &
-    info "Uptime" uptime
+    info "Uptime" uptime &
-    info "Packages" packages
+    info "Packages" packages &
-    info "Shell" shell
+    info "Shell" shell &
-#    info "Resolution" resolution
+#    info "Resolution" resolution &
-#    info "DE" de
+#    info "DE" de &
-#    info "WM" wm
+#    info "WM" wm &
-#    info "WM Theme" wm_theme
+#    info "WM Theme" wm_theme &
-#    info "Theme" theme
+#    info "Theme" theme &
-    info "Icons" icons
+    info "Icons" icons &
-    info "Terminal" term
+    info "Terminal" term &
-    info "Terminal Font" term_font
+    info "Terminal Font" term_font &
-    info "CPU" cpu
+    info "CPU" cpu &
-    info "GPU" gpu
+    info "GPU" gpu &
-    info "Memory" memory
+    info "Memory" memory &
 
-#    info "GPU Driver" gpu_driver  # Linux/macOS only
+#    info "GPU Driver" gpu_driver &  # Linux/macOS only
-#    info "CPU Usage" cpu_usage
+#    info "CPU Usage" cpu_usage &
-    info "Disk" disk
+    info "Disk" disk &
-#    info "Battery" battery
+#    info "Battery" battery &
-    info "Font" font
+    info "Font" font &
-#    info "Song" song
+#    info "Song" song &
-#    [[ "$player" ]] && prin "Music Player" "$player"
+#    [[ "$player" ]] && prin "Music Player" "$player" &
-    info "Local IP" local_ip
+    info "Local IP" local_ip &
-#    info "Public IP" public_ip
+#    info "Public IP" public_ip &
-#    info "Users" users
+#    info "Users" users &
-#    info "Locale" locale  # This only works on glibc systems.
+#    info "Locale" locale &  # This only works on glibc systems.
+    wait
 
     info cols
 }

roles/common/tasks/main.yml

@@ -1,13 +1,14 @@
+---
 - name: Install packages
   when: update
   block:
   - name: Install packages (pacman)
-    when: "'pacman' in group_names"
+    when: package_manager == 'pacman' or 'pacman' in group_names
     tags: pacman
     block:
     - name: Install the good stuff (pacman)
       pacman: name={{ item }} state=latest
-      ignore_errors: yes
+      ignore_errors: true
       with_items:
       - "{{ extra_packages }}"
       - "{{ packages }}"
@@ -19,12 +20,12 @@
       - "{{ packages }}"
 
   - name: Install packages (apk)
-    when: "'apk' in group_names or 'alpine' in group_names"
+    when: package_manager == 'apk' or 'apk' in group_names or 'alpine' in group_names
     tags: apk
     block:
     - name: Install the good stuff (apk)
       apk: name={{ item }} state=latest
-      ignore_errors: yes
+      ignore_errors: true
       with_items:
       - "{{ extra_packages }}"
       - "{{ packages }}"
@@ -36,12 +37,12 @@
       - "{{ packages }}"
 
   - name: Install packages (apt)
-    when: "'apt' in group_names"
+    when: package_manager == 'apt' or 'apt' in group_names
     tags: apt
     block:
     - name: Install the good stuff (apt)
       apt: package={{ item }} state=latest
-      ignore_errors: yes
+      ignore_errors: true
       with_items:
       - "{{ extra_packages }}"
       - "{{ packages }}"
@@ -60,8 +61,8 @@
     tags: system
 
 - name: Configure user configs
-  when: "'user' in setup"
+  when: "'user' in setup and ('neofetch' in packages or 'neofetch' in extra_packages)"
   block:
   - name: Add ~/.config/neofetch/
-    copy: src=neofetch dest=/home/{{ name }}/.config/neofetch owner={{ name }} group={{ name }} mode=0755
+    copy: src=neofetch dest={{ home }}/.config owner={{ name }} group={{ group }} mode=0755
     tags: config

roles/shell/files/aliases.sh

@@ -1,13 +1,14 @@
 #!/bin/sh
 which lsd>/dev/null
-if [ "$?" = "0" ]; then
+([ $? -eq 0 ] && \
-  alias ls="lsd -h --color=auto --group-dirs first"
+  alias ls="lsd -h --color=auto --group-dirs first") || \
-else
   alias ls="ls -h --color=auto --group-directories-first"
-fi
+# if [ $? -eq 0 ]; then
-# ([ "$?" = "0" ] && \
+#   alias ls="lsd -h --color=auto --group-dirs first"
-#   alias ls="lsd -h --color=auto --group-dirs first") || \
+# else
 #   alias ls="ls -h --color=auto --group-directories-first"
+# fi
+which doas>/dev/null && [ $? -eq 0 ] && alias doas="sudo"
 alias\
   ll="ls -l"\
   la="ls -a"\

roles/shell/files/bin/vault.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+[ -z "$REMOTE" ] && REMOTE=siv@archy.42069.no:/home/coder
+run_rsync() {
+  rsync "$1" "$2" "$3"
+  [ $? -eq 12 ] && echo -e "\e[0;31mRsync is missing on the remote server!\e[0," && exit 0
+}
+pull() {
+  run_rsync "$1" "$3" "$2"
+}
+push() {
+  run_rsync "$1" "$2" "$3"
+}
+sync() {
+  pull "$1" "$2" "$3"
+  push "$1" "$2" "$3"
+}
+case "$1" in
+  mount) cryfs ~/.vault ~/vault -o allow_root ;;
+  push|pull|sync) $1 "-aze ssh" "$HOME/.vault" "$REMOTE" ;;
+  *) echo "Usage: $0 [ push | pull | sync | mount ]" ;;
+esac

roles/shell/tasks/extra.yml

@@ -1,14 +1,16 @@
 - name: Add .aliases
-  copy: src=aliases.sh dest=/home/{{ name }}/.aliases owner={{ name }} group={{ group }} mode=0644
+  copy: src=aliases.sh dest={{ home }}/.aliases owner={{ name }} group={{ group }} mode=0644
 - name: Add .bat.conf
-  copy: src=bat.conf dest=/home/{{ name }}/.bat.conf owner={{ name }} group={{ group }} mode=0644
+  copy: src=bat.conf dest={{ home }}/.bat.conf owner={{ name }} group={{ group }} mode=0644
   when: "'bat' in packages or 'bat' in extra_packages"
+- name: Add ~/.local/bin
+  copy: src=bin dest={{ home }}/.local/bin owner={{ name }} group={{ group }} mode=0755
 
 - name: Install zsh syntax highlighting (~/.zshrc.d folder)
   when: not zsh_opt_config
   git:
     repo: https://github.com/zsh-users/zsh-syntax-highlighting.git
-    dest: /home/{{ name }}/.zshrc.d/zsh-syntax-highlighting
+    dest: "{{ home }}/.zshrc.d/zsh-syntax-highlighting"
     single_branch: yes
     version: master
 - name: Install zsh syntax highlighting (/opt/zsh folder)
@@ -21,6 +23,6 @@
   become: true
 - name: Add ~/.zshrc.d -> /opt/zsh symbolic link
   when: zsh_opt_config
-  file: state=link dest=/home/{{ name }}/.zshrc.d src=/opt/zsh owner={{ name }} group={{ group }} mode=0755
+  file: state=link dest={{ home }}/.zshrc.d src=/opt/zsh owner={{ name }} group={{ group }} mode=0755
 - name: Set owner ship of zsh syntax highlighting files
-  file: state=directory recurse=yes dest=/home/{{ name }}/.zshrc.d owner={{ name }} group={{ group }}
+  file: state=directory recurse=yes dest={{ home }}/.zshrc.d owner={{ name }} group={{ group }}

roles/shell/tasks/main.yml

@@ -3,16 +3,16 @@
   tags: [user,zsh]
   block:
   - name: Add .zshrc
-    template: src=zshrc.zsh.j2 dest=/home/{{ name }}/.zshrc owner={{ name }} group={{ group }} mode=0644
+    template: src=zshrc.zsh.j2 dest={{ home }}/.zshrc owner={{ name }} group={{ group }} mode=0644
   - name: Add zsh zstyles config
-    copy: src=zstyles.zsh dest=/home/{{ name }}/.zstyles owner={{ name }} group={{ group }} mode=0644
+    copy: src=zstyles.zsh dest={{ home }}/.zstyles owner={{ name }} group={{ group }} mode=0644
 
 - name: Setup user bash config
   when: "'bash' in setup"
   tags: [user,bash]
   block:
   - name: Add .bashrc
-    template: src=bashrc.sh.j2 dest=/home/{{ name }}/.bashrc owner={{ name }} group={{ group }} mode=0644
+    template: src=bashrc.sh.j2 dest={{ home }}/.bashrc owner={{ name }} group={{ group }} mode=0644
 
 - name: Setup user extra config
   when: "'extra' in setup"
@@ -22,7 +22,7 @@
 
 - name: Add .env file
   when: not revert
-  copy: src=env.sh dest=/home/{{ name }}/.env owner={{ name }} group={{ group }} mode=0644
+  copy: src=env.sh dest={{ home }}/.env owner={{ name }} group={{ group }} mode=0644
 
 - name: Revert ansible shell setup
   when: revert

roles/shell/tasks/revert.yml

@@ -2,14 +2,14 @@
   tags: [zsh]
   block:
   - name: Remove .zshrc
-    file: state=absent path=/home/{{ name }}/.zshrc
+    file: state=absent path={{ home }}/.zshrc
   - name: Remove zsh zstyles config
-    file: state=absent path=/home/{{ name }}/.zstyles
+    file: state=absent path={{ home }}/.zstyles
   - name: Remove .zshrc.d folder/link
-    file: state=absent path=/home/{{ name }}/.zshrc.d
+    file: state=absent path={{ home }}/.zshrc.d
 
   - name: Remove zsh syntax highlighting
-    file: state=absent path=/home/{{ name }}/.zshrc.d/zsh-syntax-highlighting
+    file: state=absent path={{ home }}/.zshrc.d/zsh-syntax-highlighting
     when: not zsh_opt_config
   - name: Remove zsh syntax highlighting (/opt/zsh)
     file: state=absent path=/opt/zsh/zsh-syntax-highlighting
@@ -20,8 +20,8 @@
   tags: [extra]
   block:
   - name: Remove .aliases
-    file: state=absent path=/home/{{ name }}/.aliases
+    file: state=absent path={{ home }}/.aliases
   - name: Remove .bat.conf
-    file: state=absent path=/home/{{ name }}/.bat.conf
+    file: state=absent path={{ home }}/.bat.conf
   - name: Remove .env file
-    file: state=absent path=/home/{{ name }}/.env
+    file: state=absent path={{ home }}/.env

roles/update/tasks/main.yml

@@ -1,42 +1,50 @@
-# - name: Install yay (AUR helper)
+---
+- name: Update and upgrade package managed stuff
+  when: update
+  block:
+  # - name: Install yay (AUR helper)
 
-# - name: Update and upgrade pacman packages
+  # - name: Update and upgrade yay packages
-#   become: yes
+  #   yay: update_cache=yes upgrade=yes
-#   pacman:
+  #   when: package_manager == 'yay' or 'yay' in group_names
-#     executable: yay
-#     update_cache: yes
-#     upgrade: yes
-#   when: 'pacman'
-#   tags: pacman
 
-- name: Update and upgrade pacman packages
+  - name: Update and upgrade pacman packages
-  become: yes
+    become: true
-  shell: pacman -Syu --noconfirm
+    shell: pacman -Syu --noconfirm
-  when: package_manager == 'pacman' or 'pacman' in group_names
+    when: package_manager == 'yay' or 'yay' in group_names
-  tags: update
 
-- name: Add some repos (alpine)
+  - name: Add some repos (alpine)
-  become: yes
+    become: true
-  shell: |
+    shell: |
-    grep -R 'testing' /etc/apk/repositories
+      grep -R 'testing' /etc/apk/repositories
-    if [ $? == 1 ]; then
+      if [ $? == 1 ]; then
-      echo 'https://dl-cdn.alpinelinux.org/alpine/edge/testing'>>/etc/apk/repositories
+        echo 'https://dl-cdn.alpinelinux.org/alpine/edge/testing'\
-    fi
+        >>/etc/apk/repositories
-  when: "'alpine' in group_names"
+      fi
-  tags: update alpine
+    when: "'alpine' in group_names"
 
-- name: Update and upgrade apk packages
+  - name: Update, upgrade and autoremove xbps packages
-  become: yes
+    become: true
-  apk:
+    shell: xbps-install -ASuvy && xbps-remove -ROoy
-    update_cache: yes
+    when: package_manager == 'xbps' or 'xbps' in group_names
-    upgrade: yes
-  when: package_manager == 'apk' or 'apk' in group_names
-  tags: update
 
-- name: Update and upgrade apt packages
+  - name: Update and upgrade apk packages
-  become: yes
+    become: true
-  apt:
+    apk:
-    update_cache: yes
+      update_cache: true
-    upgrade: yes
+      upgrade: true
-  when: package_manager == 'apt' or 'apt' in group_names
+      state: 'latest'
-  tags: update
+    when: package_manager == 'apk' or 'apk' in group_names
+
+  - name: Update and upgrade apt packages
+    become: true
+    apt:
+      update_cache: true
+      autoremove: true
+      upgrade: true
+    when: package_manager == 'apt' or 'apt' in group_names
+
+  - name: Update and upgrade portage packages
+    become: true
+    shell: eix-sync && emerge -uDNU --with-bdeps=y @world
+    when: package_manager == 'emerge' or 'emerge' in group_names

roles/user/tasks/doom-emacs.yml

@@ -3,19 +3,19 @@
   tags: [doom,emacs]
   block:
   - name: Remove old emacs config
-    file: state=absent path=/home/{{ name }}/.emacs.d
+    file: state=absent path={{ home }}/.emacs.d
   - name: Git clone doom emacs
     git:
       repo: https://github.com/hlissner/doom-emacs
-      dest: /home/{{ name }}/.emacs.d
+      dest: "{{ home }}/.emacs.d"
       accept_newhostkey: yes
       single_branch: yes
       version: master
       depth: 1
   - name: Install doom emacs
     shell: |
-      chown -R {{ name }} /home/{{ name }}/.emacs.d
+      chown -R {{ name }} {{ home }}/.emacs.d
-      echo "y\ny"|su {{ name }} /home/{{ name }}/.emacs.d/bin/doom install
+      echo "y\ny"|su {{ name }} {{ home }}/.emacs.d/bin/doom install
     #* ^ Above we answer terminal prompts
   # - name: Add doom emacs config
   # - name: Run doom sync

servers.ini

@@ -1,9 +1,25 @@
+# Aliases
+[schwarzerfunke_vpn]
+100.64.69.10
+[void]
+192.168.88.69
+
 [archy]
 archy.42069.no
 [liten]
-42069.no
+192.168.88.2
 [store]
-stor
+192.168.88.3
+
+# Location based groupings
+[sky:children]
+schwarzerfunke_vpn
+[loftet:children]
+void
+
+[vpn:children]
+loftet
+sky
 
 [linode:children]
 archy
@@ -11,8 +27,14 @@ archy
 liten
 store
 
-[pacman:children]
+# Package manager groupings
+[yay:children]
+schwarzerfunke_vpn
 archy
 store
+[xbps:children]
+void
 [apt:children]
 liten
+[nix:children]
+void

site.yml

@@ -1,8 +1,7 @@
+---
 - hosts: all
   roles:
-  - role: update
+  - {role: update, tags: update}
-    when: update
-    tags: update
   - common
   - user
   - shell

skyid.ini

@@ -0,0 +1,24 @@
+[all:vars]
+ansible_ssh_private_key_file=~/.ssh/skyid_rsa
+ansible_become_exe=sudo
+ansible_user=sivert
+
+[skyid]
+smokeping.skyid.no
+myrkdalen.skyid.no
+lost-islands.skyid.no
+monitoring.skyid.no
+gulf-of-oman.skyid.no
+lofoten.skyid.no
+narvik.skyid.no
+hangar-22.skyid.no
+propaganda.skyid.no
+toten.skyid.no
+hamar.skyid.no
+mercury.skyid.no
+bergen.skyid.no
+molde.skyid.no
+deploy.skyid.no
+scrapmetal.skyid.no
+dawnbreaker.skyid.no
+backup.skyid.no

test-docker.sh

@@ -1,5 +1,5 @@
-#!/bin/sh
+#!/bin/bash
-user="siv"
+user="${USER:-"root"}"
 
 function playbook() {
   book="${1:-"site.yml"}"
@@ -10,22 +10,18 @@ function playbook() {
 
 case "$1" in
   play)
-  book="${2:-"site.yml"}"
+    book="${2:-"site.yml"}"
-#  opts=""
+#   opts=""
-#  [ ! -z "$3" ] && opts="-t $3"
+#   [ ! -z "$3" ] && opts="-t $3"
-  ansible-playbook "$book" -i docker.ini;;
+    ansible-playbook "$book" -i docker.ini;;
 #    playbook "$2" "$3";;
-  kill)
+  kill) docker kill ansible;;
-    docker kill ansible;;
   run)
     docker run --rm --name ansible -id alpine
     [ "$?" == "0" ] && docker exec ansible /bin/sh -c "apk update && apk add python3"
     ansible -i docker.ini all -m ping;;
-  zsh)
+  zsh) docker exec -itu "$user" ansible zsh;;
-    docker exec -itu "$user" ansible zsh;;
+  *sh) docker exec -it ansible "$1";;
-  sh)
+  "") echo "Usage: $0 [run|kill|play|zsh|*sh|{container cmd}]";;
-    docker exec -it ansible sh;;
+  *) docker exec -itu "$user" ansible $@;;
-  "")echo "Usage: $0 [run|kill|play|sh|{container cmd}]";;
-  *)
-  docker exec -itu "$user" ansible "$@";;
 esac