From 724a543f5e1cc4d07e4f7182b5b11c35c5e2961e Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <thomas.christensen@millironx.com>
Date: Mon, 7 Apr 2025 00:10:05 -0500
Subject: [PATCH 1/7] feat: Harmony initial commit to copy to Nix store

---
 flake.nix         |  6 ++++++
 homes/harmony.nix | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 homes/harmony.nix

diff --git a/flake.nix b/flake.nix
index 2bc24ca..4f9b3e6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -74,6 +74,12 @@
         "millironx@bosephus" = mkHomeConfiguration { hostname = "bosephus"; };
 
         "tchristensen@beocat" = mkHomeConfiguration { hostname = "beocat"; };
+
+        "millironx@harmony" = mkHomeConfiguration {
+          hostname = "harmony";
+          arch = "aarch64";
+          desktop = true;
+        };
       };
 
       darwinConfigurations."corianne" = nix-darwin.lib.darwinSystem {
diff --git a/homes/harmony.nix b/homes/harmony.nix
new file mode 100644
index 0000000..78de75f
--- /dev/null
+++ b/homes/harmony.nix
@@ -0,0 +1,39 @@
+{ config, lib, pkgs, pkgs-unstable, ... }: {
+  # harmony is an Asahi Fedora box
+  # I don't use NixOS, so there are some programs that don't interact well with
+  # the base system (or won't even install) when installed from Nix.
+  # There is no uniform way to trigger dnf package installs from Nix, so I'm
+  # just going to list my packages here. I hope to create a custom script that
+  # mimics the ideas of a Brewfile someday
+  # TODO: Create a Brewfile equivalent for dnf
+
+  # dnf repos:
+  # https://github.com/terrapkg/packages?tab=readme-ov-file
+
+  # dnf packages:
+  # kate
+  # steam
+  # thunderbird
+  # vlc
+  # yakuake
+  # zed
+  # zsh
+  home = {
+    username = "millironx";
+    homeDirectory = "/home/millironx";
+  };
+  programs = {
+    git = {
+      signing = {
+        key = "0x37A3041D1C8C4524!";
+        signByDefault = true;
+      };
+    };
+  };
+  services = {
+    gpg-agent = {
+      sshKeys = [ "207D13371E19752A67AA2686C16354D9963821DB" ];
+      pinentryPackage = pkgs.pinentry-qt;
+    };
+  };
+}

From 0549ec0cb62a38cbd9b51aecf2c7603538813bac Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <thomas.christensen@millironx.com>
Date: Wed, 9 Apr 2025 14:18:48 -0500
Subject: [PATCH 2/7] fix: Add profileVersion to Firefox config

---
 programs/firefox.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/programs/firefox.nix b/programs/firefox.nix
index 6fda45e..db7bbd8 100644
--- a/programs/firefox.nix
+++ b/programs/firefox.nix
@@ -2,6 +2,7 @@
   enable = true;
   package =
     null; # Use native package manager/Homebrew b/c there are fewer breakages
+  profileVersion = null;
   profiles = {
     "millironx-default" = {
       id = 0;

From d35395d8dafe3da9672b0281b80f9df04cd14409 Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <thomas.christensen@millironx.com>
Date: Wed, 9 Apr 2025 14:22:08 -0500
Subject: [PATCH 3/7] feat: Add firefoxpwa for Linux

---
 homes/desktop.nix    | 1 +
 pkgs.nix             | 2 +-
 programs/firefox.nix | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/homes/desktop.nix b/homes/desktop.nix
index 9a70e05..e686125 100644
--- a/homes/desktop.nix
+++ b/homes/desktop.nix
@@ -16,6 +16,7 @@ in {
       inherit firefox-addons;
       inherit buildFirefoxXpiAddon;
       inherit lib;
+      inherit pkgs;
     };
     zed-editor = zed-config;
   };
diff --git a/pkgs.nix b/pkgs.nix
index 90cab6b..e67e47c 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -47,5 +47,5 @@
     })
   ];
 
-  linux = with pkgs; [ ];
+  linux = with pkgs; [ firefoxpwa ];
 }
