28 files changed, 26 insertions, 46 deletions
diff --git a/flake.nix b/flake.nix
index 85a123c..670de5f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,15 +14,15 @@
 		};
 	};
 
-	outputs = { nixpkgs, home-manager, base16, ... }@inputs:
-		let
-			system = "x86_64-linux";
-			pkgs = nixpkgs.legacyPackages.${system};
-		in {
-			homeConfigurations."arpit" = home-manager.lib.homeManagerConfiguration {
+	outputs = { nixpkgs, home-manager, base16, ... }@inputs: {
+		homeConfigurations = {
+			arpit = let
+				system = "x86_64-linux";
+				pkgs = import nixpkgs { inherit system; };
+			in home-manager.lib.homeManagerConfiguration {
 				inherit pkgs;
 				modules = [
-					./home.nix
+					./users/arpit.nix
 					./modules
 					base16.homeManagerModule
 					{
@@ -31,4 +31,5 @@
 				];
 			};
 		};
+	};
 }
diff --git a/modules/default.nix b/modules/default.nix
index f4628a2..86dbd62 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -2,8 +2,8 @@
 
 {
 	imports = [
+		./desktop
 		./fonts
-		./graphical
 		./scripts
 		./tools
 	];
diff --git a/modules/graphical/bspwm/default.nix b/modules/desktop/bspwm/default.nix
index f334290..d402035 100644
--- a/modules/graphical/bspwm/default.nix
+++ b/modules/desktop/bspwm/default.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 {
-	config = lib.mkIf config.graphical.enable {
+	config = lib.mkIf config.desktop.enable {
 		xsession.windowManager.bspwm.enable = true;
 
 		xsession.windowManager.bspwm.settings = with config.scheme.withHashtag; {
diff --git a/modules/graphical/default.nix b/modules/desktop/default.nix
index 9e18ce0..dbb8087 100644
--- a/modules/graphical/default.nix
+++ b/modules/desktop/default.nix
@@ -7,11 +7,11 @@
 		./sxhkd
 	];
 
-	options.graphical = {
+	options.desktop = {
 		enable = lib.mkEnableOption "Enables graphical interface.";
 	};
 
-	config = lib.mkIf config.graphical.enable {
+	config = lib.mkIf config.desktop.enable {
 		xdg.enable = true;
 		xsession.enable = true;
 
diff --git a/modules/graphical/polybar/bar/default.nix b/modules/desktop/polybar/bar/default.nix
index 23a43c4..23a43c4 100644
--- a/modules/graphical/polybar/bar/default.nix
+++ b/modules/desktop/polybar/bar/default.nix
diff --git a/modules/graphical/polybar/bar/main.nix b/modules/desktop/polybar/bar/main.nix
index 326b768..326b768 100644
--- a/modules/graphical/polybar/bar/main.nix
+++ b/modules/desktop/polybar/bar/main.nix
diff --git a/modules/graphical/polybar/default.nix b/modules/desktop/polybar/default.nix
index d96c2ae..de95a49 100644
--- a/modules/graphical/polybar/default.nix
+++ b/modules/desktop/polybar/default.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 {
-	config = lib.mkIf config.graphical.enable {
+	config = lib.mkIf config.desktop.enable {
 		services.polybar.enable = true;
 		services.polybar.package = (pkgs.polybar.override {
 			pulseSupport = true;
diff --git a/modules/graphical/polybar/module/battery.nix b/modules/desktop/polybar/module/battery.nix
index 5787f24..5787f24 100644
--- a/modules/graphical/polybar/module/battery.nix
+++ b/modules/desktop/polybar/module/battery.nix
diff --git a/modules/graphical/polybar/module/bspwm.nix b/modules/desktop/polybar/module/bspwm.nix
index ed82946..ed82946 100644
--- a/modules/graphical/polybar/module/bspwm.nix
+++ b/modules/desktop/polybar/module/bspwm.nix
diff --git a/modules/graphical/polybar/module/cpu.nix b/modules/desktop/polybar/module/cpu.nix
index 8134df1..8134df1 100644
--- a/modules/graphical/polybar/module/cpu.nix
+++ b/modules/desktop/polybar/module/cpu.nix
diff --git a/modules/graphical/polybar/module/date.nix b/modules/desktop/polybar/module/date.nix
index 9c56121..9c56121 100644
--- a/modules/graphical/polybar/module/date.nix
+++ b/modules/desktop/polybar/module/date.nix
diff --git a/modules/graphical/polybar/module/default.nix b/modules/desktop/polybar/module/default.nix
index fe5b8a1..fe5b8a1 100644
--- a/modules/graphical/polybar/module/default.nix
+++ b/modules/desktop/polybar/module/default.nix
diff --git a/modules/graphical/polybar/module/memory.nix b/modules/desktop/polybar/module/memory.nix
index a4aa410..a4aa410 100644
--- a/modules/graphical/polybar/module/memory.nix
+++ b/modules/desktop/polybar/module/memory.nix
diff --git a/modules/graphical/polybar/module/separator.nix b/modules/desktop/polybar/module/separator.nix
index 3cd1430..3cd1430 100644
--- a/modules/graphical/polybar/module/separator.nix
+++ b/modules/desktop/polybar/module/separator.nix
diff --git a/modules/graphical/polybar/module/time.nix b/modules/desktop/polybar/module/time.nix
index 71df1a5..71df1a5 100644
--- a/modules/graphical/polybar/module/time.nix
+++ b/modules/desktop/polybar/module/time.nix
diff --git a/modules/graphical/polybar/module/volume.nix b/modules/desktop/polybar/module/volume.nix
index ee18dc0..ee18dc0 100644
--- a/modules/graphical/polybar/module/volume.nix
+++ b/modules/desktop/polybar/module/volume.nix
diff --git a/modules/graphical/polybar/module/xwindow.nix b/modules/desktop/polybar/module/xwindow.nix
index 833899e..833899e 100644
--- a/modules/graphical/polybar/module/xwindow.nix
+++ b/modules/desktop/polybar/module/xwindow.nix
diff --git a/modules/graphical/sxhkd/default.nix b/modules/desktop/sxhkd/default.nix
index 5746394..8d0e6de 100644
--- a/modules/graphical/sxhkd/default.nix
+++ b/modules/desktop/sxhkd/default.nix
@@ -1,7 +1,7 @@
 { pkgs, config, lib, ... }:
 
 {
-	config = lib.mkIf config.graphical.enable {
+	config = lib.mkIf config.desktop.enable {
 		services.sxhkd.enable = true;
 		services.sxhkd.keybindings =
 		let
diff --git a/modules/graphical/sxhkd/keybindings/brightnessctl.nix b/modules/desktop/sxhkd/keybindings/brightnessctl.nix
index acb4ea2..acb4ea2 100644
--- a/modules/graphical/sxhkd/keybindings/brightnessctl.nix
+++ b/modules/desktop/sxhkd/keybindings/brightnessctl.nix
diff --git a/modules/graphical/sxhkd/keybindings/bspwm.nix b/modules/desktop/sxhkd/keybindings/bspwm.nix
index ed62ed4..ed62ed4 100644
--- a/modules/graphical/sxhkd/keybindings/bspwm.nix
+++ b/modules/desktop/sxhkd/keybindings/bspwm.nix
diff --git a/modules/graphical/sxhkd/keybindings/pamixer.nix b/modules/desktop/sxhkd/keybindings/pamixer.nix
index 3543d8f..3543d8f 100644
--- a/modules/graphical/sxhkd/keybindings/pamixer.nix
+++ b/modules/desktop/sxhkd/keybindings/pamixer.nix
diff --git a/modules/graphical/sxhkd/keybindings/playerctl.nix b/modules/desktop/sxhkd/keybindings/playerctl.nix
index 3e5c4e0..3e5c4e0 100644
--- a/modules/graphical/sxhkd/keybindings/playerctl.nix
+++ b/modules/desktop/sxhkd/keybindings/playerctl.nix
diff --git a/modules/graphical/sxhkd/scripts/keybindings.sh b/modules/desktop/sxhkd/scripts/keybindings.sh
index 01bb05f..01bb05f 100755
--- a/modules/graphical/sxhkd/scripts/keybindings.sh
+++ b/modules/desktop/sxhkd/scripts/keybindings.sh
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
-		];
-	};
-}
diff --git a/modules/tools/fzf/default.nix b/modules/tools/fzf/default.nix
index 169a07f..9fc9457 100644
--- a/modules/tools/fzf/default.nix
+++ b/modules/tools/fzf/default.nix
@@ -10,7 +10,7 @@
 		programs.fzf.defaultOptions = [
 			"--height 100%"
 			"--layout=reverse"
-			''--pointer=\"${if config.fonts.nerdfont.fira-code.enable then " " else ">"}\"''
+			''--pointer=\" \"''
 			''--header=\" \"''
 			''--prompt=\" \"''
 			''--marker=\"✓ \"''
diff --git a/home.nix b/users/arpit.nix
index 1e3ca50..de6136e 100644
--- a/home.nix
+++ b/users/arpit.nix
@@ -5,11 +5,8 @@
 	home.homeDirectory = "/home/${config.home.username}";
 	home.stateVersion = "25.05";
 
-	# Fonts
-	fonts.nerdfont.fira-code.enable = true;
-
-	# Graphics
-	graphical.enable = true;
+	# Desktop environment
+	desktop.enable = true;
 
 	# Enable scripts
 	scripts.enable = true;