From 4874df92b67754f386c66126ab2b3ac8f0198ca3 Mon Sep 17 00:00:00 2001
From: NotAShelf <itsashelf@gmail.com>
Date: Mon, 6 Feb 2023 21:57:52 +0300
Subject: [PATCH] refactor: prepare for home-manager module & cleanup

---
 flake.nix | 128 ++++++++++++++++++++++++++++++------------------------
 1 file changed, 72 insertions(+), 56 deletions(-)

diff --git a/flake.nix b/flake.nix
index 49fc1ec..18cdb89 100644
--- a/flake.nix
+++ b/flake.nix
@@ -189,7 +189,7 @@
   in
     {
       lib = {
-        nvim = (import ./modules/lib/stdlib-extended.nix nixpkgs.lib).nvim;
+        nvim = (import ./lib/stdlib-extended.nix nixpkgs.lib).nvim;
         inherit neovimConfiguration;
       };
 
@@ -200,69 +200,85 @@
         neovim-tidal = buildPkg prev [tidalConfig];
       };
     }
-    // (flake-utils.lib.eachDefaultSystem (system: let
-      pkgs = import nixpkgs {
-        inherit system;
-        overlays = [
-          inputs.tidalcycles.overlays.default
-          (final: prev: {
-            rnix-lsp = inputs.rnix-lsp.defaultPackage.${system};
-            nil = inputs.nil.packages.${system}.default;
-          })
-        ];
-      };
+    // (flake-utils.lib.eachDefaultSystem (
+      system: let
+        pkgs = import nixpkgs {
+          inherit system;
+          overlays = [
+            inputs.tidalcycles.overlays.default
+            (final: prev: {
+              rnix-lsp = inputs.rnix-lsp.defaultPackage.${system};
+              nil = inputs.nil.packages.${system}.default;
+            })
+          ];
+        };
 
-      docs = import ./docs {
-        inherit pkgs;
-        nmdSrc = inputs.nmd;
-      };
+        docs = import ./docs {
+          inherit pkgs;
+          nmdSrc = inputs.nmd;
+        };
 
-      tidalPkg = buildPkg pkgs [tidalConfig];
-      nixPkg = buildPkg pkgs [nixConfig];
-      maximalPkg = buildPkg pkgs [maximalConfig];
-    in {
-      apps =
-        rec {
-          nix = {
-            type = "app";
-            program = nvimBin nixPkg;
-          };
-          maximal = {
-            type = "app";
-            program = nvimBin maximalPkg;
-          };
-          default = nix;
-        }
-        // (
-          if !(builtins.elem system ["aarch64-darwin" "x86_64-darwin"])
-          then {
-            tidal = {
+        # Available Configurations
+        tidalPkg = buildPkg pkgs [tidalConfig];
+        nixPkg = buildPkg pkgs [nixConfig];
+        maximalPkg = buildPkg pkgs [maximalConfig];
+      in {
+        apps =
+          rec {
+            nix = {
               type = "app";
-              program = nvimBin tidalPkg;
+              program = nvimBin nixPkg;
             };
+            maximal = {
+              type = "app";
+              program = nvimBin maximalPkg;
+            };
+            default = nix;
           }
-          else {}
-        );
+          // (
+            if !(builtins.elem system ["aarch64-darwin" "x86_64-darwin"])
+            then {
+              tidal = {
+                type = "app";
+                program = nvimBin tidalPkg;
+              };
+            }
+            else {}
+          );
 
-      devShells.default = pkgs.mkShell {nativeBuildInputs = [nixPkg];};
+        devShells.default = pkgs.mkShell {nativeBuildInputs = [nixPkg];};
 
-      packages =
-        {
-          docs-html = docs.manual.html;
-          docs-manpages = docs.manPages;
-          docs-json = docs.options.json;
-          default = nixPkg;
-          nix = nixPkg;
-          maximal = maximalPkg;
-        }
-        // (
-          if !(builtins.elem system ["aarch64-darwin" "x86_64-darwin"])
-          then {
-            tidal = tidalPkg;
+        packages =
+          {
+            # Documentation
+            docs = docs.manual.html;
+            docs-html = docs.manual.html;
+            docs-manpages = docs.manPages;
+            docs-json = docs.options.json;
+
+            # Available Configurations
+            default = nixPkg;
+            nix = nixPkg;
+            maximal = maximalPkg;
           }
-          else {}
-        );
-    }));
+          // (
+            if !(builtins.elem system ["aarch64-darwin" "x86_64-darwin"])
+            then {
+              tidal = tidalPkg;
+            }
+            else {}
+          );
+
+        nixosModules.hm-module = {
+          imports = [
+            ./lib/hm.nix
+            # {nixpkgs.overlays = [inputs.self.overlays.default];} what?
+          ];
+        };
+      }
+    ));
+
+  # Flake inputs
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     flake-utils.url = "github:numtide/flake-utils";