diff --git a/nix/flake.nix b/nix/flake.nix
index 643be04..08dd353 100644
--- a/nix/flake.nix
+++ b/nix/flake.nix
@@ -10,20 +10,25 @@
     };
   };
 
-  outputs = { self, nixpkgs, ... }@inputs: {
-    formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra;
-    nixosConfigurations.default = nixpkgs.lib.nixosSystem {
-      specialArgs = {inherit inputs;};
-      modules = [
-        ./hosts/default/configuration.nix
-        inputs.home-manager.nixosModules.default
-      ];
-    nixosConfigurations.boxes_vm = nixpkgs.lib.nixosSystem {
-      specialArgs = {inherit inputs;};
-      modules = [
-        ./hosts/boxes_vm/configuration.nix
-        inputs.home-manager.nixosModules.default
-      ];
+  outputs = {
+    self,
+    nixpkgs,
+    ...
+  } @ inputs: {
+    formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt;
+    nixosConfigurations = {
+      default = nixpkgs.lib.nixosSystem {
+        specialArgs = {inherit inputs;};
+        modules = [
+          ./hosts/default/configuration.nix
+        ];
+      };
+      boxes_vm = nixpkgs.lib.nixosSystem {
+        specialArgs = {inherit inputs;};
+        modules = [
+          ./hosts/boxes_vm/configuration.nix
+        ];
+      };
     };
   };
 }
diff --git a/nix/hosts/boxes_vm/configuration.nix b/nix/hosts/boxes_vm/configuration.nix
index 24e700c..8c8c2dc 100644
--- a/nix/hosts/boxes_vm/configuration.nix
+++ b/nix/hosts/boxes_vm/configuration.nix
@@ -1,107 +1,23 @@
 # Edit this configuration file to define what should be installed on
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
-
-{ config, pkgs, inputs, ... }:
-
 {
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-    ];
+  pkgs,
+  inputs,
+  ...
+}: {
+  imports = [
+    inputs.home-manager.nixosModules.home-manager
+    ../../modules/system.nix
+    ./hardware-configuration.nix
+  ];
 
-  # Bootloader.
-  boot.loader.grub.enable = true;
-  boot.loader.grub.device = "/dev/vda";
-  boot.loader.grub.useOSProber = true;
-
-  nix.settings.experimental-features = [ "nix-command" "flakes"];
-
-  networking.hostName = "nixos-vm"; # Define your hostname.
-
-  # Enable networking
-  networking.networkmanager.enable = true;
-
-  # Set your time zone.
-  time.timeZone = "America/Santiago";
-
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.UTF-8";
-
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "es_CL.UTF-8";
-    LC_IDENTIFICATION = "es_CL.UTF-8";
-    LC_MEASUREMENT = "es_CL.UTF-8";
-    LC_MONETARY = "es_CL.UTF-8";
-    LC_NAME = "es_CL.UTF-8";
-    LC_NUMERIC = "es_CL.UTF-8";
-    LC_PAPER = "es_CL.UTF-8";
-    LC_TELEPHONE = "es_CL.UTF-8";
-    LC_TIME = "es_CL.UTF-8";
-  };
-
-  # Enable the X11 windowing system.
-  services.xserver.enable = true;
-
-  # Enable the GNOME Desktop Environment.
-  services.xserver.displayManager.gdm.enable = true;
-  services.xserver.desktopManager.gnome.enable = true;
-
-  # Configure keymap in X11
-  services.xserver.xkb = {
-    layout = "latam";
-    variant = "";
-  };
-
-  # Configure console keymap
-  console.keyMap = "la-latin1";
-
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
-
-  # Enable sound with pipewire.
-  hardware.pulseaudio.enable = false;
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    # If you want to use JACK applications, uncomment this
-    #jack.enable = true;
-
-    # use the example session manager (no others are packaged yet so this is enabled by default,
-    # no need to redefine it in your config for now)
-    #media-session.enable = true;
-  };
-
-  # Enable touchpad support (enabled default in most desktopManager).
-  # services.xserver.libinput.enable = true;
-
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.aleidk = {
-    isNormalUser = true;
-    description = "aleidk";
-    extraGroups = [ "networkmanager" "wheel" ];
-    packages = with pkgs; [
-    #  thunderbird
-    ];
-  };
+  networking.hostName = "boxes_vm";
 
   # Install firefox.
   programs.firefox.enable = true;
 
-  # Allow unfree packages
-  nixpkgs.config.allowUnfree = true;
-
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  environment.systemPackages = with pkgs; [
-
-     neovim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-     spice-vdagent
-  #  wget
-  ];
+  environment.systemPackages = with pkgs; [];
 
   home-manager = {
     extraSpecialArgs = {inherit inputs;};
@@ -110,25 +26,42 @@
     };
   };
 
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  # programs.gnupg.agent = {
-  #   enable = true;
-  #   enableSSHSupport = true;
-  # };
+  services = {
+    xserver = {
+      enable = true;
 
-  # List services that you want to enable:
+      displayManager.gdm.enable = true;
+      desktopManager.gnome.enable = true;
+    };
 
-  # Enable the OpenSSH daemon.
-  # services.openssh.enable = true;
-  services.spice-webdavd.enable = true;
+    printing.enable = true;
+    spice-webdavd.enable = true;
 
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
+    pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+      #jack.enable = true;
+
+      # use the example session manager (no others are packaged yet so this is enabled by default,
+      # no need to redefine it in your config for now)
+      #media-session.enable = true;
+    };
+  };
+
+  hardware.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+
+  # Enable networking
+  networking.networkmanager.enable = true;
+
+  # Bootloader.
+  boot.loader.grub = {
+    enable = true;
+    device = "/dev/vda";
+    useOSProber = true;
+  };
 
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
@@ -137,5 +70,4 @@
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "24.05"; # Did you read the comment?
-
 }
diff --git a/nix/hosts/boxes_vm/hardware-configuration.nix b/nix/hosts/boxes_vm/hardware-configuration.nix
index da427f3..a0a513c 100644
--- a/nix/hosts/boxes_vm/hardware-configuration.nix
+++ b/nix/hosts/boxes_vm/hardware-configuration.nix
@@ -1,35 +1,37 @@
 # 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, ... }:
-
 {
-  imports =
-    [ (modulesPath + "/profiles/qemu-guest.nix")
-    ];
+  lib,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/profiles/qemu-guest.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
+  boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk"];
+  boot.initrd.kernelModules = [];
+  boot.kernelModules = ["kvm-intel"];
+  boot.extraModulePackages = [];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/b965b6e5-c21c-4b8b-995a-0512c0cec6b1";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/c6adf172-570c-404e-8a82-51670cac168e";
+    fsType = "ext4";
+  };
 
-    services.davfs2 = {
+  services.davfs2 = {
     enable = true;
     settings.globalSection.ask_auth = false;
-};
+  };
 
-fileSystems."/home/aleidk/host" =
-    { device = "http://localhost:9843/Host";
-      fsType = "davfs";
-      options = [ "nofail" "x-gvfs-show" "uid=1000" "gid=1000" ];
-    };
+  fileSystems."/home/aleidk/host" = {
+    device = "http://localhost:9843/Host";
+    fsType = "davfs";
+    options = ["nofail" "x-gvfs-show" "uid=1000" "gid=1000"];
+  };
 
-  swapDevices = [ ];
+  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
diff --git a/nix/hosts/boxes_vm/home.nix b/nix/hosts/boxes_vm/home.nix
index 72f24ea..6d04d86 100644
--- a/nix/hosts/boxes_vm/home.nix
+++ b/nix/hosts/boxes_vm/home.nix
@@ -1,6 +1,8 @@
-{ config, pkgs, ... }:
-
 {
+  config,
+  pkgs,
+  ...
+}: {
   # Home Manager needs a bit of information about you and the paths it should
   # manage.
   home.username = "aleidk";
@@ -34,7 +36,6 @@
     # (pkgs.writeShellScriptBin "my-hello" ''
     #   echo "Hello, ${config.home.username}!"
     # '')
-    pkgs.git
   ];
 
   # Home Manager is pretty good at managing dotfiles. The primary way to manage
diff --git a/nix/hosts/default/configuration.nix b/nix/hosts/default/configuration.nix
index b0a88eb..5717183 100644
--- a/nix/hosts/default/configuration.nix
+++ b/nix/hosts/default/configuration.nix
@@ -1,53 +1,77 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-
-{ config, pkgs, inputs, ... }:
-
 {
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-    ];
+  lib,
+  config,
+  pkgs,
+  inputs,
+  ...
+}: {
+  # ╭──────────────────────────────────────────────────────────╮
+  # │                      System Config                       │
+  # ╰──────────────────────────────────────────────────────────╯
 
-  # Bootloader.
-  boot.loader.grub.enable = true;
-  boot.loader.grub.device = "/dev/vda";
-  boot.loader.grub.useOSProber = true;
+  # Allow unfree packages
+  nixpkgs.config.allowUnfree = lib.mkDefault true;
 
-  nix.settings.experimental-features = [ "nix-command" "flakes"];
+  environment.systemPackages = with pkgs; [
+    git
+    curl
+    neovim
+  ];
 
-  networking.hostName = "nixos"; # Define your hostname.
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+  # Define a user account. Don't forget to set a password with ‘passwd’.
+  users.users = lib.mkDefault {
+    aleidk = {
+      isNormalUser = true;
+      description = "aleidk";
+      extraGroups = ["networkmanager" "wheel"];
+      packages = with pkgs; [];
+    };
+  };
 
-  # Enable networking
-  networking.networkmanager.enable = true;
+  # Limit the number of generations to keep
+  boot.loader.systemd-boot.configurationLimit = lib.mkDefault 10;
+
+  # Perform garbage collection weekly to maintain low disk usage
+  nix.gc = lib.mkDefault {
+    automatic = true;
+    dates = "weekly";
+    options = "--delete-older-than 4w";
+  };
+
+  nix.settings = {
+    experimental-features = ["nix-command" "flakes"];
+
+    # Optimize storage
+    # You can also manually optimize the store via:
+    #    nix-store --optimise
+    # Refer to the following link for more details:
+    # https://nixos.org/manual/nix/stable/command-ref/conf-file.html#conf-auto-optimise-store
+    auto-optimise-store = lib.mkDefault true;
+  };
+
+  # ╭──────────────────────────────────────────────────────────╮
+  # │                     Locale Settings                      │
+  # ╰──────────────────────────────────────────────────────────╯
 
   # Set your time zone.
   time.timeZone = "America/Santiago";
 
   # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.UTF-8";
-
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "es_CL.UTF-8";
-    LC_IDENTIFICATION = "es_CL.UTF-8";
-    LC_MEASUREMENT = "es_CL.UTF-8";
-    LC_MONETARY = "es_CL.UTF-8";
-    LC_NAME = "es_CL.UTF-8";
-    LC_NUMERIC = "es_CL.UTF-8";
-    LC_PAPER = "es_CL.UTF-8";
-    LC_TELEPHONE = "es_CL.UTF-8";
-    LC_TIME = "es_CL.UTF-8";
+  i18n = {
+    defaultLocale = "en_US.UTF-8";
+    extraLocaleSettings = {
+      LC_ADDRESS = "es_CL.UTF-8";
+      LC_IDENTIFICATION = "es_CL.UTF-8";
+      LC_MEASUREMENT = "es_CL.UTF-8";
+      LC_MONETARY = "es_CL.UTF-8";
+      LC_NAME = "es_CL.UTF-8";
+      LC_NUMERIC = "es_CL.UTF-8";
+      LC_PAPER = "es_CL.UTF-8";
+      LC_TELEPHONE = "es_CL.UTF-8";
+      LC_TIME = "es_CL.UTF-8";
+    };
   };
 
-  # Enable the X11 windowing system.
-  services.xserver.enable = true;
-
-  # Enable the GNOME Desktop Environment.
-  services.xserver.displayManager.gdm.enable = true;
-  services.xserver.desktopManager.gnome.enable = true;
-
   # Configure keymap in X11
   services.xserver.xkb = {
     layout = "latam";
@@ -57,79 +81,6 @@
   # Configure console keymap
   console.keyMap = "la-latin1";
 
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
-
-  # Enable sound with pipewire.
-  hardware.pulseaudio.enable = false;
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    # If you want to use JACK applications, uncomment this
-    #jack.enable = true;
-
-    # use the example session manager (no others are packaged yet so this is enabled by default,
-    # no need to redefine it in your config for now)
-    #media-session.enable = true;
-  };
-
-  # Enable touchpad support (enabled default in most desktopManager).
-  # services.xserver.libinput.enable = true;
-
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.aleidk = {
-    isNormalUser = true;
-    description = "aleidk";
-    extraGroups = [ "networkmanager" "wheel" ];
-    packages = with pkgs; [
-    #  thunderbird
-    ];
-  };
-
-  # Install firefox.
-  programs.firefox.enable = true;
-
-  # Allow unfree packages
-  nixpkgs.config.allowUnfree = true;
-
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  environment.systemPackages = with pkgs; [
-     neovim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-     spice-vdagent
-  #  wget
-  ];
-
-  home-manager = {
-    extraSpecialArgs = {inherit inputs;};
-    users = {
-      "aleidk" = import ./home.nix;
-    };
-  };
-
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  # programs.gnupg.agent = {
-  #   enable = true;
-  #   enableSSHSupport = true;
-  # };
-
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
-  # services.openssh.enable = true;
-  services.spice-webdavd.enable = true;
-
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
   # 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
@@ -137,5 +88,4 @@
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "24.05"; # Did you read the comment?
-
 }
