WIP: Laptop config

flake.nix

@@ -1,12 +1,10 @@
 {
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
-
     nix-flatpak.url = "github:gmodena/nix-flatpak";
-    czkawka-master.url = "path:./flakes/czkawka-master";
-    # czkawka-git.url = "github:qarmin/czkawka?dir=misc/nix";
-    solaar-master.url = "path:./flakes/solaar-master";
-    fet.url = "path:./flakes/fet";
+    czkawka-master.url = "path:./common/flakes/czkawka-master";
+    solaar-master.url = "path:./common/flakes/solaar-master";
+    fet.url = "path:./common/flakes/fet";
   };
 
   outputs =
@@ -14,22 +12,29 @@
       self,
       nixpkgs,
       nix-flatpak,
-      czkawka-master,
-      solaar-master,
-      fet,
       ...
-    }:
+    }@inputs:
+    let
+      specialArgs = { inherit (inputs) czkawka-master solaar-master fet; };
+    in
     {
       nixosConfigurations = {
         epiquev2 = nixpkgs.lib.nixosSystem {
+          inherit specialArgs;
           system = "x86_64-linux";
-          specialArgs = {
-            inherit czkawka-master;
-            inherit solaar-master;
-            inherit fet;
-          };
           modules = [
-            ./configuration.nix
+            ./common
+            ./desktop
+            nix-flatpak.nixosModules.nix-flatpak
+          ];
+        };
+
+        laptop = nixpkgs.lib.nixosSystem {
+          inherit specialArgs;
+          system = "x86_64-linux";
+          modules = [
+            ./common
+            ./laptop
             nix-flatpak.nixosModules.nix-flatpak
           ];
         };