diff --git a/config/cli.nix b/config/cli.nix
new file mode 100644
index 0000000..cb5959b
--- /dev/null
+++ b/config/cli.nix
@@ -0,0 +1,34 @@
+{ config, pkgs, ... }:
+{
+# List packages installed in system profile. To search, run:
+# $ nix search wget
+environment.systemPackages = with pkgs; [
+  nixos-option
+  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+  less
+  wget
+  gitFull
+  zsh
+  zsh-powerlevel10k # TODO set up zsh to replace bash
+  tmux
+  eza
+  ripgrep
+  bat
+  gnused
+  gawk
+  file
+  htop
+  inxi
+  openssl
+  ffmpeg
+  imagemagick_light
+  rclone
+  python3
+  ansible
+];
+
+programs.neovim = {
+  enable = true;
+  defaultEditor = true;
+};
+}
diff --git a/config/gui.nix b/config/gui.nix
index d463526..36d1335 100644
--- a/config/gui.nix
+++ b/config/gui.nix
@@ -14,4 +14,13 @@ environment.systemPackages = with pkgs; [
   texlive.combined.scheme-medium
   telegram-desktop
 ];
+  programs.firefox = {
+    enable = true; # TODO use home-manager
+    policies = {
+      DisablePocket = true;
+      ExtensionSettings = {};
+    };
+    preferencesStatus = "locked";
+    preferences = {};
+  };
 }
diff --git a/configuration.nix b/configuration.nix
index 5dd8534..23a3f27 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -2,13 +2,13 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, pkgs, ... }:
+{ config, pkgs, inputs,  ... }:
 
 {
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
-      #./home.nix
+      inputs.home-manager.nixosModules.default
     ];
 
   # Bootloader.
@@ -74,6 +74,12 @@
     ];
   };
 
+  home-manager = {
+    # also pass inputs to home-manager modules
+    extraSpecialArgs = {inherit inputs; };
+    users.snow = import ./home.nix;
+  };
+
   virtualisation.docker.rootless = {
   enable = true;
   setSocketVariable = true;
@@ -82,49 +88,9 @@
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  environment.systemPackages = with pkgs; [
-    nixos-option
-    vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-    less
-    wget
-    gitFull
-    zsh
-    zsh-powerlevel10k # TODO set up zsh to replace bash
-    tmux
-    eza # TODO replace with eza
-    ripgrep
-    bat
-    gnused
-    gawk
-    file
-    htop
-    inxi
-    openssl
-    ffmpeg
-    imagemagick_light
-    nextcloud-client # TODO replace with rclone
-    python3
-    ansible
-  ];
-
-  programs.neovim = {
-  enable = true;
-  defaultEditor = true;
-  };
 
 
 
-  programs.firefox = {
-    enable = true; # TODO use home-manager
-    policies = {
-      DisablePocket = true;
-      ExtensionSettings = {};
-    };
-    preferencesStatus = "locked";
-    preferences = {};
-  };
 
 
 
diff --git a/flake.lock b/flake.lock
index c211742..0914053 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,26 @@
 {
   "nodes": {
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1704980875,
+        "narHash": "sha256-IPZmMjk5f4TBbEpzUFBc3OC1W6OwDNEXk2w/0uVXX1o=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "5f0ab0eedc6ede69beb8f45561ffefa54edc6e65",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-23.11",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1704874635,
@@ -18,6 +39,7 @@
     },
     "root": {
       "inputs": {
+        "home-manager": "home-manager",
         "nixpkgs": "nixpkgs"
       }
     }
diff --git a/flake.nix b/flake.nix
index 0c7cf9f..fd8d249 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,10 +4,10 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
 
-    # home-manager = {
-    #   url = "github:nix-community/home-manager";
-    #   inputs.nixpkgs.follows = "nixpkgs";
-    # };
+    home-manager = {
+      url = "github:nix-community/home-manager/release-23.11";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = { self, nixpkgs, ... }@inputs:
@@ -22,9 +22,10 @@
           modules = [ 
             ./configuration.nix
 	    ./config/locale.nix
+	    ./config/cli.nix
 	    ./config/gui.nix
 	    ./config/i3.nix
-            # inputs.home-manager.nixosModules.default
+            inputs.home-manager.nixosModules.default
           ];
         };
 
diff --git a/home.nix b/home.nix
new file mode 100644
index 0000000..82c5aed
--- /dev/null
+++ b/home.nix
@@ -0,0 +1,75 @@
+{ config, pkgs, ... }:
+
+{
+  # Home Manager needs a bit of information about you and the paths it should
+  # manage.
+  home.username = "snow";
+  home.homeDirectory = "/home/snow";
+
+  # This value determines the Home Manager release that your configuration is
+  # compatible with. This helps avoid breakage when a new Home Manager release
+  # introduces backwards incompatible changes.
+  #
+  # You should not change this value, even if you update Home Manager. If you do
+  # want to update the value, then make sure to first check the Home Manager
+  # release notes.
+  home.stateVersion = "23.11"; # Please read the comment before changing.
+
+  # The home.packages option allows you to install Nix packages into your
+  # environment.
+  home.packages = [
+    # # Adds the 'hello' command to your environment. It prints a friendly
+    # # "Hello, world!" when run.
+    # pkgs.hello
+
+    # # It is sometimes useful to fine-tune packages, for example, by applying
+    # # overrides. You can do that directly here, just don't forget the
+    # # parentheses. Maybe you want to install Nerd Fonts with a limited number of
+    # # fonts?
+    # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
+
+    # # You can also create simple shell scripts directly inside your
+    # # configuration. For example, this adds a command 'my-hello' to your
+    # # environment:
+    # (pkgs.writeShellScriptBin "my-hello" ''
+    #   echo "Hello, ${config.home.username}!"
+    # '')
+  ];
+
+  # Home Manager is pretty good at managing dotfiles. The primary way to manage
+  # plain files is through 'home.file'.
+  home.file = {
+    # # Building this configuration will create a copy of 'dotfiles/screenrc' in
+    # # the Nix store. Activating the configuration will then make '~/.screenrc' a
+    # # symlink to the Nix store copy.
+    # ".screenrc".source = dotfiles/screenrc;
+
+    # # You can also set the file content immediately.
+    # ".gradle/gradle.properties".text = ''
+    #   org.gradle.console=verbose
+    #   org.gradle.daemon.idletimeout=3600000
+    # '';
+  };
+
+  # Home Manager can also manage your environment variables through
+  # 'home.sessionVariables'. If you don't want to manage your shell through Home
+  # Manager then you have to manually source 'hm-session-vars.sh' located at
+  # either
+  #
+  #  ~/.nix-profile/etc/profile.d/hm-session-vars.sh
+  #
+  # or
+  #
+  #  ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh
+  #
+  # or
+  #
+  #  /etc/profiles/per-user/snow/etc/profile.d/hm-session-vars.sh
+  #
+  home.sessionVariables = {
+    EDITOR = "nvim";
+  };
+
+  # Let Home Manager install and manage itself.
+  programs.home-manager.enable = true;
+}