diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000..2ee90bf
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,64 @@
+{
+  "nodes": {
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "utils": "utils"
+      },
+      "locked": {
+        "lastModified": 1672244468,
+        "narHash": "sha256-xaZb8AZqoXRCSqPusCk4ouf+fUNP8UJdafmMTF1Ltlw=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "89a8ba0b5b43b3350ff2e3ef37b66736b2ef8706",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-22.11",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1672353432,
+        "narHash": "sha256-oZfgp/44/o2tWiylV30cR+DLyWTJ+5dhsdWZVpzs3e4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "913a47cd064cc06440ea84e5e0452039a85781f0",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-22.11",
+        "type": "indirect"
+      }
+    },
+    "root": {
+      "inputs": {
+        "home-manager": "home-manager",
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "utils": {
+      "locked": {
+        "lastModified": 1667395993,
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
index 3d1ef93..5ff4a24 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,42 +3,25 @@
 
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-22.11";
-    home-manager.url = "github:nix-community/home-manager/release-22.11";
-    home-manager.inputs.nixpkgs.follows = "nixpkgs";
+    home-manager = {
+      url = "github:nix-community/home-manager/release-22.11";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = { nixpkgs, home-manager, ... }: {
-    let
-      system = "x86_64-linux";
+  outputs = inputs@{ nixpkgs, home-manager, ... }: {
+    nixosConfigurations = {
+      atlas = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
 
-      pkgs = import nixpkgs {
-        inherit system;
-	config = { allowUnfree = true; };
-      };
-
-      lib = nixpkgs.lib;
-    in {
-      homeManagerConfigurations = {
-        jordan = home-manager.lib.homeManagerConfiguration {
-	  inherit system pkgs;
-	  username = "jordan";
-	  homeDirectory = "/home/jordan";
-	  configuration = {
-	    imports = ]
-	      ./users/jordan/home.nix
-	    ];
-	  };
-	};
-      };
-
-      nixosConfigurations = {
-        atlas = lib.nixosSystem {
-	  inherit system;
-
-	  modules = [
-	    ./system/configuration.nix
-	  ];
-	};
+        modules = [
+          ./system/configuration.nix
+          home-manager.nixosModules.home-manager {
+            home-manager.useGlobalPkgs = true;
+	    home-manager.useUserPackages = true;
+            home-manager.users.jordan = import ./users/jordan/home.nix;
+	  }
+	];
       };
     };
   };
diff --git a/system/configuration.nix b/system/configuration.nix
index ec737a0..36b934d 100644
--- a/system/configuration.nix
+++ b/system/configuration.nix
@@ -15,7 +15,7 @@
   boot.loader.efi.canTouchEfiVariables = true;
   boot.loader.efi.efiSysMountPoint = "/boot/efi";
 
-  networking.hostName = "nixos"; # Define your hostname.
+  networking.hostName = "atlas"; # Define your hostname.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
   # Configure network proxy if necessary
@@ -107,10 +107,6 @@
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-  };
 
   # List services that you want to enable:
 
diff --git a/users/jordan/home.nix b/users/jordan/home.nix
index 8fa91d7..f004c00 100644
--- a/users/jordan/home.nix
+++ b/users/jordan/home.nix
@@ -10,11 +10,34 @@
 
   programs.gpg.enable = true;
 
+  programs.zsh = {
+    enable = true;
+    enableCompletion = true;
+  };
+
   home.packages = with pkgs; [
+    bind
+    bmon
+    fd
+    ffmpeg
     firefox-wayland
+    fzf
     git
+    iotop
     pass
     neovim
+    nnn
+    pass
+    passExtensions.pass-otp
+    ripgrep
+    rsync
+    tcpdump
+    tokei
+    tree
+    yt-dlp
     wl-clipboard
+    zsh-autosuggestions
+    zsh-fast-syntax-highlighting
+    zsh-history-substring-search
   ];
 }