diff --git a/programs/firefox.nix b/programs/firefox.nix
index db7bbd8..5ba3394 100644
--- a/programs/firefox.nix
+++ b/programs/firefox.nix
@@ -1,7 +1,8 @@
-{ firefox-addons, buildFirefoxXpiAddon, lib }: {
+{ firefox-addons, buildFirefoxXpiAddon, lib, pkgs }: {
   enable = true;
   package =
     null; # Use native package manager/Homebrew b/c there are fewer breakages
+  nativeMessagingHosts = [ pkgs.firefoxpwa ];
   profileVersion = null;
   profiles = {
     "millironx-default" = {

From 42002f9dfd7c952097cbfd0d594d83fd4162ba27 Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <thomas.christensen@millironx.com>
Date: Wed, 9 Apr 2025 20:48:21 -0500
Subject: [PATCH 4/7] feat: Add Linux desktop apps

---
 flake.nix               |  5 ++++-
 homes/linux-desktop.nix | 11 +++++++++++
 pkgs.nix                |  7 ++++++-
 3 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 homes/linux-desktop.nix

diff --git a/flake.nix b/flake.nix
index 4f9b3e6..e6483da 100644
--- a/flake.nix
+++ b/flake.nix
@@ -53,7 +53,10 @@
             ./homes/${hostname}.nix
             agenix.homeManagerModules.default
           ] ++ (if desktop then [ ./homes/desktop.nix ] else [ ])
-            ++ extraModules;
+            ++ (if (desktop && os == "linux") then
+              [ ./homes/linux-desktop.nix ]
+            else
+              [ ]) ++ extraModules;
           extraSpecialArgs = {
             inherit pkgs-unstable;
             inherit firefox-addons;
diff --git a/homes/linux-desktop.nix b/homes/linux-desktop.nix
new file mode 100644
index 0000000..5dc71db
--- /dev/null
+++ b/homes/linux-desktop.nix
@@ -0,0 +1,11 @@
+{ config, lib, pkgs, pkgs-unstable, firefox-addons, buildFirefoxXpiAddon, ... }:
+let
+  packages = import ./../pkgs.nix {
+    inherit pkgs;
+    inherit pkgs-unstable;
+  };
+in {
+  home = { packages = packages.linux-desktop; };
+  programs = { };
+  services = { };
+}
diff --git a/pkgs.nix b/pkgs.nix
index e67e47c..dd507a7 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -43,9 +43,14 @@
     sqlitebrowser
     woodpecker-cli
     (pkgs.nerdfonts.override {
-      fonts = [ "FiraCode" "Hack" "Meslo" "NerdFontsSymbolsOnly" ];
+      fonts = [ "FiraCode" "Meslo" "NerdFontsSymbolsOnly" ];
     })
   ];
 
   linux = with pkgs; [ firefoxpwa ];
+
+  linux-desktop = with pkgs;
+    [
+
+    ];
 }

From 99338fe2edd4f87d2aa4f29f0742e2b29269b983 Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <thomas.christensen@millironx.com>
Date: Thu, 10 Apr 2025 09:34:27 -0500
Subject: [PATCH 5/7] feat: Add nix-flatpak for Linux desktop systems

---
 flake.lock              | 17 +++++++++++++++++
 flake.nix               | 10 ++++++----
 homes/linux-desktop.nix | 20 +++++++++++++++++++-
 pkgs.nix                | 17 +++++++++++++----
 4 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/flake.lock b/flake.lock
index e434794..18938ee 100644
--- a/flake.lock
+++ b/flake.lock
@@ -129,6 +129,22 @@
         "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": 1743891346,
@@ -188,6 +204,7 @@
         "agenix": "agenix",
         "home-manager": "home-manager_2",
         "nix-darwin": "nix-darwin",
+        "nix-flatpak": "nix-flatpak",
         "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nur": "nur",
diff --git a/flake.nix b/flake.nix
index e6483da..6bbb6d9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,10 +25,11 @@
       url = "github:nix-community/NUR";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    nix-flatpak.url = "github:gmodena/nix-flatpak?ref=v0.6.0";
   };
 
   outputs = { self, nix-darwin, nixpkgs, nixpkgs-unstable, home-manager, agenix
-    , rycee-nurpkgs, nur, ... }:
+    , rycee-nurpkgs, nur, nix-flatpak, ... }:
     let
       mkHomeConfiguration = { hostname, arch ? "x86_64", os ? "linux"
         , desktop ? false, extraModules ? [ ] }:
