experimenting with system

Droidnix/assets/flake/machines/traveldroid/hardware-configuration.nix

@@ -1,39 +1,48 @@
 {
-hostname,
+  hostname,
-pkgs,
+  pkgs,
-lib,
+  lib,
-modulesPath,
+  modulesPath,
-user,
+  user,
-config,
+  config,
-...
+  ...
 }:
 {
-imports = [
+  imports = [
-(modulesPath + "/installer/scan/not-detected.nix")
+    (modulesPath + "/installer/scan/not-detected.nix")
-../../hardware/hardware.nix
+    #../../hardware/hardware.nix
-];
+  ];
 
-boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_usb_sdmmc" ];
+  boot.initrd.availableKernelModules = [
-boot.initrd.kernelModules = [ ];
+    "xhci_pci"
-boot.kernelModules = [ "kvm-intel" ];
+    "nvme"
-boot.extraModulePackages = [ ];
+    "usb_storage"
+    "sd_mod"
+    "rtsx_usb_sdmmc"
+  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
 
-fileSystems."/" =
+  fileSystems."/" = {
-{ device = "/dev/disk/by-uuid/69433a14-fbaf-401b-af85-cd1bbf02b4e2";
+    device = "/dev/disk/by-uuid/69433a14-fbaf-401b-af85-cd1bbf02b4e2";
-fsType = "ext4";
+    fsType = "ext4";
-};
+  };
 
-fileSystems."/boot" =
+  fileSystems."/boot" = {
-{ device = "/dev/disk/by-uuid/811D-0676";
+    device = "/dev/disk/by-uuid/811D-0676";
-fsType = "vfat";
+    fsType = "vfat";
-options = [ "fmask=0077" "dmask=0077" ];
+    options = [
-};
+      "fmask=0077"
+      "dmask=0077"
+    ];
+  };
 
-swapDevices =
+  swapDevices = [
-[ { device = "/dev/disk/by-uuid/b6c557c2-7682-460b-a5e7-8f6f2f429a3a"; }
+    { device = "/dev/disk/by-uuid/b6c557c2-7682-460b-a5e7-8f6f2f429a3a"; }
-];
+  ];
 
-nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 
 }

Droidnix/assets/flake/machines/traveldroid/top.nix

@@ -14,7 +14,6 @@
 
   # Minimal settings that must be defined here
   networking.hostName = "traveldroid";
-  system = "x86_64-linux"; # Define the system explicitly
   wm.type = "hyprland"; # Define the window manager type here, mangowc will be made possible in the nerar future.
   # In generated/top.nix the chpice fopr a window manager will be effectuated
 }

Droidnix/flake.nix

@@ -22,33 +22,49 @@
     hyprland.url = "github:hyprwm/Hyprland";
   };
 
-  outputs = inputs@{ nixpkgs, home-manager, emacs-overlay, catppuccin, zen-browser, hyprland, ... }:
+  outputs =
-  let
+    inputs@{
-    lib = nixpkgs.lib;
+      nixpkgs,
-    system = lib.system.system;
+      home-manager,
-    user = import ./assets/flake/users/henrov.nix;
+      emacs-overlay,
-    machines = ["traveldroid" "maindroid"];
+      catppuccin,
-  in
+      zen-browser,
-  {
+      hyprland,
-    nixosConfigurations = lib.genAttrs machines (machine: lib.nixosSystem {
+      ...
-      inherit system;
+    }:
-      modules = [
+    let
-        # Import machine-specific configurations
+      lib = nixpkgs.lib;
-        ./assets/flake/machines/${machine}/top.nix
+      system = "x86_64-linux"; # Define the system explicitly
-
+      user = import ./assets/flake/users/henrov.nix;
-        # Home Manager and theme modules
+      machines = [
-        home-manager.nixosModules.home-manager {
+        "traveldroid"
-          home-manager.useGlobalPkgs = true;
+        "maindroid"
-          home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = { inherit user inputs; };
-        }
-        inputs.catppuccin.nixosModules.catppuccin
       ];
-      specialArgs = { inherit user inputs; };
+    in
-    });
+    {
+      nixosConfigurations = lib.genAttrs machines (
+        machine:
+        lib.nixosSystem {
+          inherit system;
+          modules = [
+            # Import machine-specific configurations
+            ./assets/flake/machines/${machine}/top.nix
 
-    devShells.${system}.default = import ./assets/flake/terminal_shell/devshell.nix {
+            # Home Manager and theme modules
-      inherit (nixpkgs) mkShell;
+            home-manager.nixosModules.home-manager
+            {
+              home-manager.useGlobalPkgs = true;
+              home-manager.useUserPackages = true;
+              home-manager.extraSpecialArgs = { inherit user inputs; };
+            }
+            inputs.catppuccin.nixosModules.catppuccin
+          ];
+          specialArgs = { inherit user inputs; };
+        }
+      );
+
+      devShells.${system}.default = import ./assets/flake/terminal_shell/devshell.nix {
+        inherit (nixpkgs) mkShell;
+      };
     };
-  };
 }