diff --git a/modules/core.nix b/modules/core.nix
index 7f15f0b..20e39ed 100644
--- a/modules/core.nix
+++ b/modules/core.nix
@@ -17,17 +17,22 @@
         
         users = {
             enable = lib.mkEnableOption "enables users";
-            crow.enable = lib.mkEnableOption "enable crow";
+            crow = {
+                enable = lib.mkEnableOption "enable crow";
+                home.enable = lib.mkEnableOption "enable home configuration";
+            };
         };
     };
     
     config = {
         system.stateVersion = "24.05";
         time.timeZone = "America/New_York";
-	users = {
-	    enable = lib.mkDefault true;
-	    crow.enable = lib.mkDefault true;
-	};
+        
+        users = {
+            enable = lib.mkDefault true;
+            crow.enable = lib.mkDefault true;
+        };
+        
         packages = {
             enable = lib.mkDefault true;
             core.enable = lib.mkDefault true;
diff --git a/modules/home/crow.nix b/modules/home/crow.nix
new file mode 100644
index 0000000..574b878
--- /dev/null
+++ b/modules/home/crow.nix
@@ -0,0 +1,17 @@
+{pkgs, ...}: let
+    username = "crow";
+    homeDirectory = "/home/${username}";
+    configHome = "${homeDirectory}/.config";
+in {
+    home = {
+        inherit username homeDirectory;
+        stateVersion = system.stateVersion;
+    };
+
+    xdg = {
+        inherit configHome;
+        enable = true;
+    }
+
+    programs = {};
+}
diff --git a/modules/home/default.nix b/modules/home/default.nix
new file mode 100644
index 0000000..549d5c8
--- /dev/null
+++ b/modules/home/default.nix
@@ -0,0 +1,9 @@
+{ config, ... }: {
+    imports = [
+    (
+        if config.users.crow.home.enable then
+        ./crow.nix
+    );
+    # ++ ( to add more, just move the ;
+    ];
+}
diff --git a/modules/programs.nix b/modules/programs.nix
index 713c266..293f314 100644
--- a/modules/programs.nix
+++ b/modules/programs.nix
@@ -11,13 +11,22 @@
                 curl
                 foot
                 tmux
+                pulseaudio
             ] else []
         )
         ++ (
             if config.packages.gui.enable
             then [
-                # Note taking
+                # Writing
                 logseq
+                hunspellDicts.en-us
+                libreoffice
+                hunspell
+
+                # Audio
+                pavucontrol
+                pulsemixer
+                noisetorch
 
                 # Communication
                 mattermost-desktop
@@ -38,13 +47,6 @@
                 # Utilities
                 grim
                 hyfetch
-                wofi
-                waybar
-                swaynotificationcenter
-                udiskie
-                swayidle
-                hyprlock
-                pulseaudio
                 gimp
             ] else []
         )