diff --git a/configuration.nix b/configuration.nix
index aff90be..42f5d4c 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -24,29 +24,16 @@
       "wheel"
       "networkmanager"
     ];
-    packages = with pkgs; [
-      firefox
-      tmux
-      fzf
-      qutebrowser
-      neomutt
-      khal
-      khard
-      rstudio
-      R
-      ruby
-      nodejs
-      vdirsyncer
-    ];
+    packages = with pkgs; [];
   };
 
   environment.systemPackages = with pkgs; [
     neovim
     wget
-    pipewire
     git
     foot
     wofi
+    pipewire
   ];
 
   fonts.fonts = with pkgs; [
@@ -59,10 +46,6 @@
     printing.enable = true;
   };
 
-  programs.sway.enable = true;
-  programs.fish.enable = true;
-  system.copySystemConfiguration = true;
 
   system.stateVersion = "22.11";
 }
-
diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000..9a2a215
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,48 @@
+{
+  "nodes": {
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1683651229,
+        "narHash": "sha256-HN0Mw8g1XQIrcdyzqT00YW0Uqi/V/BUUUAgvcK1pcSM=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "983f8a1bb965b261492123cd8e2d07da46d4d50a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1683546353,
+        "narHash": "sha256-zEfx6q4fXK5wq+RCsyM0FyWBKNNhHTKMpCWkEpKDe2g=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "7629f9b0680d87c7775f3261bee746da5dac76d1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-22.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "home-manager": "home-manager",
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
index bc9ad93..5296f45 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,23 +1,36 @@
 {
-  description = "First stab at a flake for my system config"
+  description = "First stab at a flake for my system config";
 
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs";
-  home-manager.url = "github:nix-community/home-manager";
-  home-manager.inputs.nixpkgs.follows = "nixpkgs";
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
+    home-manager.url = "github:nix-community/home-manager";
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
+  };
+
+  outputs = { self, nixpkgs, home-manager, ... }@inputs: {
 
-  outputs = { self, nixpkgs }: {
     nixosConfigurations = {
       romulus = nixpkgs.lib.nixosSystem {
         specialArgs = { inherit inputs; };
 	modules = [
-          { config, pkgs, ... }:
-          {
+	  { 
+            programs.sway.enable = true;
             networking.hostName = "romulus";
-          }
+	  }
           ./hardware-romulus.nix
           ./configuration.nix
         ];
       };
     };
+
+    homeConfigurations = {
+      "till@romulus" = home-manager.lib.homeManagerConfiguration {
+        pkgs = nixpkgs.legacyPackages.x86_64-linux;
+        extraSpecialArgs = { inherit inputs; };
+        modules = [ 
+          ./home-manager/home.nix 
+        ];
+      };
+    };
   };
 }
diff --git a/home-manager/home.nix b/home-manager/home.nix
new file mode 100644
index 0000000..3049c7f
--- /dev/null
+++ b/home-manager/home.nix
@@ -0,0 +1,51 @@
+{ config, pkgs, inputs, lib, ... }:
+
+{
+  home.username = "till";
+  home.homeDirectory = "/home/till";
+  home.stateVersion = "22.11";
+  nixpkgs = {
+    config = {
+      allowUnfree = true;
+      allowUnfreePredicate = (_: true);
+    };
+  };
+
+  programs.home-manager.enable = true;
+
+  home.packages = with pkgs; [
+    exa
+    firefox
+    fzf
+    jq
+    khal
+    khard
+    neomutt
+    nodejs
+    qutebrowser
+    R
+    rstudio
+    ruby
+    tmux
+    tree
+    vdirsyncer
+  ];
+  
+  programs.neovim = {
+    enable = true;
+  };
+
+#	home.sessionVariables = {
+#		EDITOR="nvim";
+#	};
+#	home.shellAliases = {
+#		l = "exa";
+#		ls = "exa";
+#		cat = "bat";
+#	};
+
+  programs.fish = {
+    enable = true;
+  };
+}
+