1 files changed, 41 insertions, 8 deletions

diff --git a/flake.nix b/flake.nix
index fa86e71..6607369 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,30 +2,63 @@
   description = "Assets for my webpages";
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs";
-    flake-utils.url = "github:numtide/flake-utils";
+    flake-parts.url = "github:hercules-ci/flake-parts";
     nix-filter.url = "github:numtide/nix-filter";
+    systems.url = "github:nix-systems/default";
   };
 
-  outputs = { self, nixpkgs, flake-utils, nix-filter, ... }: {
-    overlays.default = import ./nix/overlay.nix { inherit nix-filter; };
-  } // flake-utils.lib.eachDefaultSystem (system: let
-      pkgs = import nixpkgs {
+  outputs = inputs@{self, flake-parts, nixpkgs, nix-filter, ... }: flake-parts.lib.mkFlake { inherit self inputs; } {
+    systems = import inputs.systems;
+
+    flake.overlays.default = import ./nix/overlay.nix { inherit nix-filter; };
+
+    perSystem = { pkgs, system, ... }: {
+      _module.args.pkgs = import nixpkgs {
         inherit system;
         overlays = [ self.overlays.default ];
       };
-    in {
+
       packages = {
         inherit (pkgs) www-assets;
         default = pkgs.www-assets;
       };
 
       devShells.default = pkgs.haskellPackages.shellFor {
-        packages = p: [ p.www-assets ];
+        packages = _: [];
         withHoogle = true;
         buildInputs = with pkgs.haskellPackages; [
           cabal-install
           hpack
+          hlint
+          fast-tags
+          pkgs.haskell-language-server
         ];
       };
-    });
+    };
+
+  };
 }
+
+#   outputs = { self, nixpkgs, flake-utils, nix-filter, ... }: {
+#     overlays.default = import ./nix/overlay.nix { inherit nix-filter; };
+#   } // flake-utils.lib.eachDefaultSystem (system: let
+#       pkgs = import nixpkgs {
+#         inherit system;
+#         overlays = [ self.overlays.default ];
+#       };
+#     in {
+#       packages = {
+#         inherit (pkgs) www-assets;
+#         default = pkgs.www-assets;
+#       };
+#
+#       devShells.default = pkgs.haskellPackages.shellFor {
+#         packages = p: [ p.www-assets ];
+#         withHoogle = true;
+#         buildInputs = with pkgs.haskellPackages; [
+#           cabal-install
+#           hpack
+#         ];
+#       };
+#     });
+# }