fix(os/el): enable Google repo and RPMfusion

Signed-off-by: Matej Focko <me@mfocko.xyz>

playbooks/bootstrap.yml

@@ -72,6 +72,11 @@
     - role: terminals/kitty
       tags: kitty
 
+    # Install Ptyxis terminal
+    - role: terminals/ptyxis
+      when: ansible_distribution != "Ubuntu"
+      tags: ptyxis
+
     # Install fonts
     - role: fonts
       tags: fonts

roles/base/desktop/tasks/scripts.yml

@@ -1,8 +1,8 @@
 ---
-- name: Install script for toolbox name retrieval
+- name: Install script for toolbox/distrobox name retrieval
   ansible.builtin.copy:
-    src: files/toolbox_name.sh
-    dest: ~/.local/bin/toolbox_name
+    src: files/boxname.sh
+    dest: ~/.local/bin/boxname
     mode: 0700
 
 - name: Install script for paste.sr.ht

roles/base/desktop/tasks/structure.yml

@@ -9,6 +9,7 @@
   loop:
     - ~/.local/bin
     - ~/.local/share
+    - ~/.local/share/applications
     - ~/.ssh
 
 - name: Create empty file for tokens

roles/cups/tasks/main.yml

@@ -15,6 +15,7 @@
     immediate: true
     permanent: true
     state: enabled
+  when: ansible_facts.services['firewalld'] is defined
   tags: firewall
 
 - name: Enable cups

roles/editors/helix/tasks/install_Archlinux.yml

@@ -0,0 +1 @@
+install_generic.yml

roles/editors/helix/tasks/install_fedora-family.yml

@@ -3,6 +3,7 @@
   community.general.copr:
     name: varlad/helix
     state: enabled
+  when: ansible_distribution not in ("AlmaLinux")
   become: true
 
 - name: Install the Helix

roles/editors/helix/tasks/install_openSUSE Tumbleweed.yml

@@ -1 +1 @@
-install_suse.yml
+install_generic.yml

roles/editors/vscode/tasks/main.yml

@@ -38,4 +38,5 @@
     cmd: bash /home/{{ target_user }}/.local/bin/code-update.sh
     creates: /opt/VSCode-linux-x64
   become: true
+  when: false
   tags: install

roles/flatpak/tasks/install.yml

@@ -0,0 +1,6 @@
+---
+- name: Install the required packages
+  ansible.builtin.package:
+    name: flatpak
+    state: present
+  become: true

roles/flatpak/tasks/main.yml

@@ -1,4 +1,8 @@
 ---
+- name: Packages
+  ansible.builtin.include_tasks: install.yml
+  tags: install
+
 - name: Enable Flathub
   community.general.flatpak_remote:
     name: flathub

roles/nginx/tasks/main.yml

@@ -80,6 +80,7 @@
   loop:
     - http
     - https
+  when: ansible_facts.services['firewalld'] is defined
   tags: firewall
 
 - name: Enable nginx

roles/os/el/files/google-chrome.repo

@@ -0,0 +1,6 @@
+[google-chrome]
+name=google-chrome
+baseurl=http://dl.google.com/linux/chrome/rpm/stable/x86_64
+enabled=1
+gpgcheck=1
+gpgkey=https://dl.google.com/linux/linux_signing_key.pub

roles/os/el/tasks/main.yml

@@ -29,5 +29,23 @@
   community.general.copr:
     name: mfocko/mfocko
     state: enabled
-    chroot: "epel-9-{{ ansible_architecture }}"
+    chroot: "epel-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}"
   become: true
+
+- name: Install RPMFusion RPMs with GPG keys
+  ansible.builtin.dnf:
+    name:
+      - "https://mirrors.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_distribution_major_version }}.noarch.rpm"
+      - "https://mirrors.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-{{ ansible_distribution_major_version }}.noarch.rpm"
+    disable_gpg_check: true
+    state: present
+  tags: os-el-rpmfusion
+
+- name: Install Google Chrome repository
+  ansible.builtin.copy:
+    src: files/google-chrome.repo
+    dest: /etc/yum.repos.d/google-chrome.repo
+    mode: 0640
+    owner: root
+    group: root
+  tags: os-el-chrome

roles/shell/zsh/files/starship.toml

@@ -36,20 +36,13 @@ format = '\([$state( $progress_current/$progress_total)]($style)\) '
 style = "cyan"
 
 [git_status]
-format = "[[(*$conflicted$untracked$modified$staged$renamed$deleted)](218) ($ahead_behind$stashed)]($style)"
+format = "[[(*$conflicted$untracked$modified$staged$renamed$deleted)](218) ($ahead_behind$stashed)]($style) "
 style = "cyan"
-conflicted = "​"
-untracked = "​"
-modified = "​"
-staged = "​"
-renamed = "​"
-deleted = "​"
-stashed = "≡"
 
 [custom.toolbox]
 when = "ls /run/.containerenv"
-symbol = " "
-command = "~/.local/bin/toolbox_name.sh"
+symbol = "󰡨  "
+command = "~/.local/bin/boxname"
 format = "in [$symbol($output )]($style)"
 style = "bold purple"
 

roles/sshd/tasks/install.yml

@@ -1,13 +1,18 @@
 ---
+- name: SSH family packages for co-Ubuntu
+  ansible.builtin.set_fact:
+    ssh_packages: [openssh, openssh-clients, openssh-server]
+  when: ansible_distribution not in ("Ubuntu", "Archlinux")
+
 - name: SSH family packages for Ubuntu
   ansible.builtin.set_fact:
     ssh_packages: [openssh-client, openssh-server]
   when: ansible_distribution == "Ubuntu"
 
-- name: SSH family packages for co-Ubuntu
+- name: SSH family package for archLinux
   ansible.builtin.set_fact:
-    ssh_packages: [openssh, openssh-clients, openssh-server]
-  when: ansible_distribution != "Ubuntu"
+    ssh_packages: [openssh]
+  when: ansible_distribution == "Archlinux"
 
 - name: Install the SSH family
   ansible.builtin.package:

roles/sshd/tasks/main.yml

@@ -41,6 +41,7 @@
     immediate: true
     permanent: true
     state: enabled
+  when: ansible_facts.services['firewalld'] is defined
   notify: "Restart SSH server"
   tags: firewall
 
@@ -49,6 +50,7 @@
     service: ssh
     permanent: true
     state: disabled
+  when: ansible_facts.services['firewalld'] is defined
   tags: firewall
 
 - name: Set trusted CA

roles/terminals/ptyxis/tasks/main.yml

@@ -0,0 +1,6 @@
+---
+- name: Install Ptyxis
+  community.general.flatpak:
+    name: "https://nightly.gnome.org/repo/appstream/org.gnome.Ptyxis.Devel.flatpakref"
+    state: present
+  become: true

roles/wg/tasks/main.yml

@@ -41,7 +41,7 @@
     gateway: "{{ wg_gateway }}"
     peers: "{{ wg_peers }}"
   ansible.builtin.template:
-    src: "{{ wg_ifname }}.conf"
+    src: "templates/wg.conf"
     dest: "/etc/wireguard/{{ wg_ifname }}.conf"
     owner: root
     group: root
@@ -49,7 +49,7 @@
 
 - name: Set up the DNS on AlmaLinux
   ansible.builtin.include_tasks: "dns_{{ ansible_distribution }}.yml"
-  when: domain and ansible_distribution == "AlmaLinux"
+  when: wg_domain and ansible_distribution == "AlmaLinux"
 
 - name: Enable and start the wireguard connection
   ansible.builtin.service: