restructure

host/boot.nix

@@ -1,22 +0,0 @@
-{ pkgs, ... }:
-{
-  boot = {
-    loader = {
-      efi.canTouchEfiVariables = true;
-      grub = {
-        enable = true;
-        efiSupport = true;
-        device = "nodev";
-      };
-    };
-
-    # otherwise /tmp is on disk. This *may* be problematic as nix
-    # builds in /tmp but I think my swap is large enough...
-    tmp.useTmpfs = true;
-
-    kernelPackages = pkgs.linuxPackages_6_12;
-    kernel.sysctl."kernel.sysrq" = 1;
-
-    initrd.systemd.network.wait-online.enable = false;
-  };
-}

host/c2/default.nix

@@ -17,7 +17,7 @@
     cpuFreqGovernor = "ondemand";
   };
 
-  desktop.enable = true;
+  hd.desktop.enable = true;
 
   nix = {
     buildMachines = [
@@ -43,6 +43,10 @@
       	'';
   };
 
+  networking.firewall = {
+    enable = true;
+  };
+
   # ====== DON'T CHANGE ======
   system.stateVersion = "25.05";
 }

host/default.nix

@@ -1,12 +0,0 @@
-{ var, ... }:
-{
-  imports = [
-    ./boot.nix
-    ./locale.nix
-    ./nix.nix
-    ./shell.nix
-    ./users.nix
-  ];
-
-  networking.extraHosts = var.lan-dns.hostsFile;
-}

host/locale.nix

@@ -1,25 +0,0 @@
-{ ... }:
-{
-  time.timeZone = "Europe/Berlin";
-
-  i18n.defaultLocale = "en_US.UTF-8";
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "de_DE.UTF-8";
-    LC_IDENTIFICATION = "de_DE.UTF-8";
-    LC_MEASUREMENT = "de_DE.UTF-8";
-    LC_MONETARY = "de_DE.UTF-8";
-    LC_NAME = "de_DE.UTF-8";
-    LC_NUMERIC = "de_DE.UTF-8";
-    LC_PAPER = "de_DE.UTF-8";
-    LC_TELEPHONE = "de_DE.UTF-8";
-    LC_TIME = "de_DE.UTF-8";
-  };
-
-  console.keyMap = "de";
-
-  # Configure keymap in X11
-  services.xserver.xkb = {
-    layout = "de";
-    variant = "";
-  };
-}

host/nix.nix

@@ -1,17 +0,0 @@
-{
-  lib,
-  inputs,
-  config,
-  ...
-}:
-{
-  nix.settings = {
-    experimental-features = [
-      "nix-command"
-      "flakes"
-    ];
-    trusted-users = [ "root" ];
-    auto-optimise-store = true;
-  };
-  nixpkgs.config.allowUnfree = false;
-}

host/shell.nix

@@ -1,51 +0,0 @@
-{ pkgs, inputs, ... }:
-{
-  environment.shells = with pkgs; [
-    bashInteractive
-    fish
-  ];
-
-  environment.systemPackages = with pkgs; [
-    bc
-    docker-compose
-    fd
-    gh
-    htop
-    killall
-    ripgrep
-    starship
-    stow
-    unzip
-    wget
-    wl-clipboard
-    colmena
-    unison
-    dnsutils
-  ];
-
-  programs = {
-    fish.enable = true;
-    git.enable = true;
-    tmux = {
-      enable = true;
-      clock24 = true;
-    };
-    neovim = {
-      enable = true;
-      defaultEditor = true;
-      viAlias = true;
-      vimAlias = true;
-    };
-  };
-
-  # --- Excludes ---
-  programs.nano.enable = false;
-
-  # Enabled by fish but takes soooo long.
-  # This is apparently used by some of fish's
-  # autocomplete features.
-  documentation.man.generateCaches = false;
-
-  # To stop the annoying error on entering wrong commands
-  programs.command-not-found.enable = false;
-}

host/solo/default.nix

@@ -13,11 +13,15 @@
     cpuFreqGovernor = "performance";
   };
 
-  desktop.enable = true;
+  hd.desktop.enable = true;
 
   networking.useDHCP = false;
   networking.interfaces.enp4s0.useDHCP = true;
 
+  networking.firewall = {
+    enable = true;
+  };
+
   # ====== DON'T CHANGE ======
   system.stateVersion = "25.05";
 }

host/users.nix

@@ -1,27 +0,0 @@
-{
-  pkgs,
-  lib,
-  options,
-  var,
-  ...
-}:
-{
-  users = {
-    mutableUsers = false;
-    users."hd" = {
-      description = "Henri";
-      isNormalUser = true;
-      createHome = true;
-      home = "/home/hd";
-      extraGroups = [ "wheel" ];
-      shell = pkgs.fish;
-      packages = [ ];
-      openssh.authorizedKeys.keys = var.ssh-keys.unprivileged;
-      hashedPassword = "$y$jDT$dhvO.xqs8mopz.sFFul.q/$ud5642o7CnVetU6QEu0ctiVMFh7ngZznDf0wp4cXos8";
-    };
-    users.root = {
-      hashedPassword = "!";
-      openssh.authorizedKeys.keys = var.ssh-keys.priviliged;
-    };
-  };
-}