Split configuration.nix and home.nix into per-domain modules

Break the two monolithic files into focused modules under system/
and home/ so each concern (boot, networking, xserver, picom, zsh,
git, rofi, etc.) lives in its own file. Clean up duplicates: drop
rofi from home.packages since programs.rofi.enable already installs
it, and move user-only apps (alacritty, obsidian, claude-code) from
environment.systemPackages to home.packages. Remove commented-out
boilerplate carried over from the install template.

configuration.nix

@@ -1,121 +1,21 @@
-{ config, lib, pkgs, ... }:
+{ ... }:
 
 {
-  imports =
+  imports = [
-    [ # Include the results of the hardware scan.
+    ./hardware-configuration.nix
-      ./hardware-configuration.nix
+    ./system/boot.nix
-    ];
+    ./system/networking.nix
-
+    ./system/locale.nix
-  # Use the systemd-boot EFI boot loader.
+    ./system/xserver.nix
-  boot.loader.systemd-boot.enable = true;
+    ./system/picom.nix
-  boot.loader.efi.canTouchEfiVariables = true;
+    ./system/display-manager.nix
-
+    ./system/fonts.nix
-  networking.hostName = "hivebrain"; # Define your hostname.
+    ./system/users.nix
-
+    ./system/programs.nix
-  # Configure network connections interactively with nmcli or nmtui.
+    ./system/packages.nix
-  networking.networkmanager.enable = true;
+    ./system/ssh.nix
-
+    ./system/nix.nix
-  # Set your time zone.
-  time.timeZone = "Europe/Berlin";
-
-  # Select internationalisation properties.
-  # i18n.defaultLocale = "en_US.UTF-8";
-  # console = {
-  #   font = "Lat2-Terminus16";
-  #   keyMap = "de";
-  #   useXkbConfig = true; # use xkb.options in tty.
-  # };
-
-  # Enable the X11 windowing system.
-  # services.xserver.enable = true;
-
-  services.xserver = {
-    enable = true;
-    autoRepeatDelay = 200;
-    autoRepeatInterval = 35;
-    windowManager.qtile.enable = true;
-    displayManager.sessionCommands = ''
-      xwallpaper --zoom ~/nixos-dotfiles/Pictures/NixOsWallpaper.png
-    '';
-    xrandrHeads = [
-      {
-        output = "HDMI-1";
-        monitorConfig = ''
-          Option "Position" "0 0"
-        '';
-      }
-      {
-        output = "DP-1";
-        primary = true;
-        monitorConfig = ''
-          Option "Position" "1920 0"
-        '';
-      }
-    ];
-  };
-
-  services.displayManager.ly.enable = true;
-
-  services.picom = {
-    enable = true;
-    backend = "xrender";
-    fade = true;
-  };
-
-  fonts.packages = with pkgs; [
-    jetbrains-mono
   ];
 
-  # Enable sound.
-  # services.pulseaudio.enable = true;
-  # OR
-  # services.pipewire = {
-  #   enable = true;
-  #   pulse.enable = true;
-  # };
-
-  nixpkgs.config.allowUnfree = true;
-
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.marvin = {
-    isNormalUser = true;
-    extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
-    shell = pkgs.zsh;
-    packages = with pkgs; [
-      tree
-    ];
-  };
-
-  programs.firefox.enable = true;
-  programs.zsh.enable = true;
-
-  # List packages installed in system profile.
-  # You can use https://search.nixos.org/ to find more packages (and options).
-  environment.systemPackages = with pkgs; [
-    vim 
-    wget
-    alacritty
-    btop
-    obsidian
-    claude-code
-    jq          # used by the Claude vault bootstrap.sh to parse settings.json
-  ];
-
-  nix.settings.experimental-features = ["nix-command" "flakes"];
-
-  # 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;
-  
   system.stateVersion = "26.05";
 }
-

home.nix

@@ -1,76 +1,17 @@
-{ config, pkgs, lib, ... }:
+{ ... }:
 
 {
-	home.username = "marvin";
+  imports = [
-	home.homeDirectory = "/home/marvin";
+    ./home/zsh.nix
-	home.stateVersion = "26.05";
+    ./home/git.nix
-	programs = {
+    ./home/rofi.nix
-    yazi.enable = true;
+    ./home/yazi.nix
+    ./home/packages.nix
+    ./home/symlinks.nix
+    ./home/fonts.nix
+  ];
 
-		git = {
+  home.username = "marvin";
-      enable = true;
+  home.homeDirectory = "/home/marvin";
-      settings.user = {
+  home.stateVersion = "26.05";
-        name = "MDietermann";
-        email = "marvin.dietermann@hive-brain.de";
-      };
-    };
-
-    rofi = {
-      enable = true;
-      theme = "arthur";
-      font = "sans-serif";
-      package = pkgs.rofi;
-      modes = [
-        "drun"
-        "run"
-        "window"
-        "ssh"
-      ];
-      extraConfig = {
-        show-icons = true;
-      };
-    };
-
-		zsh = {
-			enable = true;
-      enableCompletion = true;
-      autosuggestion.enable = true;
-      syntaxHighlighting.enable = true;
-
-      history.size = 10000;
-      history.ignoreAllDups = true;
-      history.path = "$HOME/.zsh_history";
-
-      oh-my-zsh = {
-        enable = true;
-        plugins = [ "git" "sudo" ];
-        theme = "aussiegeek";
-      };
-
-			shellAliases = {
-				btw = "echo I use NixOS";
-        reload-nixos = "sudo nixos-rebuild switch --flake ~/nixos-dotfiles#hivebrain";
-			};
-		};
-	};
-
-	home.file = lib.mapAttrs'
-		(name: _: lib.nameValuePair ".config/${name}" {
-			source = config.lib.file.mkOutOfStoreSymlink
-				"${config.home.homeDirectory}/nixos-dotfiles/config/${name}";
-		})
-		(lib.filterAttrs (_: type: type == "directory") (builtins.readDir ./config));
-
-	home.packages = with pkgs; [
-		neovim
-		ripgrep
-		nil
-		nixpkgs-fmt
-		nodejs
-		gcc
-    rofi
-    xwallpaper
-    steam
-    unzip
-	];
 }

home/fonts.nix

@@ -0,0 +1,5 @@
+{ ... }:
+
+{
+  fonts.fontconfig.enable = true;
+}

home/git.nix

@@ -0,0 +1,11 @@
+{ ... }:
+
+{
+  programs.git = {
+    enable = true;
+    settings.user = {
+      name = "MDietermann";
+      email = "marvin.dietermann@hive-brain.de";
+    };
+  };
+}

home/packages.nix

@@ -0,0 +1,21 @@
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    alacritty
+    claude-code
+    gcc
+    lua-language-server
+    neovim
+    nerd-fonts.jetbrains-mono
+    nil
+    nixpkgs-fmt
+    nodejs
+    obsidian
+    ripgrep
+    rustup
+    steam
+    unzip
+    xwallpaper
+  ];
+}

