From 53848bab5f2000b14ab66b15bb5e719b4cd350cb Mon Sep 17 00:00:00 2001 From: starr-dusT Date: Wed, 21 Dec 2022 00:34:22 -0800 Subject: [PATCH] fix dbus and other updates --- home/bin/executable_update.tmpl | 2 +- home/dot_xinitrc | 4 ++-- provision/setup.yml | 2 +- provision/tasks/desktop/packages.yml | 20 +++++++++---------- provision/tasks/system/_main.yml | 2 -- provision/tasks/system/configs.yml | 30 +--------------------------- provision/tasks/system/packages.yml | 22 ++++++++++---------- provision/tasks/system/services.yml | 6 ------ 8 files changed, 25 insertions(+), 63 deletions(-) delete mode 100644 provision/tasks/system/services.yml diff --git a/home/bin/executable_update.tmpl b/home/bin/executable_update.tmpl index f684e50e..1801ed93 100644 --- a/home/bin/executable_update.tmpl +++ b/home/bin/executable_update.tmpl @@ -1,7 +1,7 @@ #!/usr/bin/env sh # provide tags to update with comma seperation (e.g. updates,packages) set -e -echo -e "Starting update for Fedora..." +echo -e "Starting update for Void..." # Goto playbook and run it cd {{ .chezmoi.workingTree }}/provision diff --git a/home/dot_xinitrc b/home/dot_xinitrc index d935eb56..d084fadc 100644 --- a/home/dot_xinitrc +++ b/home/dot_xinitrc @@ -1,2 +1,2 @@ -[[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources -exec i3 +[[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources +exec dbus-run-session i3 diff --git a/provision/setup.yml b/provision/setup.yml index 89f32678..0a1a5b24 100644 --- a/provision/setup.yml +++ b/provision/setup.yml @@ -36,7 +36,7 @@ tasks: # This import MUST be first - #- import_tasks: tasks/system/_main.yml + - import_tasks: tasks/system/_main.yml - import_tasks: tasks/terminal/_main.yml #- import_tasks: tasks/development/_main.yml - import_tasks: tasks/desktop/_main.yml diff --git a/provision/tasks/desktop/packages.yml b/provision/tasks/desktop/packages.yml index d6750016..f3fc5485 100644 --- a/provision/tasks/desktop/packages.yml +++ b/provision/tasks/desktop/packages.yml @@ -31,15 +31,15 @@ state: present become: true -#- name: Install desktop flatpaks -# flatpak: -# name: -# - com.mattjakeman.ExtensionManager # Browse, install, and manage GNOME Shell Extensions -# - com.discordapp.Discord # Voice, video and text communication service -# - org.gimp.GIMP # Create images and edit photographs -# - org.inkscape.Inkscape # Vector Graphics Editor -# state: present -# become: true +- name: Install desktop flatpaks + flatpak: + name: + - com.discordapp.Discord # Voice, video and text communication service + - org.gimp.GIMP # Create images and edit photographs + - org.inkscape.Inkscape # Vector Graphics Editor + - com.github.tchx84.Flatseal # Manage Flatpak permissions + state: present + become: true #- name: Grab desktop binaries # get_url: @@ -53,7 +53,6 @@ #ansible #btrbk #chezmoi - #discord #elogind #fd #git @@ -61,7 +60,6 @@ #python3 #ripgrep #rsync - #syncthing #unzip #void-repo-multilib #void-repo-multilib-nonfree diff --git a/provision/tasks/system/_main.yml b/provision/tasks/system/_main.yml index a12da690..91311cf4 100644 --- a/provision/tasks/system/_main.yml +++ b/provision/tasks/system/_main.yml @@ -2,5 +2,3 @@ tags: ["configs"] - import_tasks: packages.yml tags: ["packages"] -- import_tasks: services.yml - tags: ["services"] \ No newline at end of file diff --git a/provision/tasks/system/configs.yml b/provision/tasks/system/configs.yml index ffe7ba2a..752ee3be 100644 --- a/provision/tasks/system/configs.yml +++ b/provision/tasks/system/configs.yml @@ -1,32 +1,4 @@ -- name: Setup rpm-fusion and flathub - tags: ["once"] - block: - - name: Importing (free) key - ansible.builtin.rpm_key: - state: present - key: https://rpmfusion.org/keys?action=AttachFile&do=get&target=RPM-GPG-KEY-rpmfusion-free-fedora-2020 - - - name: Importing (non-free) key - ansible.builtin.rpm_key: - state: present - key: https://rpmfusion.org/keys?action=AttachFile&do=get&target=RPM-GPG-KEY-rpmfusion-nonfree-fedora-2020 - - - name: install the rpmfusion repo packages - dnf: - name: - - http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-{{ ansible_distribution_major_version }}.noarch.rpm - - http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-{{ ansible_distribution_major_version }}.noarch.rpm - state: present - - - name: Add the flathub flatpak repository remote - flatpak_remote: - name: flathub - state: present - flatpakrepo_url: https://flathub.org/repo/flathub.flatpakrepo - become: true - - name: Create btrbk snapshot directories - tags: ["once"] block: - file: path: /.snapshots @@ -40,4 +12,4 @@ owner: root group: root mode: 0775 - become: true \ No newline at end of file + become: true diff --git a/provision/tasks/system/packages.yml b/provision/tasks/system/packages.yml index a55c3fd7..68641a32 100644 --- a/provision/tasks/system/packages.yml +++ b/provision/tasks/system/packages.yml @@ -1,22 +1,22 @@ - name: Install system dnf packages - dnf: + xbps: name: - git # Fast Version Control System - git-lfs # Git extension for versioning large files - - python-psutil # Cross-platform library for retrieving information on running processes + #- python-psutil # Cross-platform library for retrieving information on running processes - syncthing # Continuous File Synchronization - flatpak # Application deployment framework for desktop apps - - pipewire-codec-aptx # PipeWire Bluetooth aptX codec plugin - - ffmpeg # Digital VCR and streaming server - - wireguard # Fast, modern, secure vpn tunnel - - wireguard-tools # Tool for wireguard - - anacron + #- pipewire-codec-aptx # PipeWire Bluetooth aptX codec plugin + #- wireguard # Fast, modern, secure vpn tunnel + #- wireguard-tools # Tool for wireguard + #- anacron state: present become: true -- name: Install system flatpaks - flatpak: - name: - - com.github.tchx84.Flatseal # Manage Flatpak permissions +- name: Add the flathub flatpak repository remote + flatpak_remote: + name: flathub state: present + flatpakrepo_url: https://flathub.org/repo/flathub.flatpakrepo become: true + diff --git a/provision/tasks/system/services.yml b/provision/tasks/system/services.yml deleted file mode 100644 index 7d004e8b..00000000 --- a/provision/tasks/system/services.yml +++ /dev/null @@ -1,6 +0,0 @@ -- name: Start and enable syncthing - systemd: - name: syncthing@{{ user }} - enabled: true - state: started - become: true \ No newline at end of file