diff --git a/home/programs/default.nix b/home/programs/default.nix
index 1c7c3ee..7152742 100644
--- a/home/programs/default.nix
+++ b/home/programs/default.nix
@@ -1,5 +1,7 @@
 {
   imports = [
     ./firefox.nix
+    ./neovim.nix
+    ./other.nix
   ];
 }
diff --git a/home/shell/neovim/default.nix b/home/programs/neovim.nix
similarity index 97%
rename from home/shell/neovim/default.nix
rename to home/programs/neovim.nix
index 8fb1855..298416a 100644
--- a/home/shell/neovim/default.nix
+++ b/home/programs/neovim.nix
@@ -52,6 +52,7 @@
         svelte.enable = false;
         ts.enable = true;
         typst.enable = true;
+        rust.enable = true;
       };
       lsp = {
         formatOnSave = true;
@@ -76,9 +77,9 @@
       };
 
       dashboard.alpha.enable = true;
-      filetree.nvimtree = {
+      filetree.nvimTree = {
         enable = true; #TODO: Change mapping
-        openOnStartup = false;
+        openOnSetup = false;
         mappings.toggle = "\\";
       };
       git = {
diff --git a/home/programs/other.nix b/home/programs/other.nix
new file mode 100644
index 0000000..bbc633f
--- /dev/null
+++ b/home/programs/other.nix
@@ -0,0 +1,6 @@
+{pkgs, ...}: {
+  home.packages = [
+    pkgs.spotify
+    pkgs.signal-desktop
+  ];
+}
diff --git a/home/shell/default.nix b/home/shell/default.nix
index 37f1c01..4601db5 100644
--- a/home/shell/default.nix
+++ b/home/shell/default.nix
@@ -4,6 +4,6 @@
     ./starship.nix
     ./yazi.nix
     ./zoxide.nix
-    ./neovim
+    ./other.nix
   ];
 }
diff --git a/home/shell/other.nix b/home/shell/other.nix
new file mode 100644
index 0000000..3a6a656
--- /dev/null
+++ b/home/shell/other.nix
@@ -0,0 +1,7 @@
+{pkgs, ...}: {
+  home.packages = [
+    pkgs.gh
+    pkgs.ripgrep
+    pkgs.ear2ctl # FIXME: only when bluetooth enabled
+  ];
+}
diff --git a/home/wayland/default.nix b/home/wayland/default.nix
index 964194f..a177b0c 100644
--- a/home/wayland/default.nix
+++ b/home/wayland/default.nix
@@ -1,8 +1,9 @@
 {pkgs, ...}: {
   imports = [
     ./fuzzel.nix
-    ./hyprlock.nix
     ./hyprland
+    ./hyprlock.nix
+    ./mako.nix
   ];
 
   home.packages = [
diff --git a/home/wayland/mako.nix b/home/wayland/mako.nix
new file mode 100644
index 0000000..b8052a4
--- /dev/null
+++ b/home/wayland/mako.nix
@@ -0,0 +1,3 @@
+{
+  services.mako.enable = true;
+}