new nix-flatpak flake

flake.lock

@@ -190,6 +190,22 @@
         "type": "github"
       }
     },
+    "nix-flatpak": {
+      "locked": {
+        "lastModified": 1711997201,
+        "narHash": "sha256-J71xzQlVYsjagA4AsVwRazhBh2rZrPpKvxTgs6UzL7c=",
+        "owner": "gmodena",
+        "repo": "nix-flatpak",
+        "rev": "b76fa31346db7fc958a9898f3c594696ca71c4fd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "gmodena",
+        "ref": "v0.4.1",
+        "repo": "nix-flatpak",
+        "type": "github"
+      }
+    },
     "nix-index-db": {
       "inputs": {
         "nixpkgs": [
@@ -307,6 +323,7 @@
         "home-manager": "home-manager_2",
         "homepage": "homepage",
         "impermanence": "impermanence",
+        "nix-flatpak": "nix-flatpak",
         "nix-index-db": "nix-index-db",
         "nix-minecraft": "nix-minecraft",
         "nixos-generators": "nixos-generators",

flake.nix

@@ -41,11 +41,13 @@
       url = "github:nix-community/nix-index-database";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1";
   };
 
   outputs = inputs@{ self, nixpkgs, home-manager, nixpkgs-stable, deploy-rs
     , agenix, nixos-generators, homepage, nix-minecraft, impermanence
-    , nix-index-db, ... }: {
+    , nix-flatpak, nix-index-db, ... }: {
       nixosConfigurations = {
         rotterdam = nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
@@ -56,6 +58,7 @@
             home-manager.nixosModules.default
             impermanence.nixosModules.impermanence
             nix-index-db.nixosModules.nix-index
+            nix-flatpak.nixosModules.nix-flatpak
             {
               nixpkgs.overlays =
                 [ agenix.overlays.default self.overlays.custom ];
@@ -72,6 +75,7 @@
             home-manager.nixosModules.default
             impermanence.nixosModules.impermanence
             nix-index-db.nixosModules.nix-index
+            nix-flatpak.nixosModules.nix-flatpak
             {
               nixpkgs.overlays =
                 [ agenix.overlays.default self.overlays.custom ];
@@ -122,20 +126,6 @@
         };
       };
 
-      # homeConfigurations = {
-      #   desktop = home-manager.lib.homeManagerConfiguration {
-      #     pkgs = nixpkgs.legacyPackages.x86_64-linux;
-      #     extraSpecialArgs = { inherit inputs; };
-      #     modules = [ ./users/desktops/user.nix ];
-      #   };
-
-      #   server = home-manager.lib.homeManagerConfiguration {
-      #     pkgs = nixpkgs.legacyPackages.x86_64-linux;
-      #     extraSpecialArgs = { inherit inputs; };
-      #     modules = [ ./users/servers/user.nix ];
-      #   };
-      # };
-
       packages."x86_64-linux" = {
         chromeos-ectool = nixpkgs.legacyPackages."x86_64-linux".callPackage
           ./packages/chromeos-ectool.nix { };

hosts/desktops/common/packages.nix

@@ -61,6 +61,13 @@ in {
       wezterm
     ] ++ kdepkgs;
 
+  services.flatpak = {
+    enable = true;
+    packages = [ "com.github.flxzt.rnote" "com.github.tchx84.Flatseal" ];
+    uninstallUnmanaged = true;
+    update.auto.enable = true;
+  };
+
   programs = {
     adb.enable = true;
     steam.enable = true;

hosts/desktops/common/services.nix

@@ -7,7 +7,6 @@ let
 
 in {
   services = {
-    flatpak.enable = true;
     printing = {
       enable = true;
       drivers = with pkgs; [ epson-escpr ];

hosts/desktops/io.nix

@@ -49,48 +49,51 @@ in {
     sessionVariables.ALSA_CONFIG_UCM2 = "${cml-ucm-conf}/share/alsa/ucm2";
   };
 
-  services.keyd = {
+  services = {
-    enable = true;
+    flatpak.packages = [ "com.github.scrivanolabs.scrivano" ];
-    keyboards.main = {
+    keyd = {
-      ids = [ "0001:0001" ];
+      enable = true;
-      settings = {
+      keyboards.main = {
-        main = {
+        ids = [ "0001:0001" ];
-          meta = "overload(meta, esc)";
+        settings = {
-          f1 = "back";
+          main = {
-          f2 = "forward";
+            meta = "overload(meta, esc)";
-          f3 = "refresh";
+            f1 = "back";
-          f4 = "M-f11";
+            f2 = "forward";
-          f5 = "M-w";
+            f3 = "refresh";
-          f6 = "brightnessdown";
+            f4 = "M-f11";
-          f7 = "brightnessup";
+            f5 = "M-w";
-          f8 = "timeout(mute, 200, micmute)";
+            f6 = "brightnessdown";
-          f9 = "play";
+            f7 = "brightnessup";
-          f10 = "timeout(nextsong, 200, previoussong)";
+            f8 = "timeout(mute, 200, micmute)";
-          f13 = "delete";
+            f9 = "play";
-          "102nd" = "layer(function)";
+            f10 = "timeout(nextsong, 200, previoussong)";
-        };
+            f13 = "delete";
-        shift = {
+            "102nd" = "layer(function)";
-          leftshift = "capslock";
+          };
-          rightshift = "capslock";
+          shift = {
-        };
+            leftshift = "capslock";
-        function = {
+            rightshift = "capslock";
-          escape = "f1";
+          };
-          f1 = "f2";
+          function = {
-          f2 = "f3";
+            escape = "f1";
-          f3 = "f4";
+            f1 = "f2";
-          f4 = "f5";
+            f2 = "f3";
-          f5 = "f6";
+            f3 = "f4";
-          f6 = "f7";
+            f4 = "f5";
-          f7 = "f8";
+            f5 = "f6";
-          f8 = "f9";
+            f6 = "f7";
-          f9 = "f10";
+            f7 = "f8";
-          f10 = "f11";
+            f8 = "f9";
-          f13 = "f12";
+            f9 = "f10";
-          u = "sysrq";
+            f10 = "f11";
-          k = "home";
+            f13 = "f12";
-          l = "pageup";
+            u = "sysrq";
-          "," = "end";
+            k = "home";
-          "." = "pagedown";
+            l = "pageup";
+            "," = "end";
+            "." = "pagedown";
+          };
         };
       };
     };

hosts/desktops/rotterdam.nix

@@ -42,6 +42,7 @@ in {
 
   services = {
     hardware.openrgb.enable = true;
+    flatpak.packages = [ "net.retrodeck.retrodeck" ];
     keyd = {
       enable = true;
       keyboards.main = {