diff --git a/flake.nix b/flake.nix
index eb7469c..b2d0180 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,7 +16,6 @@
     # Imported apps
     naersk.url = "github:nix-community/naersk";
     rnix-lsp.url = "github:nix-community/rnix-lsp";
-    rnix-lsp.inputs.naersk.follows = "naersk";
     rnix-lsp.inputs.nixpkgs.follows = "nixpkgs-unstable";
     youmubot.url = "github:natsukagami/youmubot";
     nix-gaming.url = github:fufexan/nix-gaming;
@@ -102,12 +101,12 @@
           sops-nix.nixosModules.sops
           ./nki-x1c1/configuration.nix
           nixpkgsAsRegistry
-          # home-manager.nixosModules.home-manager
-          # {
-            # home-manager.useGlobalPkgs = true;
-            # home-manager.useUserPackages = true;
-            # home-manager.users.nki = import ./home/kagami-pc-home.nix;
-          # }
+          home-manager.nixosModules.home-manager
+          {
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+            home-manager.users.nki = import ./home/nki-x1c1.nix;
+          }
           (overlayForSystem "x86_64-linux")
         ];
       };
diff --git a/home/common.nix b/home/common.nix
index fd354fa..d685ec1 100644
--- a/home/common.nix
+++ b/home/common.nix
@@ -55,7 +55,7 @@
     bottom
 
     ## To do tunneling with cloudflare
-    cloudflared
+    pkgs.unfree.cloudflared
 
     # Databases
     postgresql
diff --git a/home/kakoune/kak.nix b/home/kakoune/kak.nix
index 5f372a6..60c4010 100644
--- a/home/kakoune/kak.nix
+++ b/home/kakoune/kak.nix
@@ -39,7 +39,7 @@ let
         src = pkgs.fetchFromGitHub {
           owner = pname;
           repo = pname;
-          rev = "v${version}";
+          rev = rev;
           sha256 = "sha256-xjfYdwDNp2Ak7t0dfp0SWJcFVve2iDcEKzDukcxVmzI=";
           # sha256 = lib.fakeSha256;
         };
diff --git a/home/nki-x1c1.nix b/home/nki-x1c1.nix
new file mode 100644
index 0000000..503864b
--- /dev/null
+++ b/home/nki-x1c1.nix
@@ -0,0 +1,44 @@
+{ pkgs, config, lib, ... } :
+
+{
+  imports = [
+      # Common configuration
+      ./common.nix
+      # Set up X11-specific common configuration
+      # ./X11/default.nix
+      # ./X11/hidpi.nix # Enable hiDPI
+      # We use our own firefox
+      # ./firefox.nix
+      # osu!
+      # ./osu.nix
+  ];
+
+  # Home Manager needs a bit of information about you and the
+  # paths it should manage.
+  home.username = "nki";
+  home.homeDirectory = "/home/nki";
+
+  # More packages
+  home.packages = (with pkgs; [
+      # CLI stuff
+      python
+      zip
+      # TeX
+      texlive.combined.scheme-full
+
+      # Java & sbt
+      openjdk11
+      sbt
+  ]);
+
+  # 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 can update Home Manager without changing this value. See
+  # the Home Manager release notes for a list of state version
+  # changes in each release.
+  home.stateVersion = "21.05";
+}
+