refactor: added flake parts

modules/hosts/nixos/emergent/configuration.nix

@@ -0,0 +1,183 @@
+{...}: {
+  # Edit this configuration file to define what should be installed on
+  # your system. Help is available in the configuration.nix(5) man page, on
+  # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
+  flake.nixosModules.emergentConfiguration = {
+    lib,
+    pkgs,
+    ...
+  }: {
+    # Use the systemd-boot EFI boot loader.
+    boot.loader.systemd-boot.enable = true;
+    boot.loader.efi.canTouchEfiVariables = true;
+
+    # networking.hostName = "nixos"; # Define your hostname.
+    # Pick only one of the below networking options.
+    # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+    # networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
+
+    # Set your time zone.
+    # time.timeZone = "Europe/Amsterdam";
+
+    # Configure network proxy if necessary
+    # networking.proxy.default = "http://user:password@proxy:port/";
+    # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+
+    # Select internationalisation properties.
+    # i18n.defaultLocale = "en_US.UTF-8";
+    # console = {
+    #   font = "Lat2-Terminus16";
+    #   keyMap = "us";
+    #   useXkbConfig = true; # use xkb.options in tty.
+    # };
+
+    # Enable the X11 windowing system.
+    services.xserver.enable = true;
+    # Enable wacom touchscreen device
+    services.xserver.wacom.enable = true;
+
+    # installed opentabletdriver
+    # hardware.opentabletdriver.enable = true;
+    hardware.keyboard.qmk.enable = true;
+
+    # Enable the GNOME Desktop Environment.
+    services.displayManager.gdm.enable = true;
+    services.desktopManager.gnome.enable = true;
+
+    host = {
+      ai.enable = true;
+      users = {
+        eve = {
+          isDesktopUser = true;
+          isTerminalUser = true;
+          isPrincipleUser = true;
+        };
+      };
+      hardware = {
+        piperMouse.enable = true;
+      };
+    };
+
+    storage = {
+      zfs = {
+        enable = true;
+        pool = {
+          mode = "stripe";
+          vdevs = [
+            [
+              {
+                device = "wwn-0x5000039fd0cf05eb";
+                boot = true;
+              }
+            ]
+          ];
+          cache = [];
+        };
+      };
+    };
+
+    virtualisation.libvirtd.enable = true;
+
+    users.users.eve = {
+      extraGroups = ["libvirtd"];
+    };
+
+    services.tailscale.enable = true;
+    # We were having weird build errors so this is disabled right now
+    # error: The option `devices.emergent.folders.eve_records.path' was accessed but has no value defined. Try setting the option
+    services.syncthing.enable = false;
+
+    # Configure keymap in X11
+    # services.xserver.xkb.layout = "us";
+    # services.xserver.xkb.options = "eurosign:e,caps:escape";
+
+    # Enable CUPS to print documents.
+    # services.printing.enable = true;
+
+    # Enable sound.
+    # services.pulseaudio.enable = true;
+    # OR
+    # services.pipewire = {
+    #   enable = true;
+    #   pulse.enable = true;
+    # };
+
+    # Enable touchpad support (enabled default in most desktopManager).
+    # services.libinput.enable = true;
+
+    # Define a user account. Don't forget to set a password with ‘passwd’.
+    # users.users.alice = {
+    #   isNormalUser = true;
+    #   extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
+    #   packages = with pkgs; [
+    #     tree
+    #   ];
+    # };
+
+    # programs.firefox.enable = true;
+
+    nixpkgs.config.allowUnfree = true;
+
+    # Packages that can be installed without any extra configuration
+    # See https://search.nixos.org/packages for all options
+    environment.systemPackages = with pkgs; [
+      wget
+      gnome-boxes
+      libvirt
+    ];
+
+    # Packages that need to be installed with some extra configuration
+    # See https://search.nixos.org/options for all options
+    programs = {};
+
+    # 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;
+
+    # Open ports in the firewall.
+    # networking.firewall.allowedTCPPorts = [ ... ];
+    # networking.firewall.allowedUDPPorts = [ ... ];
+    # Or disable the firewall altogether.
+    # networking.firewall.enable = false;
+
+    networking = {
+      networkmanager.enable = true;
+      useDHCP = lib.mkDefault true;
+      hostId = "7e35eb97"; # arbitrary id number generated via this command: `head -c4 /dev/urandom | od -A none -t x4`
+      hostName = "emergent"; # Define your hostname.
+    };
+
+    # Copy the NixOS configuration file and link it from the resulting system
+    # (/run/current-system/configuration.nix). This is useful in case you
+    # accidentally delete configuration.nix.
+    # system.copySystemConfiguration = true;
+
+    # This option defines the first version of NixOS you have installed on this particular machine,
+    # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
+    #
+    # Most users should NEVER change this value after the initial install, for any reason,
+    # even if you've upgraded your system to a new NixOS release.
+    #
+    # This value does NOT affect the Nixpkgs version your packages and OS are pulled from,
+    # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how
+    # to actually do that.
+    #
+    # This value being lower than the current NixOS release does NOT mean your system is
+    # out of date, out of support, or vulnerable.
+    #
+    # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration,
+    # and migrated your data accordingly.
+    #
+    # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
+    system.stateVersion = "25.05"; # Did you read the comment?
+  };
+}

