push

flake.nix

@@ -1,90 +1,30 @@
 {
-    inputs = {
-        # nixpkgs.follows = "nixos-cosmic/nixpkgs";
+  outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } (inputs.import-tree ./modules);
 
-        nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+  inputs = {
+    den.url = "github:vic/den";
+    flake-aspects.url = "github:vic/flake-aspects";
+    flake-file.url = "github:vic/flake-file";
+    flake-parts = {
+      inputs.nixpkgs-lib.follows = "nixpkgs-lib";
+      url = "github:hercules-ci/flake-parts";
+    };
+    home-manager = {
+      inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:nix-community/home-manager";
+    };
+    import-tree.url = "github:vic/import-tree";
+    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+    nixpkgs-lib.follows = "nixpkgs";
+    systems.url = "github:nix-systems/default";
 
-        flatpaks.url = "github:gmodena/nix-flatpak/?ref=latest";
-
-        nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic";
-        
-        hytale-launcher.url = "github:JPyke3/hytale-launcher-nix";
-
-        stylix = {
-            url = "github:nix-community/stylix";
-            inputs.nixpkgs.follows = "nixpkgs";
-        };
-
-        vscode-server.url = "github:nix-community/nixos-vscode-server";
-
-        home-manager.url = "github:nix-community/home-manager";
-
-        nix-citizen.url = "github:LovingMelody/nix-citizen";
-
-        nix-gaming.url = "github:fufexan/nix-gaming";
-        nix-citizen.inputs.nix-gaming.follows = "nix-gaming";
-
-        copyparty.url = "github:9001/copyparty";
+    stylix = {
+        url = "github:nix-community/stylix";
+        inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    outputs = inputs@{ self, nixpkgs, stylix, home-manager, flatpaks, hytale-launcher, vscode-server, copyparty, nix-citizen, ... }:
-    let
-    	deviceType = import ./device.nix;
-        system = "x86_64-linux";
-    in
-    {
-        nixosConfigurations = {
-            nix = nixpkgs.lib.nixosSystem {
-                inherit system;
+    nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest";
 
-                specialArgs = { inherit inputs; inherit (deviceType) device; };
-
-                modules = [
-                    {
-                        nix.settings = {
-                            substituters = [ "https://cosmic.cachix.org/" ];
-                            trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
-                        };
-                    }
-
-                    nix-citizen.nixosModules.default
-
-                    flatpaks.nixosModules.nix-flatpak
-
-                    ./main.nix
-                ];
-            };
-
-            box = nixpkgs.lib.nixosSystem {
-                inherit system;
-
-                specialArgs = { inherit inputs; inherit (deviceType) device; };
-
-                modules = [
-                	./main.nix
-
-                	vscode-server.nixosModules.default
-
-                    copyparty.nixosModules.default
-                ];
-            };
-        };
-
-        homeConfigurations = {
-            bug = home-manager.lib.homeManagerConfiguration {
-                pkgs = nixpkgs.legacyPackages.x86_64-linux;
-
-                extraSpecialArgs = {
-                    inherit inputs;
-                    inherit (deviceType) device;
-                };
-                
-                modules = [
-                    stylix.homeModules.stylix
-                    
-                    ./home.nix
-                ];
-            };
-        };
-    };
-}
+    copyparty.url = "github:9001/copyparty";
+  };
+}