From 0d5cf37ff361c499dda166f3dfb939700b4c8dc4 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Wed, 16 Jul 2025 14:10:01 -0500 Subject: [PATCH 1/3] Add Onedrive package for desktop Fedora systems --- playbook.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/playbook.yaml b/playbook.yaml index 0d857a7..2c8c539 100644 --- a/playbook.yaml +++ b/playbook.yaml @@ -188,6 +188,7 @@ - nextcloud-client - nextcloud-client-dolphin - obs-studio + - onedrive - qownnotes - qt - rssguard From 6e232c85a55d75901327193697a1e12848bd9d23 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Tue, 22 Jul 2025 18:14:17 -0500 Subject: [PATCH 2/3] refactor: Use Ansible to manage Flatpaks instead of home-manager home-manager has had issues for a while where it would not install or update Flatpaks after the GPG config was applied. Since I am using Ansible on the Fedora systems anyway, switch to using Ansible for Flatpak management in general. --- flake.lock | 17 -------------- flake.nix | 6 ++--- homes/linux-desktop.nix | 16 ------------- homes/odyssey.nix | 4 ---- playbook.yaml | 50 +++++++++++++++++++++++++++-------------- 5 files changed, 35 insertions(+), 58 deletions(-) diff --git a/flake.lock b/flake.lock index c908eed..965e115 100644 --- a/flake.lock +++ b/flake.lock @@ -90,22 +90,6 @@ "type": "github" } }, - "nix-flatpak": { - "locked": { - "lastModified": 1739444422, - "narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=", - "owner": "gmodena", - "repo": "nix-flatpak", - "rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177", - "type": "github" - }, - "original": { - "owner": "gmodena", - "ref": "v0.6.0", - "repo": "nix-flatpak", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1750969886, @@ -219,7 +203,6 @@ "agenix": "agenix", "home-manager": "home-manager", "nix-darwin": "nix-darwin", - "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs", "nixpkgs-darwin": "nixpkgs-darwin", "nixpkgs-unstable": "nixpkgs-unstable", diff --git a/flake.nix b/flake.nix index b2cfd90..70f93f6 100644 --- a/flake.nix +++ b/flake.nix @@ -37,7 +37,6 @@ home-manager.follows = "home-manager"; }; }; - nix-flatpak.url = "github:gmodena/nix-flatpak?ref=v0.6.0"; quadlet-nix.url = "github:SEIAROTg/quadlet-nix"; # Darwin-specific inputs @@ -48,8 +47,8 @@ }; outputs = { self, nix-darwin, nixpkgs, nixpkgs-darwin, nixpkgs-unstable - , home-manager, agenix, rycee-nurpkgs, nur, nix-flatpak, plasma-manager - , quadlet-nix, ... }: + , home-manager, agenix, rycee-nurpkgs, nur, plasma-manager, quadlet-nix, ... + }: let mkHomeConfiguration = { hostname, arch ? "x86_64", os ? "linux" , desktop ? false, extraModules ? [ ] }: @@ -76,7 +75,6 @@ ] ++ (if desktop then [ ./homes/desktop.nix ] else [ ]) ++ (if (desktop && os == "linux") then [ ./homes/linux-desktop.nix - nix-flatpak.homeManagerModules.nix-flatpak plasma-manager.homeManagerModules.plasma-manager ] else [ ]) ++ extraModules; diff --git a/homes/linux-desktop.nix b/homes/linux-desktop.nix index 75de35d..2974bad 100644 --- a/homes/linux-desktop.nix +++ b/homes/linux-desktop.nix @@ -10,22 +10,6 @@ in { }; programs = { plasma = plasma-config { inherit config; }; }; services = { - flatpak = { - enable = true; - # Note: Right now, this does not actually install flatpaks correctly on - # harmony. - # It will however, alert me that certain packages are not installed, and - # serves as a place for me to write down the flatpaks I want to install - # anyway - packages = [ - "com.github.tchx84.Flatseal" - "com.logseq.Logseq" - "io.freetubeapp.FreeTube" - "io.github.alainm23.planify" - "io.openrct2.OpenRCT2" - "net.ankiweb.Anki" - ]; - }; gpg-agent = { # Use kwallet cli, but put it in extraConfig, otherwise gpg-agent will # ask the cli for the password, instead of asking the pinentry package for it diff --git a/homes/odyssey.nix b/homes/odyssey.nix index 0a48a8a..53b5368 100644 --- a/homes/odyssey.nix +++ b/homes/odyssey.nix @@ -13,10 +13,6 @@ }; services = { gpg-agent = { sshKeys = [ "F72C07DBA3DC0903C3ABB55E8B460803FEC22640" ]; }; - flatpak = { - packages = - [ "com.bitwarden.desktop" "dev.deedles.Trayscale" "org.signal.Signal" ]; - }; }; xdg = { configFile = { diff --git a/playbook.yaml b/playbook.yaml index 2c8c539..fd1dab6 100644 --- a/playbook.yaml +++ b/playbook.yaml @@ -215,30 +215,46 @@ ansible.builtin.dnf: name: "*" state: latest # noqa: package-latest - # Generally speaking, I try to install Flatpak applications at the user - # level b/c that really gives more credence to the whole sandboxing idea - # (concept of least privilege). Regardless, we should make sure all the - # system-level Flatpaks are up-to-date. - - name: Upgrade system Flatpaks - community.general.flatpak: - name: "*" - state: latest - method: system -# User-installed Flatpaks are to be installed via home-manager - or at least, -# that's the goal. (There currently seems to be a bug where my GPG configuration -# is getting in the way of validating the Flathub remote, but I am still -# specifying Flatpaks in services.flatpak.) Thanks to that bug, I want a way to -# have this play upgrade my Flatpaks. -- name: Ensure Flatpak packages are up-to-date +# Generally speaking, I try to install Flatpak applications at the user level +# b/c that really gives more credence to the whole sandboxing idea (concept of +# least privilege). Flatpaks are configured differently per-arch, so we go back +# to different configs for each group +- name: Configure common Flatpaks hosts: desktop become: false tasks: - - name: Upgrade user Flatpaks + - name: Add Flathub remote + community.general.flatpak_remote: + name: flathub + state: present + flatpakrepo_url: https://dl.flathub.org/repo/flathub.flatpakrepo + method: user + - name: Install common Flatpaks community.general.flatpak: - name: "*" + name: + - com.github.tchx84.Flatseal + - com.logseq.Logseq + - io.freetubeapp.FreeTube + - io.github.alainm23.planify + - io.openrct2.OpenRCT2 + - net.ankiweb.Anki state: latest method: user + remote: flathub +- name: Configure amd64 Flatpaks + hosts: amd64 + become: false + tasks: + - name: Install amd64 Flatpaks + community.general.flatpak: + name: + - com.bitwarden.desktop + - dev.deedles.Trayscale + - org.signal.Signal + state: latest + method: user + remote: flathub # Pull the latest home-manager configuration - name: Ensure home-manager configuration is up-to-date From bcb3976de8e996b1933e41385797b79b05e41df1 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Tue, 22 Jul 2025 18:40:16 -0500 Subject: [PATCH 3/3] Install protontricks --- playbook.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/playbook.yaml b/playbook.yaml index fd1dab6..04105b0 100644 --- a/playbook.yaml +++ b/playbook.yaml @@ -189,6 +189,7 @@ - nextcloud-client-dolphin - obs-studio - onedrive + - protontricks - qownnotes - qt - rssguard