modules/hosts/nixos/emergent/default.nix

@@ -0,0 +1,21 @@
+# evs desktop
+{
+  inputs,
+  config,
+  ...
+}: {
+  flake.nixosConfigurations.emergent = inputs.nixpkgs.lib.nixosSystem {
+    system = "x86_64-linux";
+    modules = [
+      config.flake.nixosModules.nixosModules
+      config.flake.nixosModules.emergentConfiguration
+      config.flake.nixosModules.emergentHardwareConfiguration
+      config.flake.nixosModules.emergentLegacyStorage
+      config.flake.nixosModules.emergentNvidiaDriver
+    ];
+    specialArgs = {
+      inherit inputs;
+      syncthingConfiguration = inputs.self.syncthingConfiguration;
+    };
+  };
+}

modules/hosts/nixos/emergent/hardware-configuration.nix

@@ -0,0 +1,34 @@
+{...}: {
+  # 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.
+  flake.nixosModules.emergentHardwareConfiguration = {
+    config,
+    lib,
+    pkgs,
+    modulesPath,
+    ...
+  }: {
+    imports = [
+      (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+    boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "wacom" "kvm" "kvm_amd"];
+    boot.initrd.kernelModules = [];
+    boot.kernelModules = [];
+    boot.extraModulePackages = [];
+
+    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
+    # 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.enp42s0.useDHCP = lib.mkDefault true;
+    # networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true;
+
+    nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+    hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  };
+}

modules/hosts/nixos/emergent/legacy-storage.nix

@@ -0,0 +1,53 @@
+{...}: {
+  # Legacy storage configuration for emergent
+  # This file manually defines ZFS datasets matching the existing on-disk layout
+  # to allow incremental migration to the new storage module (generateBase = true).
+  #
+  # Current on-disk dataset layout:
+  #   rpool/local/                    - parent (canmount=off)
+  #   rpool/local/system/nix          - nix store
+  #   rpool/local/system/root         - root filesystem
+  #
+  # Migration plan:
+  #   Phase 1: Rename datasets on disk (boot from live USB)
+  #     zfs rename -p rpool/local/system/nix rpool/persist/local/nix
+  #     zfs rename rpool/local rpool/persist/local
+  #     # This moves: local/system/root -> persist/local/root (need to rename after)
+  #     # Actually, since local/system/root needs to become persist/local/root:
+  #     zfs rename rpool/persist/local/system/root rpool/persist/local/root
+  #     zfs destroy rpool/persist/local/system  # now empty
+  #     # Recreate blank snapshot:
+  #     zfs destroy rpool/persist/local/root@blank
+  #     zfs snapshot rpool/persist/local/root@blank
+  #
+  #   Phase 2: Delete this file, remove its import from default.nix, rebuild.
+  flake.nixosModules.emergentLegacyStorage = {...}: {
+    # Disable automatic base dataset generation so we can define them manually
+    storage.generateBase = false;
+
+    # Manually define ZFS datasets matching the existing on-disk layout
+    storage.zfs.datasets = {
+      "local" = {
+        type = "zfs_fs";
+        mount = null;
+      };
+      "local/system/nix" = {
+        type = "zfs_fs";
+        mount = "/nix";
+        atime = "off";
+        relatime = "off";
+        snapshot = {
+          autoSnapshot = false;
+        };
+      };
+      "local/system/root" = {
+        type = "zfs_fs";
+        mount = "/";
+        snapshot = {
+          blankSnapshot = true;
+          autoSnapshot = true;
+        };
+      };
+    };
+  };
+}

modules/hosts/nixos/emergent/nvidia-drivers.nix

@@ -0,0 +1,48 @@
+{...}: {
+  flake.nixosModules.emergentNvidiaDriver = {config, ...}: {
+    # Enable OpenGL
+    hardware.graphics = {
+      enable = true;
+    };
+
+    # Load nvidia driver for Xorg and Wayland
+    services = {
+      xserver = {
+        # Load nvidia driver for Xorg and Wayland
+        videoDrivers = ["nvidia"];
+      };
+      # Use X instead of wayland
+      displayManager.gdm.wayland = true;
+    };
+
+    hardware.nvidia = {
+      # Modesetting is required.
+      modesetting.enable = true;
+
+      # Nvidia power management. Experimental, and can cause sleep/suspend to fail.
+      # Enable this if you have graphical corruption issues or application crashes after waking
+      # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead
+      # of just the bare essentials.
+      powerManagement.enable = true;
+
+      # Fine-grained power management. Turns off GPU when not in use.
+      # Experimental and only works on modern Nvidia GPUs (Turing or newer).
+      powerManagement.finegrained = false;
+
+      # Use the NVidia open source kernel module (not to be confused with the
+      # independent third-party "nouveau" open source driver).
+      # Support is limited to the Turing and later architectures. Full list of
+      # supported GPUs is at:
+      # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
+      # Only available from driver 515.43.04+
+      open = true;
+
+      # Enable the Nvidia settings menu,
+      # accessible via `nvidia-settings`.
+      nvidiaSettings = true;
+
+      # Optionally, you may need to select the appropriate driver version for your specific GPU.
+      package = config.boot.kernelPackages.nvidiaPackages.stable;
+    };
+  };
+}