3 files changed, 9 insertions, 27 deletions
diff --git a/modules/fonts/default.nix b/modules/fonts/default.nix
index c5d552c..eee825d 100644
--- a/modules/fonts/default.nix
+++ b/modules/fonts/default.nix
@@ -1,10 +1,6 @@
-{ lib, config, ... }:
+{ lib, config, pkgs, ... }:
 
 {
-	imports = [
-		./nerdfont
-	];
-
 	options.fonts = {
 		normal = lib.mkOption {
 			type = lib.types.str;
@@ -29,4 +25,12 @@
 			default = 16;
 		};
 	};
+
+	config = {
+		fonts.normal = lib.mkDefault "Fira Code Nerd Font";
+
+		home.packages = with pkgs; [
+			nerd-fonts.fira-code
+		];
+	};
 }
diff --git a/modules/fonts/nerdfont/default.nix b/modules/fonts/nerdfont/default.nix
deleted file mode 100644
index d3bbc9b..0000000
--- a/modules/fonts/nerdfont/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }:
-
-{
-	imports = [
-		./fira-code
-	];
-}
diff --git a/modules/fonts/nerdfont/fira-code/default.nix b/modules/fonts/nerdfont/fira-code/default.nix
deleted file mode 100644
index 9b66183..0000000
--- a/modules/fonts/nerdfont/fira-code/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ lib, config, pkgs, ... }:
-
-{
-	options.fonts.nerdfont.fira-code = {
-		enable = lib.mkEnableOption "Enables fira code nerd font.";
-	};
-
-	config = lib.mkIf config.fonts.nerdfont.fira-code.enable {
-		fonts.normal = lib.mkDefault "Fira Code Nerd Font";
-
-		home.packages = with pkgs; [
-			nerd-fonts.fira-code
-		];
-	};
-}