diff --git a/README.md b/README.md
index 4dba095..1cd5b20 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,9 @@
 # dotfiles
+
 NixOS + Home Manager
 
 ## Pickup Software
+
 - Window Manager: Niri
 - Lancher: Vicinae
 - Bar: Noctalia
@@ -9,24 +11,29 @@ NixOS + Home Manager
 - Terminal: ghostty, oh-my-zsh
 
 ## Directory Structure
+
 - hosts/{host-name}<br/>
-    Hardware-specific configurations that abstract differences between hardware. Keep these minimal. Add new configurations when running NixOS on new hardware without existing support.
-    - default.nix<br/>
-        Moved from `/etc/nixos/configuration.nix`
-    - hardware-configuration.nix<br/>
-        Run `sudo nixos-generate-config` or moved from `/etc/nixos/hardware-configuration.nix`
-    - variables.nix<br/>
-        Config
+  Hardware-specific configurations that abstract differences between hardware. Keep these minimal. Add new configurations when running NixOS on new hardware without existing support.
+  - default.nix<br/>
+    Moved from `/etc/nixos/configuration.nix`
+  - hardware-configuration.nix<br/>
+    Run `sudo nixos-generate-config` or moved from `/etc/nixos/hardware-configuration.nix`
+  - variables.nix<br/>
+    Config
 - images
 - modules
-    - core<br/>
-        Files related to NixOS configuration
-    - drivers<br/>
-        Files related to drivers such as GPUs
-    - home<br/>
-        Home-manager configuration files
+  - core<br/>
+    Files related to NixOS configuration
+  - drivers<br/>
+    Files related to drivers such as GPUs
+  - home<br/>
+    Home-manager configuration files
 - profiles<br/>
-    Build configurations for each environment by combining NixOS configurations and home-manager configurations.
+  Build configurations for each environment by combining NixOS configurations and home-manager configurations.
 - shells<br/>
-        Shell environment.
-- wallpapers
\ No newline at end of file
+  Shell environment.
+- wallpapers
+
+## Inspired
+
+- [Zaney/zaneyos](https://gitlab.com/Zaney/zaneyos)
diff --git a/flake.lock b/flake.lock
index 28984d4..42571ec 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,7 +20,9 @@
     },
     "home-manager": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1758463745,
@@ -37,21 +39,6 @@
         "type": "github"
       }
     },
-    "impermanence": {
-      "locked": {
-        "lastModified": 1737831083,
-        "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=",
-        "owner": "nix-community",
-        "repo": "impermanence",
-        "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "impermanence",
-        "type": "github"
-      }
-    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1760958188,
@@ -101,38 +88,6 @@
       }
     },
     "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1761173472,
-        "narHash": "sha256-m9W0dYXflzeGgKNravKJvTMR4Qqa2MVD11AwlGMufeE=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "c8aa8cc00a5cb57fada0851a038d35c08a36a2bb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-25.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1760596604,
-        "narHash": "sha256-J/i5K6AAz/y5dBePHQOuzC7MbhyTOKsd/GLezSbEFiM=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "3cbe716e2346710d6e1f7c559363d14e11c32a43",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
       "locked": {
         "lastModified": 1759036355,
         "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=",
@@ -151,32 +106,12 @@
     "root": {
       "inputs": {
         "home-manager": "home-manager",
-        "impermanence": "impermanence",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable",
-        "sops-nix": "sops-nix",
         "vicinae": "vicinae"
       }
     },
-    "sops-nix": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_3"
-      },
-      "locked": {
-        "lastModified": 1760998189,
-        "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=",
-        "owner": "Mic92",
-        "repo": "sops-nix",
-        "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Mic92",
-        "repo": "sops-nix",
-        "type": "github"
-      }
-    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
@@ -195,7 +130,7 @@
     "vicinae": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
         "lastModified": 1761455154,
diff --git a/flake.nix b/flake.nix
index 0bdd297..ef71311 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,6 +25,7 @@
                 };
                 modules = [
                     ./profiles/${profile}.nix
+                    ./hosts/${host}
                 ] ++ extraModules;
             };
     in {
diff --git a/hosts/x1g9/default.nix b/hosts/x1g9/default.nix
index 9826e43..907e285 100644
--- a/hosts/x1g9/default.nix
+++ b/hosts/x1g9/default.nix
@@ -7,7 +7,7 @@
 {
   imports =
     [
-      ./hardware-configuration.nix
       inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x1-9th-gen
+      ./hardware-configuration.nix
     ];
 }
diff --git a/hosts/x1g9/hardware-configuration.nix b/hosts/x1g9/hardware-configuration.nix
index 5674165..b172de5 100644
--- a/hosts/x1g9/hardware-configuration.nix
+++ b/hosts/x1g9/hardware-configuration.nix
@@ -8,7 +8,7 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
diff --git a/modules/core/hardware.nix b/modules/core/hardware.nix
index a33e5da..b5a337c 100644
--- a/modules/core/hardware.nix
+++ b/modules/core/hardware.nix
@@ -12,5 +12,4 @@
     bluetooth.enable = true;
     bluetooth.powerOnBoot = true;
   };
-  local.hardware-clock.enable = false;
 }
diff --git a/modules/core/i18n.nix b/modules/core/i18n.nix
index 7d01739..45bdfb1 100644
--- a/modules/core/i18n.nix
+++ b/modules/core/i18n.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ pkgs, ... }:
 {
   i18n.inputMethod = {
       enable = true;
@@ -26,7 +26,7 @@
                 Name = "mozc";
                 Layout = "";
             };
-          }
+          };
       };
   };
 }
\ No newline at end of file
diff --git a/modules/core/packages.nix b/modules/core/packages.nix
index 8bee79f..55f13d1 100644
--- a/modules/core/packages.nix
+++ b/modules/core/packages.nix
@@ -16,7 +16,7 @@
     };
     zsh = {
       enable = true; 
-    }
+    };
   };
 
   nixpkgs.config.allowUnfree = true;
@@ -31,7 +31,6 @@
     curl # Tool For Fetching Files With Links
     alacritty # A GPU Accelerated Terminal Emulator
     fuzzel # A Simple And Lightweight Application Launcher
-    msedit # A Simple Text Editor Inspired By Windows Notepad
     git # Version Control System
   ];
 }
diff --git a/modules/core/user.nix b/modules/core/user.nix
index 595c015..a233c47 100644
--- a/modules/core/user.nix
+++ b/modules/core/user.nix
@@ -2,7 +2,6 @@
 {
   imports = [ inputs.home-manager.nixosModules.home-manager ];
   home-manager = {
-    enable = true;
     useUserPackages = true;
     useGlobalPkgs = false;
     backupFileExtension = "backup";