diff --git a/hosts/brontes/configuration.nix b/hosts/brontes/configuration.nix
new file mode 100644
index 0000000..1545ad1
--- /dev/null
+++ b/hosts/brontes/configuration.nix
@@ -0,0 +1,68 @@
+{
+
+}:
+{
+  config,
+  pkgs,
+  lib,
+  inputs,
+  system,
+  username,
+  hostname,
+  ...
+}:
+let
+  stateVersion = "23.11";
+  homeDirectory = "/home/${username}";
+in
+{
+  imports = [
+    # Include the results of the hardware scan.
+    ./hardware-configuration.nix
+    inputs.home-manager.nixosModules.home-manager
+    ../../modules
+  ];
+
+  programs = {
+    steam.enable = true;
+    fish.enable = true;
+    firefox.enable = true;
+    thunderbird.enable = true;
+  };
+
+  home-manager.users.${username} = {
+    imports = [
+      ../../home/firefox
+      ../../home/fish
+      ../../home/neovim
+      ../../home/thunderbird
+      ../../home/git
+    ];
+
+    programs.direnv = {
+      enable = true;
+      nix-direnv.enable = true;
+    };
+
+    home = {
+      inherit stateVersion;
+      inherit username;
+      inherit homeDirectory;
+    };
+  };
+
+  users = {
+    defaultUserShell = pkgs.fish;
+    users.${username} = {
+      isNormalUser = true;
+      createHome = true;
+      extraGroups = [
+        "networkmanager"
+        "wheel"
+        "audio"
+        "libvirtd"
+      ];
+      shell = pkgs.fish;
+    };
+  };
+}
diff --git a/hosts/marr/configuration.nix b/hosts/marr/configuration.nix
index 55afd70..77bac31 100644
--- a/hosts/marr/configuration.nix
+++ b/hosts/marr/configuration.nix
@@ -5,12 +5,12 @@
   lib,
   inputs,
   system,
+  username,
+  hostname,
   ...
 }:
 let
   stateVersion = "23.11";
-  username = "nico";
-  hostname = "marr";
   homeDirectory = "/home/${username}";
 in
 {
@@ -243,5 +243,5 @@ in
   # 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?
+  system.stateVersion = stateVersion; # Did you read the comment?
 }