diff --git a/home/hosts/astyanax/default.nix b/home/hosts/astyanax/default.nix
index 93213e2..d85ef72 100644
--- a/home/hosts/astyanax/default.nix
+++ b/home/hosts/astyanax/default.nix
@@ -1,4 +1,9 @@
-{ config, pkgs, ... }:
+{
+  inputs,
+  config,
+  pkgs,
+  ...
+}:
 
 {
   home.stateVersion = "25.05";
@@ -24,66 +29,25 @@
         export PATH=${../../../dots/.bin}:$PATH
       '';
     };
-    firefox.enable = true;
+    firefox = import ../../modules/firefox.nix {
+      inherit inputs;
+      inherit pkgs;
+      inherit config;
+    };
     fzf = {
       enable = true;
       enableBashIntegration = true;
     };
-    git.enable = true;
+    git = import ../../modules/git.nix;
     home-manager.enable = true;
+    keepassxc = import ../../modules/keepassxc.nix;
+    neovim = import ../../modules/neovim.nix;
   };
 
-  home.packages = with pkgs; [
-    bash-completion
-    bash-language-server
-    bat
-    brightnessctl
-    entr
-    eslint_d
-    feh
-    fzf
-    git
-    haskell-language-server
-    haskellPackages.pandoc-crossref
-    haskellPackages.hadolint
-    htop
-    jq
-    keepassxc
-    kitty
-    lua-language-server
-    # neovim
-    nixfmt-rfc-style
-    nmap
-    nodejs_24
-    nodePackages.ts-node
-    nvimpager
-    ormolu
-    pandoc
-    parallel
-    pass
-    pnpm
-    ripgrep
-    silver-searcher
-    sshfs
-    stylelint
-    svelte-language-server
-    tailwindcss-language-server
-    taskwarrior3
-    tldr
-    tmux
-    tmuxp
-    tree
-    tree-sitter
-    typescript-language-server
-    unzip
-    vim-language-server
-    vimPlugins.vim-plug
-    vtsls
-    wget
-    xbanish
-    xclip
-    yaml-language-server
-  ];
+  home.packages = import ./packages.nix {
+    inherit pkgs;
+    inherit config;
+  };
 
   home.file = {
     ".inputrc".source = ../../../dots/.inputrc;
diff --git a/home/hosts/astyanax/packages.nix b/home/hosts/astyanax/packages.nix
new file mode 100644
index 0000000..58d30de
--- /dev/null
+++ b/home/hosts/astyanax/packages.nix
@@ -0,0 +1,53 @@
+{ pkgs, ... }:
+
+with pkgs;
+[
+  bash-completion
+  bash-language-server
+  bat
+  brightnessctl
+  entr
+  eslint_d
+  feh
+  fzf
+  git
+  haskell-language-server
+  haskellPackages.pandoc-crossref
+  haskellPackages.hadolint
+  htop
+  jq
+  kitty
+  lua-language-server
+  # neovim
+  nixfmt-rfc-style
+  nmap
+  nodejs_24
+  nodePackages.ts-node
+  nvimpager
+  ormolu
+  pandoc
+  parallel
+  pass
+  pnpm
+  ripgrep
+  silver-searcher
+  sshfs
+  stylelint
+  svelte-language-server
+  tailwindcss-language-server
+  taskwarrior3
+  tldr
+  tmux
+  tmuxp
+  tree
+  tree-sitter
+  typescript-language-server
+  unzip
+  vim-language-server
+  vimPlugins.vim-plug
+  vtsls
+  wget
+  xbanish
+  xclip
+  yaml-language-server
+]