diff --git a/configuration.nix b/configuration.nix
index 3b9d048..26ac67e 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -10,11 +10,7 @@
     git
     eza
   ];
-
-  # imports = [
-  #   ./
-  # ];
-
+  
   # For SSH access
   services.openssh.enable = true;
 
diff --git a/flake.lock b/flake.lock
index 1c8e3f5..69bdf4d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,11 +5,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "lastModified": 1681202837,
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
         "type": "github"
       },
       "original": {
@@ -40,11 +40,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1733392399,
-        "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=",
+        "lastModified": 1733581040,
+        "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661",
+        "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01",
         "type": "github"
       },
       "original": {
@@ -72,10 +72,12 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 0,
-        "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=",
-        "path": "/nix/store/nr5nl3zwzl02x3rnikjbry3s5xy7bm1d-source",
-        "type": "path"
+        "lastModified": 1682134069,
+        "narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "fd901ef4bf93499374c5af385b2943f5801c0833",
+        "type": "github"
       },
       "original": {
         "id": "nixpkgs",
diff --git a/flake.nix b/flake.nix
index 697ffae..b3bf8d7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,6 +24,15 @@
     system = "x86_64-linux";
     pkgs = nixpkgs.legacyPackages.${system};
     stateVersion = "24.05";
+
+    # userSettings = rec {
+    #   username = "shahvirb"; # username on the system
+    #   name = "Shahvir"; # name/identifier on the system
+    #   email = "shahvirb@gmail.com";
+    #   gitUserName = "shahvirb";
+    #   gitUserEmail = "shahvirb@gmail.com";
+    # };
+
     timeZone = "America/Chicago";
     hostname = "panoptes-nix";
     user = "panoptes";
@@ -53,14 +62,10 @@
 
     homeConfigurations = {
       useGlobalPkgs = true;
-      "root@${hostname}" = home-manager.lib.homeManagerConfiguration {
+      user = home-manager.lib.homeManagerConfiguration {
+        inherit pkgs;
         extraSpecialArgs = {inherit inputs outputs pkgs;};
-        modules = [ ./home-manager/git.nix ];
-      };
-
-      "${user}@${hostname}" = home-manager.lib.homeManagerConfiguration {
-        extraSpecialArgs = {inherit inputs outputs pkgs;};
-        modules = [ ./home-manager/home.nix ];
+        modules = [ ./homeManagerModules/home.nix ];
       };
     };
   };
diff --git a/homeManagerModules/home.nix b/homeManagerModules/home.nix
index bceeaa3..4da89a2 100644
--- a/homeManagerModules/home.nix
+++ b/homeManagerModules/home.nix
@@ -10,23 +10,22 @@ let
 in
 {
   imports = [ ./git.nix ];
-
   programs.git.extraConfig.safe.directory = "${homePath}";
 
   programs.home-manager.enable = true;
   home = {
     stateVersion = "24.05";
-    username = "${user}";
+    # username = "${user}";
     homeDirectory = "${homePath}";
     packages = [
-    (pkgs.writeShellScriptBin "nfs" ''
-      sudo nixos-rebuild switch --flake git+file://${homePath}#${hostname}
-    '')
-    (pkgs.writeShellScriptBin "init-panoptes" ''
-      sudo -u git clone -b reorg https://gitea.john-stream.com/john/loki-nix /srv/panoptes
-    '')
-    git
-  ];
+      (pkgs.writeShellScriptBin "nfs" ''
+        sudo nixos-rebuild switch --flake git+file://${homePath}#${hostname}
+      '')
+      (pkgs.writeShellScriptBin "init-panoptes" ''
+        sudo -u git clone -b reorg https://gitea.john-stream.com/john/loki-nix /srv/panoptes
+      '')
+      git
+    ];
   };
 
   systemd.user.startServices = "sd-switch";
diff --git a/nixosModules/services/loki.nix b/nixosModules/services/loki.nix
index 4eb53a3..c2b395b 100644
--- a/nixosModules/services/loki.nix
+++ b/nixosModules/services/loki.nix
@@ -1,11 +1,13 @@
-{ pkgs, config, lokiPort ? 3100, ... }:
+{ pkgs, config, ... }:
 {
   networking.firewall.allowedTCPPorts = [
     config.services.loki.configuration.server.http_listen_port
   ];
 
   environment.systemPackages = with pkgs; [
-    (pkgs.writeShellScriptBin "loki-check" "curl http://localhost:${builtins.toString lokiPort}/ready")
+    (pkgs.writeShellScriptBin "loki-check" ''
+      curl http://localhost:${config.services.loki.configuration.server.http_listen_port}/ready
+    '')
     (pkgs.writeShellScriptBin "loki-logs" "journalctl -b -u loki.service -n 10")
   ];
   
@@ -14,7 +16,7 @@
     user = "loki";
 
     configuration = {
-      server.http_listen_port = lokiPort;
+      server.http_listen_port = 3100;
       # server.grpc_listen_port = 9096;
       auth_enabled = false;
 
diff --git a/nixosModules/vscode/flake.nix b/nixosModules/vscode/flake.nix
deleted file mode 100644
index 7d8ff5c..0000000
--- a/nixosModules/vscode/flake.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  inputs.vscode-server.url = "github:nix-community/nixos-vscode-server";
-
-  outputs = { self, nixpkgs, vscode-server }: {
-    nixosConfigurations.yourhostname = nixpkgs.lib.nixosSystem {
-      modules = [
-        vscode-server.nixosModules.default
-        ({ config, pkgs, ... }: {
-          services.vscode-server.enable = true;
-        })
-      ];
-    };
-  };
-}
\ No newline at end of file