diff --git a/flake.lock b/flake.lock
deleted file mode 100644
index 8a0fd3d..0000000
--- a/flake.lock
+++ /dev/null
@@ -1,214 +0,0 @@
-{
-  "nodes": {
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1693208669,
-        "narHash": "sha256-hHFaaUsZ860wvppPeiu7nJn/nXZjJfnqAQEu9SPFE9I=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "5bac4a1c06cd77cf8fc35a658ccb035a6c50cd2c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "release-23.05",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "home-manager-unstable": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs-unstable"
-        ]
-      },
-      "locked": {
-        "lastModified": 1693859358,
-        "narHash": "sha256-r3Pak/ao3p8weTzR+Ry3qQrfRsmSOwWW5sAe73mrYKs=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "886ea1d213efd1082f419d066e89ef37635dc970",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "hyprland": {
-      "inputs": {
-        "hyprland-protocols": "hyprland-protocols",
-        "nixpkgs": "nixpkgs",
-        "systems": "systems",
-        "wlroots": "wlroots",
-        "xdph": "xdph"
-      },
-      "locked": {
-        "lastModified": 1693468538,
-        "narHash": "sha256-3kWvxxIlMwYqUg4txxBipH3CEQglLNGPjtQnpNeoHJY=",
-        "owner": "hyprwm",
-        "repo": "Hyprland",
-        "rev": "fc0c1896e097b3c3b2170ae69d38724e43960fe1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "Hyprland",
-        "type": "github"
-      }
-    },
-    "hyprland-protocols": {
-      "inputs": {
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1691753796,
-        "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=",
-        "owner": "hyprwm",
-        "repo": "hyprland-protocols",
-        "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprland-protocols",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1693158576,
-        "narHash": "sha256-aRTTXkYvhXosGx535iAFUaoFboUrZSYb1Ooih/auGp0=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a999c1cc0c9eb2095729d5aa03e0d8f7ed256780",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-unstable": {
-      "locked": {
-        "lastModified": 1693377291,
-        "narHash": "sha256-vYGY9bnqEeIncNarDZYhm6KdLKgXMS+HA2mTRaWEc80=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "e7f38be3775bab9659575f192ece011c033655f0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1693341273,
-        "narHash": "sha256-wrsPjsIx2767909MPGhSIOmkpGELM9eufqLQOPxmZQg=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "2ab91c8d65c00fd22a441c69bbf1bc9b420d5ea1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-23.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "home-manager": "home-manager",
-        "home-manager-unstable": "home-manager-unstable",
-        "hyprland": "hyprland",
-        "nixpkgs": "nixpkgs_2",
-        "nixpkgs-unstable": "nixpkgs-unstable"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
-    "wlroots": {
-      "flake": false,
-      "locked": {
-        "host": "gitlab.freedesktop.org",
-        "lastModified": 1692976565,
-        "narHash": "sha256-eBKkG7tMxg92NskEn8dHRFY245JwjirWRoOZzW6DnUw=",
-        "owner": "wlroots",
-        "repo": "wlroots",
-        "rev": "717ded9bb0191ea31bf4368be32e7a15fe1b8294",
-        "type": "gitlab"
-      },
-      "original": {
-        "host": "gitlab.freedesktop.org",
-        "owner": "wlroots",
-        "repo": "wlroots",
-        "rev": "717ded9bb0191ea31bf4368be32e7a15fe1b8294",
-        "type": "gitlab"
-      }
-    },
-    "xdph": {
-      "inputs": {
-        "hyprland-protocols": [
-          "hyprland",
-          "hyprland-protocols"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1691841170,
-        "narHash": "sha256-RCTm1/MVWYPnReMgyp7tr2ogGYo/pvw38jZaFwemgPU=",
-        "owner": "hyprwm",
-        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "57a3a41ba6b358109e4fc25c6a4706b5f7d93c6b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "xdg-desktop-portal-hyprland",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
diff --git a/home/desktop.nix b/home/desktop.nix
index f6bf5b5..e4c105f 100644
--- a/home/desktop.nix
+++ b/home/desktop.nix
@@ -12,14 +12,14 @@
     # inputs.nix-colors.homeManagerModules.default
 
     # You can also split up your configuration and import pieces of it here:
-    ./core
+    ./core.nix
     ../modules/home/hyprland
     ../modules/home/v2ray
-    ../modules/home/xdg
-    ../modules/home/theme
-    ../modules/home/fcitx
     ../modules/home/vscode
-    ../modules/home/develop
+    ../modules/home/xdg.nix
+    ../modules/home/theme.nix
+    ../modules/home/fcitx.nix
+    ../modules/home/develop.nix
   ];
 
   home = {
diff --git a/modules/nixos/core/default.nix b/modules/nixos/core/default.nix
index c45c928..762d36e 100644
--- a/modules/nixos/core/default.nix
+++ b/modules/nixos/core/default.nix
@@ -1,8 +1,8 @@
 { lib, ... }:
 {
   imports = [
-    ./boot
-    ./system
+    ./boot.nix
+    ./system.nix
   ];
 
   programs = {
diff --git a/profiles/apollo/default.nix b/profiles/apollo/default.nix
index ae491b2..f595cb1 100644
--- a/profiles/apollo/default.nix
+++ b/profiles/apollo/default.nix
@@ -16,11 +16,11 @@ in
     # ./users.nix
 
     # Import your generated (nixos-generate-config) hardware configuration
-    ./hardware-configuration
-    ./networking
+    ./hardware-configuration.nix
+    ./networking.nix
     "${self}/modules/nixos/core"
-    "${self}/modules/nixos/user"
-    "${self}/modules/nixos/sysatomic"
+    "${self}/modules/nixos/user.nix"
+    "${self}/modules/nixos/sysatomic.nix"
 
     home-manager.nixosModules.home-manager
     {
diff --git a/profiles/gaea/default.nix b/profiles/gaea/default.nix
index 35abb8b..c879d57 100644
--- a/profiles/gaea/default.nix
+++ b/profiles/gaea/default.nix
@@ -19,17 +19,16 @@ in
     ./hardware-configuration
     ./networking
     "${self}/modules/nixos/core"
-    "${self}/modules/nixos/sysatomic"
-    "${self}/modules/nixos/nvidia"
-    "${self}/modules/nixos/hyprland"
-    "${self}/modules/nixos/user"
-    "${self}/modules/nixos/samba"
-    "${self}/modules/nixos/zfs"
-    "${self}/modules/nixos/adb"
+    "${self}/modules/nixos/sysatomic.nix"
+    "${self}/modules/nixos/nvidia.nix"
+    "${self}/modules/nixos/hyprland.nix"
+    "${self}/modules/nixos/user.nix"
+    "${self}/modules/nixos/samba.nix"
+    "${self}/modules/nixos/zfs.nix"
+    "${self}/modules/nixos/adb.nix"
 
     "${self}/modules/nixos/virtualize/libvirtd"
-    "${self}/modules/nixos/virtualize/android"
-    "${self}/modules/nixos/virtualize/docker"
+    "${self}/modules/nixos/virtualize/docker.nix"
 
     "${self}/modules/nixos/fonts"
 
diff --git a/profiles/luna/default.nix b/profiles/luna/default.nix
index ae491b2..7f0bb5e 100644
--- a/profiles/luna/default.nix
+++ b/profiles/luna/default.nix
@@ -16,11 +16,10 @@ in
     # ./users.nix
 
     # Import your generated (nixos-generate-config) hardware configuration
-    ./hardware-configuration
-    ./networking
+    ./hardware-configuration.nix
+    ./networking.nix
     "${self}/modules/nixos/core"
-    "${self}/modules/nixos/user"
-    "${self}/modules/nixos/sysatomic"
+    "${self}/modules/nixos/user.nix"
 
     home-manager.nixosModules.home-manager
     {