diff --git a/configuration.nix b/configuration.nix
index 0b4308a..eb635d3 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -81,7 +81,7 @@
     ./modules/gui.nix
     ./modules/datasync.nix
     ./modules/audio.nix
-    ./modules/home.nix
+    #./modules/home.nix
     ./modules/hardware-configuration.nix
   ];
 
diff --git a/modules/gui.nix b/modules/gui.nix
index 1443753..6148c8d 100644
--- a/modules/gui.nix
+++ b/modules/gui.nix
@@ -30,6 +30,7 @@
       imv
       kanshi
       redshift-wlr
+      kitty
     ];
     extraSessionCommands = ''
       export MOZ_ENABLE_WAYLAND=1
@@ -41,7 +42,7 @@
       export SDL_VIDEODRIVER=wayland
     '';
   };
-
+   
   # Blue light filter
   services.redshift = {
     package = pkgs.redshift-wlr;
diff --git a/modules/home.nix b/modules/home.nix
index 138f336..48f2b4f 100644
--- a/modules/home.nix
+++ b/modules/home.nix
@@ -1,16 +1,5 @@
 { config, lib, pkgs, ... }:
 
-# Doom emacs overlay
-let
-
-doom-emacs = pkgs.callPackage (builtins.fetchTarball {
-  url = https://github.com/vlaci/nix-doom-emacs/archive/master.tar.gz;
-}) {
-  doomPrivateDir = ./doom.d;
-};
-
-in
-
 {
   # User packages
   home.packages = [
diff --git a/modules/software.nix b/modules/software.nix
index 4d8645e..2b2501f 100644
--- a/modules/software.nix
+++ b/modules/software.nix
@@ -1,5 +1,16 @@
 { config, lib, pkgs, ... }:
 
+# Doom emacs overlay
+let
+
+doom-emacs = pkgs.callPackage (builtins.fetchTarball {
+  url = https://github.com/vlaci/nix-doom-emacs/archive/master.tar.gz;
+}) {
+  doomPrivateDir = ./doom.d;
+};
+
+in
+
 {
   environment.systemPackages = with pkgs; [
     # Monitoring
@@ -14,8 +25,16 @@
     # LaTeX
     texlive.combined.scheme-full
     pandoc
-    # Declarative user config
-    home-manager
+    # Text editors
+    doom-emacs
+    neovim
+    # Terminals
+    tmux
+    tmuxp
+    # Development
+    git
+    direnv
+    lorri
   ];
 
   # Fonts declaration