Merge remote-tracking branch 'upstream/master' into update_from_eoli3n_arch_config

Author: stevleibelt

.pre-commit-config.yaml

@@ -0,0 +1,19 @@
+repos:
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v4.0.1
+  hooks:
+    - id: check-yaml
+    - id: trailing-whitespace
+      args: [--markdown-linebreak-ext=md]
+- repo: https://github.com/shellcheck-py/shellcheck-py
+  rev: v0.7.2.1
+  hooks:
+    - id: shellcheck
+- repo: local
+  hooks:
+    - id: ansible-syntax-check
+      name: Ansible syntax check
+      entry: "ansible/contrib/syntax-check.sh"
+      pass_filenames: no
+      types_or: [yaml, jinja]
+      language: script

ansible/contrib/syntax-check.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+# Workaround to detect aur submodule library with pre-commit
+
+CURRENT_DIR=$(dirname "$0")
+cd "$CURRENT_DIR"/.. || exit 1
+ansible-playbook --syntax-check install-zfs.yml

ansible/install-zfs.yml

@@ -31,3 +31,4 @@
     - { role: containers, tags: containers }
     - { role: recovery, tags: recovery }
     - { role: zfs, tags: zfs }
+    - { role: printers, tags: printers }

ansible/roles/base/tasks/main.yml

@@ -5,6 +5,7 @@
     skip_installed: true
     name:
       - ttf-impallari-cabin-font # cv font
+      - ttf-ms-fonts # microsoft fonts
       - glow # render markdown cli
       - zrepl # zfs snapshot manager
 
@@ -14,6 +15,7 @@
       # Main
       - ttf-jetbrains-mono # main font
       - noto-fonts         # unicode font
+      - noto-fonts-emoji   # emojis
       # Shell
       - fish               # powerful shell
       - starship           # cross-shell prompt
@@ -51,12 +53,13 @@
       - wget               # downloader
       - bind-tools         # dns tools
       - openbsd-netcat     # network utility
-      - speedtest-cli      # 
+      - speedtest-cli      #
       # Utils
       - cronie             # Scheduler
       - at                 # Scheduler
       - borgbackup         # backup utility
       - borgmatic          # backup utility automation
+      - pwgen              # random password generator
       - lsd                # improved ls command
       - rsync              # sync tool
       - rclone             # sync tool

ansible/roles/desktop/tasks/main.yml

@@ -15,6 +15,7 @@
       - wofi # rofi for wayland
       - swayidle
       - xdg-user-dirs
+      - xdg-desktop-portal-wlr
     state: present
 
 - name: install video packages
@@ -60,9 +61,10 @@
       - lollypop # music player
       - lxappearance # theme manager
       - mpv # video player
-      - thunar # file manager
+      - nemo # file manager
       - tumbler # thumbnailer
-      - openvpn
+      - openvpn # vpn client
+      - openconnect # globalprotect vpn client
       - playerctl # music player cli controller
       - rdesktop # remote desktop client
       - steam # games manager
@@ -74,7 +76,7 @@
       - variety # random backgrounds
       - papirus-icon-theme # icon theme
       - gnome-themes-extra # gtk themes
-      - x2goclient 
+      #- x2goclient
       - youtube-dl
       - gopass # password manager
     state: present
@@ -93,11 +95,11 @@
     skip_installed: true
     name:
       - adapta-gtk-theme #https://github.com/Alexays/Waybar/issues/515
-      - equilux-theme 
+      - equilux-theme
       - wdisplays-git # arandr for wayland
       - wf-recorder-git # screen recorder for wayland
       - grimshot-git # grim+slurp wrapper
-      - swaylock-fancy-git # locker for wayland
+      - waypipe # wayland ssh -X
       - wob # bars for wayland
       - connman-gtk # connman gtk gui
       #- gnome-ssh-askpass2 # ssh askpass gui
@@ -112,4 +114,23 @@
       - tiny-irc-client-git
       - starleaf-breeze
       - swappy # screenshot editor
-      - senpai # irc client for soju
+      - senpai-irc # irc client for soju
+      - rbenv # ruby env manager
+      #- phockup # picture sorting tool
+
+- name: test swaylock-fancy
+  stat:
+    path: /bin/swaylock-fancy
+  register: swaylock
+
+- name: clone swaylock-fancy
+  git:
+    repo: https://github.com/eoli3n/swaylock-fancy
+    dest: /tmp/swaylock-fancy
+  when: not swaylock.stat.exists
+
+- name: install swaylock-fancy
+  shell: make install
+  args:
+    chdir: /tmp/swaylock-fancy
+  when: not swaylock.stat.exists

ansible/roles/flatpak/tasks/main.yml

@@ -40,3 +40,7 @@
       --filesystem=~/img:ro \
       --filesystem=~/downloads:ro \
       --filesystem=~/share:ro
+
+- name: zoom screen sharing
+  shell : |
+    flatpak override --env=XDG_CURRENT_DESKTOP=GNOME us.zoom.Zoom

ansible/roles/pacman/tasks/main.yml

@@ -13,6 +13,10 @@
         path: /etc/pacman.conf
         regexp: '#CheckSpace'
         line: 'CheckSpace'
+    - lineinfile:
+        path: /etc/pacman.conf
+        regexp: '#VerbosePkgLists'
+        line: 'VerbosePkgLists'
     - lineinfile:
         path: /etc/pacman.conf
         regexp: '#ILoveCandy'

ansible/roles/printers/handlers/main.yml

@@ -1,7 +1,7 @@
 ---
 - name: enable cups
   systemd:
-    name: org.cups.cupsd.service
+    name: cups
     state: restarted
     daemon_reload: yes
     enabled: yes

ansible/roles/zfs/files/zrepl.yml

@@ -17,7 +17,8 @@ jobs:
 - name: home
   type: snap
   filesystems: {
-    "zroot/data/home<": true
+    "zroot/data/home/user<": true,
+    "zroot/data/home/user/downloads": false
   }
   snapshotting:
     type: periodic

scripts/zfs/install/02-install.sh

@@ -218,7 +218,9 @@ EOSF
   cpanm --notest --installdeps .
 
   # Create user
-  useradd -m $user
+  zfs create zroot/data/home/${user}
+  useradd -m ${user}
+  chown -R ${user}:${user} /home/${user}
 
 EOF