diff --git a/nix/hosts/default/hardware-configuration.nix b/nix/hosts/default/hardware-configuration.nix
index 3f1f444..a55ab85 100644
--- a/nix/hosts/default/hardware-configuration.nix
+++ b/nix/hosts/default/hardware-configuration.nix
@@ -1,35 +1,39 @@
 # 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, ... }:
-
 {
-  imports =
-    [ (modulesPath + "/profiles/qemu-guest.nix")
-    ];
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/profiles/qemu-guest.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
+  boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk"];
+  boot.initrd.kernelModules = [];
+  boot.kernelModules = ["kvm-intel"];
+  boot.extraModulePackages = [];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/b965b6e5-c21c-4b8b-995a-0512c0cec6b1";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/b965b6e5-c21c-4b8b-995a-0512c0cec6b1";
+    fsType = "ext4";
+  };
 
-    services.davfs2 = {
+  services.davfs2 = {
     enable = true;
     settings.globalSection.ask_auth = false;
-};
+  };
 
-fileSystems."/home/aleidk/host" = 
-    { device = "http://localhost:9843/Host";
-      fsType = "davfs";
-      options = [ "nofail" ];
-    };
+  fileSystems."/home/aleidk/host" = {
+    device = "http://localhost:9843/Host";
+    fsType = "davfs";
+    options = ["nofail"];
+  };
 
-  swapDevices = [ ];
+  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
diff --git a/nix/hosts/default/home.nix b/nix/hosts/default/home.nix
index 72f24ea..420c489 100644
--- a/nix/hosts/default/home.nix
+++ b/nix/hosts/default/home.nix
@@ -1,6 +1,8 @@
-{ config, pkgs, ... }:
-
 {
+  config,
+  pkgs,
+  ...
+}: {
   # Home Manager needs a bit of information about you and the paths it should
   # manage.
   home.username = "aleidk";
diff --git a/nix/modules/system.nix b/nix/modules/system.nix
new file mode 100644
index 0000000..0e070a9
--- /dev/null
+++ b/nix/modules/system.nix
@@ -0,0 +1,81 @@
+{
+  lib,
+  pkgs,
+  ...
+}: {
+  # ╭──────────────────────────────────────────────────────────╮
+  # │                      System Config                       │
+  # ╰──────────────────────────────────────────────────────────╯
+
+  # Allow unfree packages
+  nixpkgs.config.allowUnfree = lib.mkDefault true;
+
+  environment.systemPackages = with pkgs; [
+    git
+    curl
+    neovim
+  ];
+
+  # Define a user account. Don't forget to set a password with ‘passwd’.
+  users.users = lib.mkDefault {
+    aleidk = {
+      isNormalUser = true;
+      description = "aleidk";
+      extraGroups = ["networkmanager" "wheel"];
+      packages = with pkgs; [];
+    };
+  };
+
+  # Limit the number of generations to keep
+  boot.loader.systemd-boot.configurationLimit = lib.mkDefault 10;
+
+  # Perform garbage collection weekly to maintain low disk usage
+  nix.gc = lib.mkDefault {
+    automatic = true;
+    dates = "weekly";
+    options = "--delete-older-than 4w";
+  };
+
+  nix.settings = {
+    experimental-features = ["nix-command" "flakes"];
+
+    # Optimize storage
+    # You can also manually optimize the store via:
+    #    nix-store --optimise
+    # Refer to the following link for more details:
+    # https://nixos.org/manual/nix/stable/command-ref/conf-file.html#conf-auto-optimise-store
+    auto-optimise-store = lib.mkDefault true;
+  };
+
+  # ╭──────────────────────────────────────────────────────────╮
+  # │                     Locale Settings                      │
+  # ╰──────────────────────────────────────────────────────────╯
+
+  # Set your time zone.
+  time.timeZone = "America/Santiago";
+
+  # Select internationalisation properties.
+  i18n = {
+    defaultLocale = "en_US.UTF-8";
+    extraLocaleSettings = {
+      LC_ADDRESS = "es_CL.UTF-8";
+      LC_IDENTIFICATION = "es_CL.UTF-8";
+      LC_MEASUREMENT = "es_CL.UTF-8";
+      LC_MONETARY = "es_CL.UTF-8";
+      LC_NAME = "es_CL.UTF-8";
+      LC_NUMERIC = "es_CL.UTF-8";
+      LC_PAPER = "es_CL.UTF-8";
+      LC_TELEPHONE = "es_CL.UTF-8";
+      LC_TIME = "es_CL.UTF-8";
+    };
+  };
+
+  # Configure keymap in X11
+  services.xserver.xkb = {
+    layout = "latam";
+    variant = "";
+  };
+
+  # Configure console keymap
+  console.keyMap = "la-latin1";
+}