refactor configuration

home/configurations.nix

@@ -1,6 +1,7 @@
 { self
 , nixpkgs
 , home-manager
+, nix-doom-emacs
 , ...
 } @ inputs:
 let
@@ -10,15 +11,16 @@ let
     , system ? "x86_64-linux"
     , username ? "dadada"
     , stateVersion
-    ,
     }: (home-manager.lib.homeManagerConfiguration {
       configuration = { ... }: {
         imports = (nixpkgs.lib.attrValues self.hmModules) ++ extraModules;
+
         nixpkgs = {
           config = import ./nixpkgs-config.nix {
             pkgs = nixpkgs;
           };
         };
+
         manual.manpages.enable = false;
       };
       inherit system homeDirectory username stateVersion;
@@ -26,7 +28,7 @@ let
 in
 {
   home = hmConfiguration {
-    extraModules = [ ./home ];
+    extraModules = [ ./home nix-doom-emacs.hmModule ];
     stateVersion = "20.09";
   };
 }

home/modules/default.nix

@@ -1,11 +1,8 @@
-{ self
-, nix-doom-emacs
-, ...
-} @ inputs: {
+{
   alacritty = import ./alacritty;
   colors = import ./colors.nix;
   direnv = import ./direnv.nix;
-  emacs = import ./emacs { inherit nix-doom-emacs; };
+  emacs = import ./emacs;
   fish = import ./fish.nix;
   git = import ./git.nix;
   gpg = import ./gpg.nix;

home/modules/emacs/default.nix

@@ -1,16 +1,16 @@
-{ nix-doom-emacs, ... }: { config
-                         , pkgs
-                         , lib
-                         , ...
-                         }:
+{ config
+, pkgs
+, lib
+, ...
+}:
 with lib; let
   cfg = config.dadada.home.emacs;
 in
 {
-  imports = [ nix-doom-emacs.hmModule ];
   options.dadada.home.emacs = {
     enable = mkEnableOption "Enable dadada emacs config";
   };
+
   config = mkIf cfg.enable {
     programs.doom-emacs = {
       enable = true;