@@ -53,9 +54,10 @@
             ./homes/${hostname}.nix
             agenix.homeManagerModules.default
           ] ++ (if desktop then [ ./homes/desktop.nix ] else [ ])
-            ++ (if (desktop && os == "linux") then
-              [ ./homes/linux-desktop.nix ]
-            else
+            ++ (if (desktop && os == "linux") then [
+              ./homes/linux-desktop.nix
+              nix-flatpak.homeManagerModules.nix-flatpak
+            ] else
               [ ]) ++ extraModules;
           extraSpecialArgs = {
             inherit pkgs-unstable;
diff --git a/homes/linux-desktop.nix b/homes/linux-desktop.nix
index 5dc71db..87ab3cb 100644
--- a/homes/linux-desktop.nix
+++ b/homes/linux-desktop.nix
@@ -7,5 +7,23 @@ let
 in {
   home = { packages = packages.linux-desktop; };
   programs = { };
-  services = { };
+  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.bitwarden.desktop"
+        "com.github.tchx84.Flatseal"
+        "com.logseq.Logseq"
+        "io.freetubeapp.FreeTube"
+        "io.github.alainm23.planify"
+        "io.openrct2.OpenRCT2"
+        "net.ankiweb.Anki"
+      ];
+    };
+  };
 }
diff --git a/pkgs.nix b/pkgs.nix
index dd507a7..21be20d 100644
--- a/pkgs.nix
+++ b/pkgs.nix
@@ -49,8 +49,17 @@
 
   linux = with pkgs; [ firefoxpwa ];
 
-  linux-desktop = with pkgs;
-    [
-
-    ];
+  linux-desktop = with pkgs; [
+    anki
+    bitwarden-desktop
+    inkscape-with-extensions
+    musescore
+    obs-studio
+    ollama
+    openrct2
+    qownnotes
+    trayscale
+    veracrypt
+    vorta
+  ];
 }

From 2174329b964cdf63bde50a65c7ebc31f4a646275 Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <thomas.christensen@millironx.com>
Date: Sat, 19 Apr 2025 19:15:55 -0500
Subject: [PATCH 6/7] add more packages to harmony dnf list

---
 homes/harmony.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/homes/harmony.nix b/homes/harmony.nix
index 78de75f..9e89f87 100644
--- a/homes/harmony.nix
+++ b/homes/harmony.nix
@@ -9,10 +9,14 @@
 
   # dnf repos:
   # https://github.com/terrapkg/packages?tab=readme-ov-file
+  # https://pkgs.tailscale.com/stable/fedora/tailscale.repo
 
   # dnf packages:
   # kate
+  # nextcloud-client
+  # nextcloud-client-dolphin
   # steam
+  # tailscale
   # thunderbird
   # vlc
   # yakuake

From 72b9beff2918d9fcc13349b2a239a5184a11b29d Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <thomas.christensen@millironx.com>
Date: Sat, 19 Apr 2025 19:17:35 -0500
Subject: [PATCH 7/7] Switch to installing packages directly from
 home/linux-desktop.nix

Having everything in a single Pkgs.nix was
actually Claude's idea. I now know that
package lists merge correctly, so this is
redundant and adds unneeded complexity.
Start cleaning up this garbage now.
---
 homes/linux-desktop.nix | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/homes/linux-desktop.nix b/homes/linux-desktop.nix
index 87ab3cb..87f9af0 100644
--- a/homes/linux-desktop.nix
+++ b/homes/linux-desktop.nix
@@ -1,11 +1,16 @@
-{ config, lib, pkgs, pkgs-unstable, firefox-addons, buildFirefoxXpiAddon, ... }:
-let
-  packages = import ./../pkgs.nix {
-    inherit pkgs;
-    inherit pkgs-unstable;
+{ config, lib, pkgs, pkgs-unstable, ... }: {
+  home = {
+    packages = with pkgs; [
+      inkscape-with-extensions
+      musescore
+      obs-studio
+      ollama
+      qownnotes
+      trayscale
+      veracrypt
+      vorta
+    ];
   };
-in {
-  home = { packages = packages.linux-desktop; };
   programs = { };
   services = {
     flatpak = {