progress...

config/hosts/aspects/doloro-laptop/hardware.nix

@@ -0,0 +1,33 @@
+{
+  den,
+  modules,
+  __findFile,
+  ...
+}:
+{
+  den.aspects.laptop = {
+    nixos =
+      {
+        pkgs,
+        lib,
+        config,
+        ...
+      }:
+      {
+
+        boot.initrd.availableKernelModules = [
+          "xhci_pci"
+          "thunderbolt"
+          "vmd"
+          "nvme"
+        ];
+        boot.initrd.kernelModules = [ ];
+        boot.kernelModules = [ "kvm-intel" ];
+        boot.extraModulePackages = [ ];
+
+        nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+        hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+
+      };
+  };
+}

config/hosts/aspects/doloro-laptop/home.nix

@@ -9,17 +9,20 @@
     includes = [
       <den/primary-user>
       den.aspects.doloro-shared
-      modules.user.doloro
       modules.hyprland
       <modules/hyprland/doloro-settings>
       modules.sops
       modules.fish
+      <modules/zen-browser>
+      modules.kitty
     ];
     nixos =
       { config, pkgs, ... }:
       {
         users.users.doloro = {
+          isNormalUser = true;
           shell = pkgs.fish;
+          initialPassword = "sex";
           hashedPasswordFile = config.sops.secrets."doloro-hashed_password".path;
         };
       };

config/hosts/aspects/doloro-laptop/host.nix

@@ -8,6 +8,7 @@
   den.aspects.laptop = {
     includes = [
       modules.nix
+      modules.tuigreet
     ];
     nixos =
       { pkgs, config, ... }:
@@ -49,7 +50,7 @@
         services.gnome.gnome-keyring.enable = true;
 
         hardware = {
-          firmware = [ pkgs.intel-npu-driver ];
+          # firmware = [ pkgs.intel-npu-driver ];
           cpu.intel = {
             # npu.enable = true;
           };
@@ -97,8 +98,8 @@
         boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
         # Define a user account. Don't forget to set a password with ‘passwd’.
         # users.users.doloro = {
-        #   isNormalUser = true;
-        #   shell = pkgs.fish;
+        # isNormalUser = true;
+        # shell = pkgs.fish;
         #   extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
         #   packages = with pkgs; [
         #     tree
@@ -109,6 +110,9 @@
         #   ];
         #   # initialPassword = "sex";
         # };
+        users.users.root = {
+          password = "meowmeowmeow";
+        };
         users.mutableUsers = false;
         services.system76-scheduler.enable = true;
 

config/hosts/aspects/doloro-shared.nix

@@ -1,15 +1,26 @@
-{ den, modules, ... }:
+{
+  den,
+  modules,
+  __findFile,
+  ...
+}:
 {
   den.aspects.doloro-shared = {
     includes = [
       modules.nixvim
       modules.nix
+      modules.tmux
+      <modules/git/doloro>
     ];
-    homeManager = {
-      home = {
-        username = "doloro";
-        homeDirectory = "/home/doloro";
+    homeManager =
+      { pkgs, ... }:
+      {
+        home = {
+          username = "doloro";
+          homeDirectory = "/home/doloro";
+          packages = with pkgs; [ wl-clipboard ];
+        };
+        programs.home-manager.enable = true;
       };
-    };
   };
 }

config/hosts/computers.nix

@@ -1,24 +1,24 @@
 { den, __findFile, ... }:
 {
   # Homes
-  den.homes.x86_64-linux.doloro-desktop = {
-    userName = "doloro";
-  };
-  # TODO
-  # den.homes.x86_64-linux.doloro-laptop = {
+  # den.homes.x86_64-linux.doloro-desktop = {
   #   userName = "doloro";
   # };
-  # Machines
-  den.hosts.x86_64-linux.desktop = {
-    users.doloro = {
-      includes = [ <modules/user/groups> ];
-      aspect = "doloro-desktop";
-    };
-  };
   # TODO
-  # den.hosts.x86_64-linux.laptop = {
+  den.homes.x86_64-linux.doloro-laptop = {
+    userName = "doloro";
+  };
+  # Machines
+  # den.hosts.x86_64-linux.desktop = {
   #   users.doloro = {
-  #     aspect = "doloro-laptop";
+  #     includes = [ <modules/user/groups> ];
+  #     aspect = "doloro-desktop";
   #   };
   # };
+  # TODO
+  den.hosts.x86_64-linux.laptop = {
+    users.doloro = {
+      aspect = "doloro-laptop";
+    };
+  };
 }