From f63ccb92ca887692fec0df2f592779492db71942 Mon Sep 17 00:00:00 2001
From: Andreas Schaafsma <andreas@subsonics.nl>
Date: Tue, 8 Oct 2024 06:19:00 +0200
Subject: [PATCH] update nixosConfigurations

---
 flake.nix                                | 84 +++++++++++++-----------
 systems/th0nkpad-nixos/configuration.nix |  2 +
 2 files changed, 47 insertions(+), 39 deletions(-)

diff --git a/flake.nix b/flake.nix
index a4aa800..9c5c21e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,47 +15,53 @@
       installedPackages = (import ./installed-packages { inherit pkgs; });
     in
     {
-      nixosConfigurations = {
-        nixos = nixpkgs.lib.nixosSystem {
-          inherit system;
-          modules = [
-            nixos-wsl.nixosModules.default
-            ./systems/drivebystation-nixos-wsl/configuration.nix
-            {
-              system.stateVersion = "24.05";
-              wsl.enable = true;
-              nix.settings.experimental-features = [ "nix-command" "flakes" ];
-              environment.systemPackages = [
+      nixosConfigurations.nixos-wsl = nixpkgs.lib.nixosSystem {
+        inherit system;
+        modules = [
+          nixos-wsl.nixosModules.default
+          ./systems/drivebystation-nixos-wsl/configuration.nix
+          {
+            system.stateVersion = "24.05";
+            wsl.enable = true;
+            nix.settings.experimental-features = [ "nix-command" "flakes" ];
+            environment.systemPackages = [
 
-              ]
-              ++ installedPackages.mkPackages.packages;
-              programs.nix-ld = {
-                enable = true;
-                package = pkgs.nix-ld-rs;
-              };
-            }
-          ];
-          specialArgs = { inherit inputs; };
-        };
-        th0nkpad-nixos = nixpkgs.lib.nixosSystem {
-          inherit system;
-          modules = [
-            ./systems/th0nkpad-nixos/configuration.nix
-            {
-              system.stateVersion = "24.05";
-              nix.settings.experimental-features = [ "nix-command" "flakes" ];
-              environment.systemPackages = [
+            ]
+            ++ installedPackages.mkPackages.packages;
+            programs.nix-ld = {
+              enable = true;
+              package = pkgs.nix-ld-rs;
+            };
+          }
+        ];
+        specialArgs = { inherit inputs; };
+      };
+      nixosConfigurations.th0nkpad-nixos = nixpkgs.lib.nixosSystem {
+        inherit system;
+        modules = [
+          ./systems/th0nkpad-nixos/configuration.nix
+          {
+            system.stateVersion = "24.05";
+            nix.settings.experimental-features = [ "nix-command" "flakes" ];
+            environment.systemPackages = [
 
-              ]
-              ++ installedPackages.mkPackages.packages;
-              programs.nix-ld = {
-                enable = true;
-                package = pkgs.nix-ld-rs;
-              };
-            }
-          ];
-          specialArgs = { inherit inputs; };
-        };
+            ]
+            ++ installedPackages.mkPackages.packages;
+            programs.nix-ld = {
+              enable = true;
+              package = pkgs.nix-ld-rs;
+            };
+            services.flatpak.enable = true;
+            systemd.services.flatpak-repo = {
+              wantedBy = [ "multi-user.target" ];
+              path = [ pkgs.flatpak ];
+              script = ''
+                flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+              '';
+            };
+          }
+        ];
+        specialArgs = { inherit inputs; };
       };
     };
 }
diff --git a/systems/th0nkpad-nixos/configuration.nix b/systems/th0nkpad-nixos/configuration.nix
index bd5bb35..f2eb443 100644
--- a/systems/th0nkpad-nixos/configuration.nix
+++ b/systems/th0nkpad-nixos/configuration.nix
@@ -89,6 +89,8 @@
     description = "Andreas";
     extraGroups = [ "networkmanager" "wheel" ];
     packages = with pkgs; [
+      flatpak
+      gnome-software
     #  thunderbird
     ];
   };