home/rofi.nix

@@ -0,0 +1,19 @@
+{ pkgs, ... }:
+
+{
+  programs.rofi = {
+    enable = true;
+    theme = "arthur";
+    font = "sans-serif";
+    package = pkgs.rofi;
+    modes = [
+      "drun"
+      "run"
+      "window"
+      "ssh"
+    ];
+    extraConfig = {
+      show-icons = true;
+    };
+  };
+}

home/symlinks.nix

@@ -0,0 +1,10 @@
+{ config, lib, ... }:
+
+{
+  home.file = lib.mapAttrs'
+    (name: _: lib.nameValuePair ".config/${name}" {
+      source = config.lib.file.mkOutOfStoreSymlink
+        "${config.home.homeDirectory}/nixos-dotfiles/config/${name}";
+    })
+    (lib.filterAttrs (_: type: type == "directory") (builtins.readDir ../config));
+}

home/yazi.nix

@@ -0,0 +1,5 @@
+{ ... }:
+
+{
+  programs.yazi.enable = true;
+}

home/zsh.nix

@@ -0,0 +1,25 @@
+{ ... }:
+
+{
+  programs.zsh = {
+    enable = true;
+    enableCompletion = true;
+    autosuggestion.enable = true;
+    syntaxHighlighting.enable = true;
+
+    history.size = 10000;
+    history.ignoreAllDups = true;
+    history.path = "$HOME/.zsh_history";
+
+    oh-my-zsh = {
+      enable = true;
+      plugins = [ "git" "sudo" ];
+      theme = "aussiegeek";
+    };
+
+    shellAliases = {
+      btw = "echo I use NixOS";
+      reload-nixos = "sudo nixos-rebuild switch --flake ~/nixos-dotfiles#hivebrain";
+    };
+  };
+}

system/boot.nix

@@ -0,0 +1,6 @@
+{ ... }:
+
+{
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+}

system/display-manager.nix

@@ -0,0 +1,5 @@
+{ ... }:
+
+{
+  services.displayManager.ly.enable = true;
+}

system/fonts.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  fonts.packages = with pkgs; [
+    jetbrains-mono
+  ];
+}

system/locale.nix

@@ -0,0 +1,5 @@
+{ ... }:
+
+{
+  time.timeZone = "Europe/Berlin";
+}

system/networking.nix

@@ -0,0 +1,6 @@
+{ ... }:
+
+{
+  networking.hostName = "hivebrain";
+  networking.networkmanager.enable = true;
+}

system/nix.nix

@@ -0,0 +1,6 @@
+{ ... }:
+
+{
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+  nixpkgs.config.allowUnfree = true;
+}

system/packages.nix

@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    vim
+    wget
+    btop
+    jq
+  ];
+}

system/picom.nix

@@ -0,0 +1,9 @@
+{ ... }:
+
+{
+  services.picom = {
+    enable = true;
+    backend = "xrender";
+    fade = true;
+  };
+}

system/programs.nix

@@ -0,0 +1,7 @@
+{ ... }:
+
+{
+  programs.firefox.enable = true;
+  programs.zsh.enable = true;
+  programs.nix-ld.enable = true;
+}

system/ssh.nix

@@ -0,0 +1,5 @@
+{ ... }:
+
+{
+  services.openssh.enable = true;
+}

system/users.nix

@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+
+{
+  users.users.marvin = {
+    isNormalUser = true;
+    extraGroups = [ "wheel" ];
+    shell = pkgs.zsh;
+    packages = with pkgs; [
+      tree
+    ];
+  };
+}

system/xserver.nix

@@ -0,0 +1,28 @@
+{ ... }:
+
+{
+  services.xserver = {
+    enable = true;
+    autoRepeatDelay = 200;
+    autoRepeatInterval = 35;
+    windowManager.qtile.enable = true;
+    displayManager.sessionCommands = ''
+      xwallpaper --zoom ~/nixos-dotfiles/Pictures/NixOsWallpaper.png
+    '';
+    xrandrHeads = [
+      {
+        output = "HDMI-1";
+        monitorConfig = ''
+          Option "Position" "0 0"
+        '';
+      }
+      {
+        output = "DP-1";
+        primary = true;
+        monitorConfig = ''
+          Option "Position" "1920 0"
+        '';
+      }
+    ];
+  };
+}