diff --git a/emacs/.doom.d/init.el b/emacs/.doom.d/init.el
index a68a657..20f1004 100644
--- a/emacs/.doom.d/init.el
+++ b/emacs/.doom.d/init.el
@@ -140,24 +140,24 @@
        ;;(haskell +lsp)    ; a language that's lazier than I am
        ;;hy                ; readability of scheme w/ speed of python
        ;;idris             ; a language you can depend on
-       ;;json              ; At least it ain't XML
+       json              ; At least it ain't XML
        ;;(java +lsp)       ; the poster child for carpal tunnel syndrome
-       ;;javascript        ; all(hope(abandon(ye(who(enter(here))))))
+       javascript        ; all(hope(abandon(ye(who(enter(here))))))
        ;;julia             ; a better, faster MATLAB
        ;;kotlin            ; a better, slicker Java(Script)
-       ;;latex             ; writing papers in Emacs has never been so fun
+       latex             ; writing papers in Emacs has never been so fun
        ;;lean              ; for folks with too much to prove
        ;;ledger            ; be audit you can be
        ;;lua               ; one-based indices? one-based indices
        markdown          ; writing docs for people to ignore
        ;;nim               ; python + lisp at the speed of c
-       ;;nix               ; I hereby declare "nix geht mehr!"
+       nix               ; I hereby declare "nix geht mehr!"
        ;;ocaml             ; an objective camel
        org               ; organize your plain life in plain text
        ;;php               ; perl's insecure younger brother
        ;;plantuml          ; diagrams for confusing people more
        ;;purescript        ; javascript, but functional
-       ;;python            ; beautiful is better than ugly
+       python            ; beautiful is better than ugly
        ;;qt                ; the 'cutest' gui framework ever
        ;;racket            ; a DSL for DSLs
        ;;raku              ; the artist formerly known as perl6
@@ -173,7 +173,7 @@
        ;;swift             ; who asked for emoji variables?
        ;;terra             ; Earth and Moon in alignment for performance.
        ;;web               ; the tubes
-       ;;yaml              ; JSON, but readable
+       yaml              ; JSON, but readable
        ;;zig               ; C, but simpler
 
        :email
diff --git a/emacs/default.nix b/emacs/default.nix
index 6bcc036..81a3aa7 100644
--- a/emacs/default.nix
+++ b/emacs/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, fetchFromGitHub, ... }:
+{ pkgs, lib, config, configDir, fetchFromGitHub, ... }:
 
 {
   programs.emacs.enable = true;
@@ -7,12 +7,10 @@
     if [ ! -d .emacs.d ]; then
       git clone --depth 1 https://github.com/doomemacs/doomemacs .emacs.d
     fi
+    mkdir -p .doom.d
+    ln -sf ${config.home.homeDirectory}/${configDir}/emacs/.doom.d/* .doom.d
   '';
   home.file = {
-    ".doom.d" = {
-      source = ./.doom.d;
-      recursive = true;
-    };
     ".emacs.d/everforest".source = pkgs.fetchFromGitHub {
       owner = "Theory-of-Everything";
       repo = "everforest-emacs";
diff --git a/flake.nix b/flake.nix
index 840821b..fb30a94 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,10 +12,11 @@
   outputs = inputs@{ self, nixpkgs, home-manager }:
     let
       user = "elnu";
+      configDir = "nix-config";
     in {
       nixosConfigurations = import ./hosts {
         inherit (nixpkgs) lib;
-        inherit inputs nixpkgs home-manager user;
+        inherit inputs nixpkgs home-manager user configDir;
       };
     };
 }
diff --git a/hosts/default.nix b/hosts/default.nix
index 7b709dc..6c85f31 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -1,4 +1,4 @@
-{ lib, inputs, nixpkgs, home-manager, user, ... }:
+{ lib, inputs, nixpkgs, home-manager, user, configDir, ... }:
 
 let
   system = "x86_64-linux";
@@ -10,6 +10,7 @@ let
   hmImports = [
     (import ./home.nix)
   ];
+  hmArgs = { inherit user configDir; };
 in
 {
   desktop = lib.nixosSystem {
@@ -26,7 +27,7 @@ in
       home-manager.nixosModules.home-manager {
         home-manager = {
           useUserPackages = true;
-          extraSpecialArgs = { inherit user; };
+          extraSpecialArgs = hmArgs;
           users.${user} = {
             imports = hmImports ++ [
               (import ./desktop/home.nix)
@@ -55,7 +56,7 @@ in
       home-manager.nixosModules.home-manager {
         home-manager = {
           useUserPackages = true;
-          extraSpecialArgs = { inherit user; };
+          extraSpecialArgs = hmArgs;
           users.${user} = {
             imports = hmImports ++ [
               (import ./thinkpads/home.nix)
@@ -80,7 +81,7 @@ in
       home-manager.nixosModules.home-manager {
         home-manager = {
           useUserPackages = true;
-          extraSpecialArgs = { inherit user; };
+          extraSpecialArgs = hmArgs;
           users.${user} = {
             imports = hmImports ++ [
               (import ./thinkpads/home.nix)