diff --git a/users/infinidoge/default.nix b/users/infinidoge/default.nix
index 5a7e62f..0f1da04 100644
--- a/users/infinidoge/default.nix
+++ b/users/infinidoge/default.nix
@@ -37,24 +37,28 @@
     };
   };
 
-  environment.systemPackages = with pkgs; [
-    wget
-    vim
-    htop
+  environment = {
+    systemPackages = with pkgs; [
+      wget
+      vim
+      htop
 
-    ffmpeg
-    ntfs3g
-    unzip
+      ffmpeg
+      ntfs3g
+      unzip
 
-    gnupg
+      gnupg
 
-    libsForQt5.dolphin
-    gnome3.adwaita-icon-theme
-    adwaita-qt
-    lxappearance
-  ];
+      libsForQt5.dolphin
+      gnome3.adwaita-icon-theme
+      adwaita-qt
+      lxappearance
+    ];
 
-  environment.shellAliases.ssh = "kitty +kitten ssh";
+    shellAliases.ssh = "kitty +kitten ssh";
+
+    variables.DOOMDOR = "/etc/nixos/users/infinidoge/config/doom/";
+  };
 
   programs = {
     vim.defaultEditor = true;
diff --git a/users/profiles/emacs/default.nix b/users/profiles/emacs.nix
similarity index 83%
rename from users/profiles/emacs/default.nix
rename to users/profiles/emacs.nix
index 4e52440..d3f39cf 100644
--- a/users/profiles/emacs/default.nix
+++ b/users/profiles/emacs.nix
@@ -6,10 +6,6 @@
       "${config.xdg.configHome}/emacs/bin"
     ];
 
-    sessionVariables = {
-      DOOMDIR = "/etc/nixos/users/profiles/emacs/doom/";
-    };
-
     packages = with pkgs; [
       emacs
       ripgrep