diff --git a/configuration.nix b/configuration.nix
index 88ec3b0..f986fab 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -8,7 +8,8 @@
 {
   imports =
     [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
+      ./packages/default.nix
+      ./hosts/lappy/default.nix
     ];
 
   # Use the systemd-boot EFI boot loader.
@@ -26,27 +27,6 @@
   ];
 
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
-  nix = {
-  package = pkgs.nixFlakes;
-  extraOptions = ''
-    experimental-features = nix-command flakes
-  '';
-};
-
-  system.nixos.tags = [ "Nya_Beginnings" ];
-
-
-  networking.hostName = "stitchynyan"; # Define your hostname.
-  # Pick only one of the below networking options.
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-  networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
-
-  # Set your time zone.
-  time.timeZone = "America/Lost_Angeles";
-
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
 
   # Select internationalisation properties.
   # i18n.defaultLocale = "en_US.UTF-8";
@@ -59,67 +39,12 @@
   # Enable the X11 windowing system.
   services.xserver.enable = false;
 
-
-
-
-  # Configure keymap in X11
-  # services.xserver.layout = "us";
-  # services.xserver.xkbOptions = "eurosign:e,caps:escape";
-
   # Enable CUPS to print documents.
   services.printing.enable = true;
 
-
-  # Enable touchpad support (enabled default in most desktopManager).
-  # services.xserver.libinput.enable = true;
-
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-
-  environment.systemPackages = with pkgs; [
-    wget
-    librewolf
-    kitty
-    exa
-    hyprland
-    git
-    zoxide
-    nheko
-    gnupg
-    hyprpaper
-    xdg-desktop-portal-hyprland
-    dunst
-    pavucontrol
-    slurp
-    grim
-    wofi
-    brightnessctl
-    imv
-    qt5ct
-    qt6ct
-    neofetch
-    wl-clipboard
-    glib
-    dracula-theme
-    btop
-    swaylock-effects
-    vimPlugins.nvim-lspconfig
-    vimPlugins.nvim-cmp
-    vimPlugins.cmp-nvim-lsp
-    vimPlugins.luasnip
-    vimPlugins.cmp_luasnip
-    vimPlugins.tokyonight-nvim
-  ];
-
-  fonts.packages= with pkgs; [
-    noto-fonts
-    noto-fonts-emoji
-    liberation_ttf
-    nerdfonts
-  ];
-  
   programs.waybar.enable = true;
 
+  # Swaylock allow to unlock
   security.pam.services.swaylock = {};
   security.rtkit.enable = true;
   services.gnome.gnome-keyring.enable = true;
@@ -191,12 +116,6 @@
   # Or disable the firewall altogether.
   networking.firewall.enable = true;
 
-
-  # Copy the NixOS configuration file and link it from the resulting system
-  # (/run/current-system/configuration.nix). This is useful in case you
-  # accidentally delete configuration.nix.
-  # system.copySystemConfiguration = true;
-
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It's perfectly fine and recommended to leave
diff --git a/flake.nix b/flake.nix
index 278e247..247b0fd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,17 +3,32 @@
 
   inputs = {
     nixpkgs = {
-      url = "github:NixOS/nixpkgs/nixos-unstable"
+      url = "github:NixOS/nixpkgs/nixos-unstable";
     };
+    
+    home-manager-unstable = {
+      url = "github:nix-community/home-manager/master";
+        inputs.nixpkgs.follows = "nixpkgs-unstable";
+    };
+
+    hyprland.url = "github:hyprwm/Hyprland";
   };
 
-  outputs = { self, nixpkgs }: {
+  outputs = { 
+    self, 
+    nixpkgs,
+    home-manager-unstable,
+    hyprland
+  }: {
 
     nixosConfigurations = {
       stitchynyan = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux"
+        system = "x86_64-linux";
 	modules = [
 	  ./configuration.nix
+          home-manager-unstable.nixosModules.home-manager
+	  hyprland.homeManagerModules.default
+        {wayland.windowManager.hyprland.enable = true;}
 	];
       };
     }; 
diff --git a/hosts/default.nix b/hosts/default.nix
new file mode 100644
index 0000000..5258558
--- /dev/null
+++ b/hosts/default.nix
@@ -0,0 +1,9 @@
+
+{config, pkg, home-manager, ...}:
+
+{
+
+
+
+
+}
diff --git a/hosts/lappy/default.nix b/hosts/lappy/default.nix
new file mode 100644
index 0000000..70602fd
--- /dev/null
+++ b/hosts/lappy/default.nix
@@ -0,0 +1,22 @@
+
+
+{ config, pkgs, ... }:
+
+{
+
+  imports = [
+    ./hardware-configuration.nix
+  ];
+
+  system.nixos.tags = [ "Nya_Beginnings" ];
+
+  networking.hostName = "stitchynyan"; 
+  networking.networkmanager.enable = true; 
+  time.timeZone = "America/Lost_Angeles";
+
+
+
+
+
+
+}
diff --git a/hardware-configuration.nix b/hosts/lappy/hardware-configuration.nix
similarity index 55%
rename from hardware-configuration.nix
rename to hosts/lappy/hardware-configuration.nix
index 1f92a44..e4b52bd 100644
--- a/hardware-configuration.nix
+++ b/hosts/lappy/hardware-configuration.nix
@@ -1,6 +1,3 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
 { config, lib, pkgs, modulesPath, ... }:
 
 {
@@ -23,13 +20,6 @@
 
   swapDevices = [ ];
 
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp166s0.useDHCP = lib.mkDefault true;
-
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
diff --git a/packages/art.nix b/packages/art.nix
new file mode 100644
index 0000000..5e51933
--- /dev/null
+++ b/packages/art.nix
@@ -0,0 +1,15 @@
+
+{ pkgs }: {
+
+environment.systemPackages = with pkgs; [
+  blender 
+  krita
+  #armorpaint
+  gimp
+  inkscape
+  #prusa slicker
+];
+
+
+
+}
diff --git a/packages/default.nix b/packages/default.nix
new file mode 100644
index 0000000..6aff7c8
--- /dev/null
+++ b/packages/default.nix
@@ -0,0 +1,51 @@
+
+{pkgs}: {
+
+  import = [
+  ./art.nix
+  ./tools.nix
+  ];
+
+  environment.systemPackages = with pkgs; [
+    wget
+    librewolf
+    kitty
+    exa
+    hyprland
+    git
+    zoxide
+    nheko
+    gnupg
+    hyprpaper
+    xdg-desktop-portal-hyprland
+    dunst
+    pavucontrol
+    slurp
+    grim
+    wofi
+    brightnessctl
+    imv
+    qt5ct
+    qt6ct
+    neofetch
+    wl-clipboard
+    glib
+    dracula-theme
+    btop
+    swaylock-effects
+    vimPlugins.nvim-lspconfig
+    vimPlugins.nvim-cmp
+    vimPlugins.cmp-nvim-lsp
+    vimPlugins.luasnip
+    vimPlugins.cmp_luasnip
+    vimPlugins.tokyonight-nvim
+  ];
+
+  fonts.packages= with pkgs; [
+    noto-fonts
+    noto-fonts-emoji
+    liberation_ttf
+    nerdfonts
+  ];
+
+}