diff --git a/flake.nix b/flake.nix
index 7a6e0f7c..012d81ff 100644
--- a/flake.nix
+++ b/flake.nix
@@ -90,6 +90,31 @@
           }
         ];
       };
+
+      # Ryzen 5 2600 with 16GB RAM, RX 6700.
+      mauville = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          ./hosts/mauville
+          ./system
+          ./users/aly
+          ./desktop/gnome
+          ./modules/podman
+          ./modules/steam
+          ./modules/via-qmk
+          ./modules/logitech
+
+          # Add managed flatpak module.
+          nix-flatpak.nixosModules.nix-flatpak
+
+          # Add home-manager nixos module so home-manager config deploys on nixos-rebuild.
+          home-manager.nixosModules.home-manager {
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+            home-manager.users.aly = import ./home/aly;
+          }
+        ];
+      };
     };
 
     defaultPackage.x86_64-linux = home-manager.defaultPackage.x86_64-linux;
diff --git a/hosts/mauville/default.nix b/hosts/mauville/default.nix
new file mode 100644
index 00000000..899399df
--- /dev/null
+++ b/hosts/mauville/default.nix
@@ -0,0 +1,27 @@
+# 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, ... }:
+
+{
+  imports =
+    [ # Include the results of the hardware scan.
+      ./hardware-configuration.nix
+    ];
+
+
+  # Bootloader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  networking.hostName = "mauville"; # Define your hostname.
+
+  # 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
+  # this value at the release version of the first install of this system.
+  # 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 = "23.11"; # Did you read the comment?
+}
diff --git a/hosts/mauville/hardware-configuration.nix b/hosts/mauville/hardware-configuration.nix
new file mode 100644
index 00000000..a2498ee9
--- /dev/null
+++ b/hosts/mauville/hardware-configuration.nix
@@ -0,0 +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 + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/ed744c02-8854-4f1a-8e75-ed15f02775e3";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/37BB-86B6";
+      fsType = "vfat";
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/7a33dbc2-73f7-490b-9aa6-382e119a997e"; }
+    ];
+
+  # 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.wlp0s20f3.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}