diff --git a/home-manager/features/development-linux.nix b/home-manager/features/development-linux.nix
deleted file mode 100644
index 22dd499..0000000
--- a/home-manager/features/development-linux.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-# Meta-package for development on linux
-{...}:
-{
-  imports = [
-    ./development.nix
-    ./ssh.nix
-  ];
-}
diff --git a/home-manager/features/development.nix b/home-manager/features/development.nix
deleted file mode 100644
index cb6f680..0000000
--- a/home-manager/features/development.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./git.nix
-    ./shell.nix
-    ./terminal.nix
-    ./neovim
-  ];
-}
diff --git a/home-manager/features/development/development.nix b/home-manager/features/development/development.nix
new file mode 100644
index 0000000..223bc25
--- /dev/null
+++ b/home-manager/features/development/development.nix
@@ -0,0 +1,15 @@
+{ ... }:
+{
+  imports = [
+    # Dev apps
+    ../git.nix
+    ../shell.nix
+    ../terminal.nix
+    ../neovim
+    ../ssh.nix
+
+    # Languages
+    ./nix.nix
+    ./lua.nix
+  ];
+}
diff --git a/home-manager/features/haskell.nix b/home-manager/features/development/haskell.nix
similarity index 100%
rename from home-manager/features/haskell.nix
rename to home-manager/features/development/haskell.nix
diff --git a/home-manager/features/development/lua.nix b/home-manager/features/development/lua.nix
new file mode 100644
index 0000000..cbe2a46
--- /dev/null
+++ b/home-manager/features/development/lua.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    stylua # Formatter
+  ];
+}
diff --git a/home-manager/features/development/nix.nix b/home-manager/features/development/nix.nix
new file mode 100644
index 0000000..0a69404
--- /dev/null
+++ b/home-manager/features/development/nix.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    # Useful for getting the import information from github info for flakes.
+    nix-prefetch-github
+
+    nixfmt-rfc-style # Formatter
+    nil # Language Server
+  ];
+}
+ 
diff --git a/home-manager/features/linux-desktop.nix b/home-manager/features/linux-desktop.nix
index 32323a1..5c4d786 100644
--- a/home-manager/features/linux-desktop.nix
+++ b/home-manager/features/linux-desktop.nix
@@ -3,6 +3,8 @@
   imports = [
     ./hyprland.nix
     ./audio.nix
+    ./nix.nix
+    ../apps/element.nix
   ];
 
   home.packages = with pkgs; [
@@ -18,7 +20,7 @@
     hyprpolkitagent # Privilege managent
     gnome-keyring # Secret management
     glib # for Gnome/GTK settings
-    xdg-desktop-portal-hyprland 
+    xdg-desktop-portal-hyprland
     xdg-desktop-portal-gtk # GTK backend for XDG components like pickers
     grim # Screenshot provider
     hyprshot # Screenshot utility
diff --git a/home-manager/features/neovim/config/lua/config/keymaps.lua b/home-manager/features/neovim/config/lua/config/keymaps.lua
index 2c134f7..99fb402 100644
--- a/home-manager/features/neovim/config/lua/config/keymaps.lua
+++ b/home-manager/features/neovim/config/lua/config/keymaps.lua
@@ -1,3 +1,8 @@
 -- Keymaps are automatically loaded on the VeryLazy event
 -- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua
 -- Add any additional keymaps here
+
+let telescope = require('telescope')
+
+vim.api.nvim_set_keymap("n", "<leader><space><space>", telescope.builtin.oldfiles, { desc = "Telescope: Recent Files"}
+
diff --git a/home-manager/features/nix.nix b/home-manager/features/nix.nix
index 1dc2ae0..6b57dc6 100644
--- a/home-manager/features/nix.nix
+++ b/home-manager/features/nix.nix
@@ -1,10 +1,5 @@
 { pkgs, ... }:
 {
-  home.packages = with pkgs; [
-    # Useful for getting the import information from github info for flakes.
-    nix-prefetch-github
-  ];
- 
   # Enable flakes and nix-commnands.
   nix.settings.experimental-features = ["flakes" "nix-command"];
 
diff --git a/system/hosts/drew-desktop/drew.nix b/system/hosts/drew-desktop/drew.nix
index 75d4bef..b2478bc 100644
--- a/system/hosts/drew-desktop/drew.nix
+++ b/system/hosts/drew-desktop/drew.nix
@@ -2,11 +2,9 @@
 {
   imports = map (x: ../../../home-manager + x) [
     "/features/linux-desktop.nix"
-    "/features/development-linux.nix"
-    "/features/haskell.nix"
-    "/features/nix.nix"
     "/features/gaming.nix"
-    "/apps/element.nix"
+    "/features/development/development.nix"
+    "/features/development/haskell.nix"
   ];
 
   home.stateVersion = "24.11";