diff --git a/home/extra/default.nix b/home/extra/default.nix
deleted file mode 100644
index 9c3a4cdc..00000000
--- a/home/extra/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: {
-  imports = [
-    ./kitty
-    ./foot
-    ./firefox
-    ./neovim
-    ./mako
-  ];
-  config = {
-    home-manager.users.cnst = {pkgs, ...}: {
-      home.packages = with pkgs; [
-        # APPLICATIONS
-        alacritty
-        keepassxc
-        qbittorrent
-        ranger
-        webcord
-        calcurse
-        xfce.thunar
-
-        # UTILITY
-        wl-clipboard
-        xfce.thunar-volman
-        xfce.thunar-archive-plugin
-        gnome.file-roller
-        pamixer
-        pavucontrol
-        virt-manager
-        fastfetch
-        waybar
-        nwg-look
-        thefuck
-        gnome.adwaita-icon-theme
-
-        # NETWORK
-        wireguard-tools
-        networkmanagerapplet
-        wpa_supplicant
-
-        # SYSTEM
-        btop
-        htop
-      ];
-    };
-  };
-}
diff --git a/home/users/adam/home.nix b/home/users/adam/home.nix
index c3a158ab..9387ecec 100644
--- a/home/users/adam/home.nix
+++ b/home/users/adam/home.nix
@@ -9,19 +9,19 @@
 }: {
   # You can import other home-manager modules here
   imports = [
-    ../core/adam.nix
-    ../extra/adam.nix
+    ../../core/adam.nix
+    ../../extra/adam.nix
   ];
 
-  nixpkgs = {
-    # You can add overlays here
-    overlays = [];
-    # Configure your nixpkgs instance
-    config = {
-      # Disable if you don't want unfree packages
-      allowUnfree = true;
-      # Workaround for https://github.com/nix-community/home-manager/issues/2942
-      allowUnfreePredicate = _: true;
+  nix = {
+    package = lib.mkDefault pkgs.nix;
+    settings = {
+      experimental-features = [
+        "nix-command"
+        "flakes"
+        "ca-derivations"
+      ];
+      warn-dirty = false;
     };
   };
 
diff --git a/home/users/cnst/home.nix b/home/users/cnst/home.nix
index 8b5b82b2..d622a0ab 100644
--- a/home/users/cnst/home.nix
+++ b/home/users/cnst/home.nix
@@ -13,15 +13,15 @@
     ../../extra/cnst.nix
   ];
 
-  nixpkgs = {
-    # You can add overlays here
-    overlays = [];
-    # Configure your nixpkgs instance
-    config = {
-      # Disable if you don't want unfree packages
-      allowUnfree = true;
-      # Workaround for https://github.com/nix-community/home-manager/issues/2942
-      allowUnfreePredicate = _: true;
+  nix = {
+    package = lib.mkDefault pkgs.nix;
+    settings = {
+      experimental-features = [
+        "nix-command"
+        "flakes"
+        "ca-derivations"
+      ];
+      warn-dirty = false;
     };
   };