flake.lock

@@ -129,22 +129,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": 1743891346,
@@ -204,7 +188,6 @@
         "agenix": "agenix",
         "home-manager": "home-manager_2",
         "nix-darwin": "nix-darwin",
-        "nix-flatpak": "nix-flatpak",
         "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nur": "nur",

flake.nix

@@ -25,11 +25,10 @@
       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, nix-flatpak, ... }:
+    , rycee-nurpkgs, nur, ... }:
     let
       mkHomeConfiguration = { hostname, arch ? "x86_64", os ? "linux"
         , desktop ? false, extraModules ? [ ] }:
@@ -54,11 +53,7 @@
             ./homes/${hostname}.nix
             agenix.homeManagerModules.default
           ] ++ (if desktop then [ ./homes/desktop.nix ] else [ ])
-            ++ (if (desktop && os == "linux") then [
+            ++ extraModules;
-              ./homes/linux-desktop.nix
-              nix-flatpak.homeManagerModules.nix-flatpak
-            ] else
-              [ ]) ++ extraModules;
           extraSpecialArgs = {
             inherit pkgs-unstable;
             inherit firefox-addons;
@@ -79,12 +74,6 @@
         "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 {

homes/desktop.nix

@@ -16,7 +16,6 @@ in {
       inherit firefox-addons;
       inherit buildFirefoxXpiAddon;
       inherit lib;
-      inherit pkgs;
     };
     zed-editor = zed-config;
   };

homes/harmony.nix

@@ -1,43 +0,0 @@
-{ 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
-  # https://pkgs.tailscale.com/stable/fedora/tailscale.repo
-
-  # dnf packages:
-  # kate
-  # nextcloud-client
-  # nextcloud-client-dolphin
-  # steam
-  # tailscale
-  # 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;
-    };
-  };
-}

homes/linux-desktop.nix

@@ -1,34 +0,0 @@
-{ config, lib, pkgs, pkgs-unstable, ... }: {
-  home = {
-    packages = with pkgs; [
-      inkscape-with-extensions
-      musescore
-      obs-studio
-      ollama
-      qownnotes
-      trayscale
-      veracrypt
-      vorta
-    ];
-  };
-  programs = { };
-  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"
-      ];
-    };
-  };
-}

pkgs.nix

@@ -43,23 +43,9 @@
     sqlitebrowser
     woodpecker-cli
     (pkgs.nerdfonts.override {
-      fonts = [ "FiraCode" "Meslo" "NerdFontsSymbolsOnly" ];
+      fonts = [ "FiraCode" "Hack" "Meslo" "NerdFontsSymbolsOnly" ];
     })
   ];
 
-  linux = with pkgs; [ firefoxpwa ];
+  linux = with pkgs; [ ];
-
-  linux-desktop = with pkgs; [
-    anki
-    bitwarden-desktop
-    inkscape-with-extensions
-    musescore
-    obs-studio
-    ollama
-    openrct2
-    qownnotes
-    trayscale
-    veracrypt
-    vorta
-  ];
 }

programs/firefox.nix

@@ -1,9 +1,7 @@
-{ firefox-addons, buildFirefoxXpiAddon, lib, pkgs }: {
+{ firefox-addons, buildFirefoxXpiAddon, lib }: {
   enable = true;
   package =
     null; # Use native package manager/Homebrew b/c there are fewer breakages
-  nativeMessagingHosts = [ pkgs.firefoxpwa ];
-  profileVersion = null;
   profiles = {
     "millironx-default" = {
       id = 0;