diff --git a/lauren_lagarde.nix b/base.nix
similarity index 55%
rename from lauren_lagarde.nix
rename to base.nix
index 42e9283..7841b6c 100644
--- a/lauren_lagarde.nix
+++ b/base.nix
@@ -1,12 +1,12 @@
-{ pkgs, ... }: {
-  home.stateVersion = "24.05";
+{ ... }: {
+  home.stateVersion = "24.11";
+
+  imports = [
+    ./programs/vim.nix
+    ./programs/gpg.nix
+  ];
 
   # Self-hosting
   programs.bash.enable = true;
   programs.home-manager.enable = true;
-
-  imports = [
-    ./vim.nix
-    ./gpg.nix
-  ];
 }
diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000..6d7fdaa
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,66 @@
+{
+  "nodes": {
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1739757849,
+        "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-24.11",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1741332913,
+        "narHash": "sha256-ri1e8ZliWS3Jnp9yqpKApHaOo7KBN33W8ECAKA4teAQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "20755fa05115c84be00b04690630cb38f0a203ad",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1741379970,
+        "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "home-manager": "home-manager",
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-unstable": "nixpkgs-unstable"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
new file mode 100644
index 0000000..fc2b26c
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,46 @@
+{
+  description = "Lauren's Home Manager Flake";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
+    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+
+    home-manager.url = "github:nix-community/home-manager/release-24.11";
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
+  };
+
+  outputs = {nixpkgs, nixpkgs-unstable, home-manager, ... }: let 
+    system = "x86_64-linux";
+
+    unstable = nixpkgs-unstable.legacyPackages.${system};
+
+    lauren_lagarde_modules = [{
+      home.username = "lauren_lagarde";
+      home.homeDirectory = "/home/lauren_lagarde";
+    }];
+  in {
+    homeConfigurations = {
+      "lauren_lagarde" = home-manager.lib.homeManagerConfiguration {
+        pkgs = import nixpkgs { system = "x86_64-linux"; };
+        modules = lauren_lagarde_modules ++ [
+          ./base.nix
+        ];
+      };
+
+      "lauren_lagarde@ll-latitude-e5591" = home-manager.lib.homeManagerConfiguration {
+        pkgs = import nixpkgs { system = "x86_64-linux"; };
+        modules = lauren_lagarde_modules ++ [
+          ./base.nix
+
+          ./i3.nix
+
+          ./secrets/dotspace.nix
+          ./secrets/dotspace_gui.nix
+
+          ./systems/ll-latitude-e5591.nix
+        ];
+        extraSpecialArgs = { unstable = unstable; };
+      };
+    };
+  };
+}
diff --git a/home.nix b/home.nix
deleted file mode 100644
index cfb7842..0000000
--- a/home.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ ... }: {
-  home = {
-    username = "lauren_lagarde";
-    homeDirectory = "/home/lauren_lagarde";
-  };
-
-  imports = [
-    ./lauren_lagarde.nix
-  ];
-}
diff --git a/i3.nix b/i3.nix
index 93f224c..27c7792 100644
--- a/i3.nix
+++ b/i3.nix
@@ -1,8 +1,8 @@
 { pkgs, ... }: {
   imports = [
-    ./firefox.nix
-    ./polybar.nix
-    ./gnome-terminal.nix
+    ./programs/firefox.nix
+    ./programs/polybar.nix
+    ./programs/gnome-terminal.nix
   ];
 
   home.file = {
@@ -130,7 +130,7 @@
       # Lock Screen
       #exec --no-startup-id xidlehook --not-when-fullscreen --not-when-audio --timer normal 30 ~/Applications/lock_then_off.sh
       #bindsym $mod+Control+Mod1+Shift+l exec ~/Applications/lock_then_off.sh
-      bindsym $mod+Control+Mod1+Shift+l exec i3lock
+      bindsym $mod+Control+Mod1+Shift+l exec dm-tool lock
       
       # Logout
       bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
diff --git a/firefox.nix b/programs/firefox.nix
similarity index 100%
rename from firefox.nix
rename to programs/firefox.nix
diff --git a/gnome-terminal.nix b/programs/gnome-terminal.nix
similarity index 100%
rename from gnome-terminal.nix
rename to programs/gnome-terminal.nix
diff --git a/gpg.nix b/programs/gpg.nix
similarity index 63%
rename from gpg.nix
rename to programs/gpg.nix
index 88a7b14..0d49532 100644
--- a/gpg.nix
+++ b/programs/gpg.nix
@@ -5,11 +5,11 @@
     mutableTrust = true;
     publicKeys = [
       {
-        source = ./pubkeys/mlaga97_pubkey_20240419.asc;
+        source = ../pubkeys/mlaga97_pubkey_20240419.asc;
         trust = 5;
       }
       {
-        source = ./pubkeys/ajfunk27_pubkey_20240129.asc;
+        source = ../pubkeys/ajfunk27_pubkey_20240129.asc;
         trust = 4;
       }
     ];
diff --git a/polybar.nix b/programs/polybar.nix
similarity index 100%
rename from polybar.nix
rename to programs/polybar.nix
diff --git a/vim.nix b/programs/vim.nix
similarity index 100%
rename from vim.nix
rename to programs/vim.nix
diff --git a/secrets.tar.zst.gpg b/secrets.tar.zst.gpg
index 42e3763..46e784f 100644
Binary files a/secrets.tar.zst.gpg and b/secrets.tar.zst.gpg differ
diff --git a/systems/ll-latitude-e5591.nix b/systems/ll-latitude-e5591.nix
new file mode 100644
index 0000000..95fb797
--- /dev/null
+++ b/systems/ll-latitude-e5591.nix
@@ -0,0 +1,42 @@
+{ pkgs, unstable, ... }: {
+  nixpkgs.config.allowUnfree = true;
+
+  home.packages = with pkgs; [
+    # TODO: Polybar Stuff
+    siji
+    font-awesome
+    font-awesome_5
+    networkmanagerapplet
+
+    # TODO: i3 Stuff
+    gnome-terminal
+    rofi
+    i3status
+    i3lock
+    i3blocks
+    nemo-with-extensions
+    dunst
+    pinentry-qt
+    brightnessctl
+    shutter
+    pavucontrol
+    arandr
+    blueman
+    gparted
+    loupe
+    vlc
+    mpv
+    xorg.xkill
+
+    # Other Apps
+    chromium
+    qtpass
+    unstable.yt-dlp
+    unstable.openscad-unstable
+    sublime-merge
+    libreoffice
+    gthumb
+    ledger
+    sound-juicer
+  ];
+}