Merge pull request #543 from genebean/rainbow

rainbow

flake.nix

@@ -163,13 +163,16 @@
             inputs.simple-nixos-mailserver.nixosModule
           ];
         };
-        rainbow-planet = localLib.mkNixosHost {
-          hostname = "rainbow-planet";
-          additionalModules = [
-            inputs.nixos-cosmic.nixosModules.default
-            inputs.nixos-hardware.nixosModules.dell-xps-13-9360
-          ];
-        };
+        # This machines is currently running Ubuntu and
+        # configured with home-manager only.
+        #
+        #rainbow-planet = localLib.mkNixosHost {
+        #  hostname = "rainbow-planet";
+        #  additionalModules = [
+        #    inputs.nixos-cosmic.nixosModules.default
+        #    inputs.nixos-hardware.nixosModules.dell-xps-13-9360
+        #  ];
+        #};
       }; # end nixosConfigurations
 
       # Home Manager (only) users

lib/mkHomeConfig.nix

@@ -22,9 +22,10 @@
       # the path to your home.nix.
       modules = [
         ./nixpkgs-settings.nix
-        ../modules/shared/home/general
         ../modules/hosts/home-manager-only
         ../modules/hosts/home-manager-only/home-${username}.nix
+        ../modules/shared/home/general
+        ../modules/shared/linux/flatpaks.nix
 
         {
           home = {
@@ -33,6 +34,7 @@
           };
         }
 
+        inputs.nix-flatpak.homeManagerModules.nix-flatpak
         inputs.sops-nix.homeManagerModules.sops
       ];
     };

modules/hosts/nixos/bigboy/default.nix

@@ -16,7 +16,7 @@ in
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
-    ../../../shared/nixos/flatpaks.nix
+    ../../../shared/linux/flatpaks.nix
     ../../../shared/nixos/ripping.nix
   ];
 

modules/hosts/nixos/rainbow-planet/default.nix

@@ -8,7 +8,7 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ../../../shared/nixos/flatpaks.nix
+    ../../../shared/linux/flatpaks.nix
     ../../../shared/nixos/ripping.nix
   ];
 

modules/shared/linux/flatpaks.nix

@@ -1,15 +1,21 @@
 {
+  # Though it wouldn't seem to be this way,
+  # This is used both in NixOS and Home Manager
   services = {
     flatpak = {
       enable = true;
       packages = [
-        "im.riot.Riot"
         "com.cassidyjames.butler"
         "com.logseq.Logseq"
         "com.vivaldi.Vivaldi"
+        "im.riot.Riot"
+        "io.kopia.KopiaUI"
+        "org.localsend.localsend_app"
+        "org.gnome.Fractal"
         "org.signal.Signal"
         "org.telegram.desktop"
       ];
+      uninstallUnmanaged = true;
       update.auto = {
         enable = true;
         onCalendar = "daily";