diff --git a/nixos/home/base.nix b/nixos/home/base.nix
index d5158c6..5daf78b 100644
--- a/nixos/home/base.nix
+++ b/nixos/home/base.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
     home = {
         stateVersion = "24.11";
@@ -26,85 +26,6 @@
     };
 
     programs = {
-        firefox = {
-            enable = true;
-            profiles.default = {
-                isDefault = true;
-                extensions = with pkgs.nur.repos.rycee.firefox-addons; [
-                    canvasblocker
-                    catppuccin-gh-file-explorer
-                    privacy-badger
-                    stylus
-                    ublock-origin
-                    violentmonkey
-                ];
-                settings = {
-                    "browser.newtabpage.activity-stream.default.sites" = "https://en.wikipedia.org/";
-                    "browser.newtabpage.activity-stream.discoverystream.enabled" = false;
-                    "browser.newtabpage.activity-stream.feeds.telemetry" = false;
-                    "browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts.havePinned" = "";
-                    "browser.newtabpage.activity-stream.newtabWallpapers.wallpaper" = "dark-beach";
-                    "browser.newtabpage.activity-stream.showSponsored" = false;
-                    "browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
-                    "browser.newtabpage.activity-stream.telemetry" = false;
-                    "browser.newtabpage.activity-stream.topSitesRows" = 2;
-                    "browser.newtabpage.pinned" = [
-                        {
-                            url = "https://discord.com/app/";
-                            label = "Discord";
-                        }
-                        {
-                            url = "https://pikidiary.lol/";
-                            label = "PikiDiary";
-                        }
-                        {
-                            url = "https://en.wikipedia.org/";
-                            label = "Wikipedia";
-                        }
-                    ];
-                    "datareporting.healthreport.uploadEnabled" = false;
-                    "font.name.monospace.x-western" = "Fira Code";
-                    "layout.css.prefers-color-scheme.content-override" = 0;
-                };
-                bookmarks = [
-                    {
-                        name = "NixOS search";
-                        url = "https://search.nixos.org/packages";
-                    }
-                    {
-                        name = "Home Manager search";
-                        url = "https://home-manager-options.extranix.com/";
-                    }
-                    {
-                        name = "NUR search";
-                        url = "https://nur.nix-community.org/";
-                    }
-                    {
-                        name = "NixOS wiki";
-                        url = "https://nixos.wiki/";
-                    }
-                ];
-                search = {
-                    default = "DuckDuckGo";
-                    engines = {
-                        "Nix packages" = {
-                            urls = [{
-                                template = "https://search.nixos.org/packages";
-                                params = [
-                                    { name = "type"; value = "packages"; }
-                                    { name = "query"; value = "{searchTerms}"; }
-                                ];
-                            }];
-                            icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
-                        };
-
-                        "Bing".metaData.hidden = true;
-                    };
-                    order = [ "DuckDuckGo" "Nix packages" ];
-                    force = true;
-                };
-            };
-        };
         git = {
             enable = true;
             userName = "roxwize";
@@ -115,22 +36,6 @@
             font.name = "Fira Code";
             themeFile = "mayukai";
         };
-        neovim = {
-            enable = true;
-            defaultEditor = true;
-            vimAlias = true;
-            plugins = with pkgs.vimPlugins; [
-                vim-just
-                vim-sleuth
-                vim-wakatime
-            ];
-            extraLuaConfig = ''
-                vim.opt.tabstop = 4
-                vim.opt.softtabstop = 4
-                vim.opt.shiftwidth = 4
-                vim.opt.expandtab = true
-            '';
-        };
     };
 
     services = {
diff --git a/nixos/home/default.nix b/nixos/home/default.nix
index cbcb54f..b01ee96 100644
--- a/nixos/home/default.nix
+++ b/nixos/home/default.nix
@@ -2,5 +2,7 @@
 {
     imports = [
         ./base.nix
+        ./firefox.nix
+        ./neovim.nix
     ];
 }
diff --git a/nixos/home/firefox.nix b/nixos/home/firefox.nix
new file mode 100644
index 0000000..1065365
--- /dev/null
+++ b/nixos/home/firefox.nix
@@ -0,0 +1,82 @@
+{ pkgs, ... }: {
+    programs.firefox = {
+        enable = true;
+        profiles.default = {
+            isDefault = true;
+            extensions = with pkgs.nur.repos.rycee.firefox-addons; [
+                canvasblocker
+                catppuccin-gh-file-explorer
+                privacy-badger
+                stylus
+                ublock-origin
+                violentmonkey
+            ];
+            settings = {
+                "browser.newtabpage.activity-stream.default.sites" = "https://en.wikipedia.org/";
+                "browser.newtabpage.activity-stream.discoverystream.enabled" = false;
+                "browser.newtabpage.activity-stream.feeds.telemetry" = false;
+                "browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts.havePinned" = "";
+                "browser.newtabpage.activity-stream.newtabWallpapers.wallpaper" = "dark-beach";
+                "browser.newtabpage.activity-stream.showSponsored" = false;
+                "browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
+                "browser.newtabpage.activity-stream.telemetry" = false;
+                "browser.newtabpage.activity-stream.topSitesRows" = 2;
+                "browser.newtabpage.pinned" = [
+                    {
+                        url = "https://discord.com/app/";
+                        label = "Discord";
+                    }
+                    {
+                        url = "https://pikidiary.lol/";
+                        label = "PikiDiary";
+                    }
+                    {
+                        url = "https://en.wikipedia.org/";
+                        label = "Wikipedia";
+                    }
+                ];
+                "datareporting.healthreport.uploadEnabled" = false;
+                "font.name.monospace.x-western" = "Fira Code";
+                "layout.css.prefers-color-scheme.content-override" = 0;
+            };
+            bookmarks = [
+                {
+                    name = "NixOS search";
+                    url = "https://search.nixos.org/packages";
+                }
+                {
+                    name = "Home Manager search";
+                    url = "https://home-manager-options.extranix.com/";
+                }
+                {
+                    name = "NUR search";
+                    url = "https://nur.nix-community.org/";
+                }
+                {
+                    name = "NixOS wiki";
+                    url = "https://nixos.wiki/";
+                }
+            ];
+            search = {
+                default = "DuckDuckGo";
+                engines = {
+                    "Nix packages" = {
+                        urls = [{
+                            template = "https://search.nixos.org/packages";
+                            params = [
+                                { name = "type"; value = "packages"; }
+                                { name = "query"; value = "{searchTerms}"; }
+                            ];
+                        }];
+                        icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
+                    };
+
+                    "Bing".metaData.hidden = true;
+                    "Google".metaData.hidden = true;
+                };
+                order = [ "DuckDuckGo" "Nix packages" ];
+                force = true;
+            };
+        };
+    };
+}
diff --git a/nixos/home/neovim.nix b/nixos/home/neovim.nix
new file mode 100644
index 0000000..9577475
--- /dev/null
+++ b/nixos/home/neovim.nix
@@ -0,0 +1,18 @@
+{ pkgs, ... }: {
+    programs.neovim = {
+        enable = true;
+        defaultEditor = true;
+        vimAlias = true;
+        plugins = with pkgs.vimPlugins; [
+            vim-just
+            vim-sleuth
+            vim-wakatime
+        ];
+        extraLuaConfig = ''
+            vim.opt.tabstop = 4
+            vim.opt.softtabstop = 4
+            vim.opt.shiftwidth = 4
+            vim.opt.expandtab = true
+        '';
+    };
+}