flake: cleanup file paths

4 files changed, 15 insertions, 12 deletions

diff --git a/flake.nix b/flake.nix
index 92438f9..61cf998 100644
--- a/flake.nix
+++ b/flake.nix
@@ -67,26 +67,18 @@
         getchpkgs' // { default = getchpkgs'.treefetch or pkgs.emptyFile; }
       );
 
-      flakeModules = {
-        checks = self + "/modules/flake/checks.nix";
-        configurations = self + "/modules/flake/configurations.nix";
-      };
+      flakeModules = import ./modules/flake;
 
-      homeModules = {
-        arkenfox = self + "/modules/home/arkenfox";
-        firefox-addons = self + "/modules/home/firefox-addons.nix";
-      };
+      homeModules = import ./modules/home;
 
-      nixosModules = {
-        firefox-addons = self + "/modules/nixos/firefox-addons.nix";
-      };
+      nixosModules = import ./modules/nixos;
 
       formatter = forTier1Systems (system: nixpkgsFor.${system}.nixfmt-rfc-style);
 
       templates =
         let
           toTemplate = name: description: {
-            path = self + "/templates/${name}";
+            path = ./templates + "/${name}";
             inherit description;
           };
         in
diff --git a/modules/flake/default.nix b/modules/flake/default.nix
new file mode 100644
index 0000000..7c7f921
--- /dev/null
+++ b/modules/flake/default.nix
@@ -0,0 +1,4 @@
+{
+  checks = ./checks.nix;
+  configurations = ./configurations.nix;
+}
diff --git a/modules/home/default.nix b/modules/home/default.nix
new file mode 100644
index 0000000..4adc92c
--- /dev/null
+++ b/modules/home/default.nix
@@ -0,0 +1,4 @@
+{
+  arkenfox = ./arkenfox;
+  firefox-addons = ./firefox-addons.nix;
+}
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
new file mode 100644
index 0000000..0524ec1
--- /dev/null
+++ b/modules/nixos/default.nix
@@ -0,0 +1,3 @@
+{
+        firefox-addons = ./firefox-addons.nix;
+      }