From 349f056e46ff2cac06202f8b8c01e267a141178a Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Mon, 16 Mar 2026 08:25:14 +0000 Subject: [PATCH] Moved assets/flake/machines/ to generated/out_of_tree/machines Added generated/out_of_tree/machines/traveldroid/hardware-configuration.nix --- Droidnix/README.org | 96 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 75 insertions(+), 21 deletions(-) diff --git a/Droidnix/README.org b/Droidnix/README.org index 4b9f0659e..3edbb5297 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -193,7 +193,7 @@ outputs = inherit system; modules = [ # Import machine-specific configurations - ./assets/flake/machines/traveldroid/top.nix + ./generated/out_of_tree/machines/traveldroid/top.nix # Catppuccin theme module inputs.catppuccin.nixosModules.catppuccin # Anchoring all the other nixes @@ -294,9 +294,9 @@ mkShell { #+END_SRC -** =assets/flake/machines/traveldroid/top.nix= +** =generated/out_of_tree/machines/traveldroid/top.nix= This is the top of the machine hierarchy -#+BEGIN_SRC nix :tangle assets/flake/machines/traveldroid/top.nix :noweb tangle :mkdirp yes :eval never-html +#+BEGIN_SRC nix :tangle generated/out_of_tree/machines/traveldroid/top.nix :noweb tangle :mkdirp yes :eval never-html { config, pkgs, @@ -322,9 +322,63 @@ This is the top of the machine hierarchy } #+END_SRC -** =assets/flake/machines/traveldroid/boot.nix= +** =generated/out_of_tree/machines/traveldroid/hardware-configuration.nix= +1. Boot into NixOS Live ISO or your installed system. +2. Open a terminal. +3. Run: sudo nixos-generate-config --root /mnt (Omit --root /mnt if already running NixOS.) +#+BEGIN_SRC nix :tangle generated/out_of_tree/machines/traveldroid/hardware-configuration.nix :noweb tangle :mkdirp yes :eval never-html +{ + hostname, + pkgs, + lib, + modulesPath, + user, + config, + ... +}: +{ + imports = [ + # (modulesPath + "/installer/scan/not-detected.nix") + #../../hardware/hardware.nix + ]; + + boot.initrd.availableKernelModules = [ + "xhci_pci" + "nvme" + "usb_storage" + "sd_mod" + "rtsx_usb_sdmmc" + ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/69433a14-fbaf-401b-af85-cd1bbf02b4e2"; + fsType = "ext4"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/811D-0676"; + fsType = "vfat"; + options = [ + "fmask=0077" + "dmask=0077" + ]; + }; + + swapDevices = [ + { device = "/dev/disk/by-uuid/b6c557c2-7682-460b-a5e7-8f6f2f429a3a"; } + ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} +#+END_SRC + +** =generated/out_of_tree/machines/traveldroid/boot.nix= This file has most of the settings the control how the computer boots up. -#+BEGIN_SRC nix :tangle assets/flake/machines/traveldroid/boot.nix :noweb tangle :mkdirp yes :eval never-html +#+BEGIN_SRC nix :tangle generated/out_of_tree/machines/traveldroid/boot.nix :noweb tangle :mkdirp yes :eval never-html { pkgs, ... } : { boot = { @@ -352,9 +406,9 @@ This file has most of the settings the control how the computer boots up. } #+END_SRC -** =assets/flake/machines/traveldroid/machine.nix= +** =generated/out_of_tree/machines/traveldroid/machine.nix= This is the top if the machine hierarchy -#+BEGIN_SRC nix :tangle assets/flake/machines/traveldroid/machine.nix :noweb tangle :mkdirp yes :eval never-html +#+BEGIN_SRC nix :tangle generated/out_of_tree/machines/traveldroid/machine.nix :noweb tangle :mkdirp yes :eval never-html { config, pkgs, @@ -395,9 +449,9 @@ This is the top if the machine hierarchy } #+END_SRC -** =assets/flake/machines/traveldroid/dbus.nix= +** =generated/out_of_tree/machines/traveldroid/dbus.nix= This sets the dbus implementation -#+BEGIN_SRC nix :tangle assets/flake/machines/traveldroid/dbus.nix :noweb tangle :mkdirp yes :eval never-html +#+BEGIN_SRC nix :tangle generated/out_of_tree/machines/traveldroid/dbus.nix :noweb tangle :mkdirp yes :eval never-html { config, pkgs, lib, ... }: { services.dbus = lib.mkForce { @@ -413,9 +467,9 @@ This sets the dbus implementation } #+END_SRC -** =assets/flake/machines/traveldroid/networking.nix= -This sets the dbus implementation -#+BEGIN_SRC nix :tangle assets/flake/machines/traveldroid/networking.nix :noweb tangle :mkdirp yes :eval never-html +** =generated/out_of_tree/machines/traveldroid/networking.nix= +This sets the networking. +#+BEGIN_SRC nix :tangle generated/out_of_tree/machines/traveldroid/networking.nix :noweb tangle :mkdirp yes :eval never-html { config, pkgs, @@ -456,9 +510,9 @@ This sets the dbus implementation } #+END_SRC -** =assets/flake/machines/traveldroid/session.nix= +** =generated/out_of_tree/machines/traveldroid/session.nix= This sets the session variables -#+BEGIN_SRC nix :tangle assets/flake/machines/traveldroid/session.nix :noweb tangle :mkdirp yes :eval never-html +#+BEGIN_SRC nix :tangle generated/out_of_tree/machines/traveldroid/session.nix :noweb tangle :mkdirp yes :eval never-html { config, pkgs, user, ... }: { environment.sessionVariables = { @@ -481,9 +535,9 @@ This sets the session variables } #+END_SRC -** =assets/flake/machines/traveldroid/bluetooth.nix= +** =generated/out_of_tree/machines/traveldroid/bluetooth.nix= This sets the bluetooth implementation -#+BEGIN_SRC nix :tangle assets/flake/machines/traveldroid/bluetooth.nix :noweb tangle :mkdirp yes :eval never-html +#+BEGIN_SRC nix :tangle generated/out_of_tree/machines/traveldroid/bluetooth.nix :noweb tangle :mkdirp yes :eval never-html { config, pkgs, ... }: { # Enable Bluetooth hardware and daemon @@ -514,9 +568,9 @@ This sets the bluetooth implementation } #+END_SRC -** =assets/flake/machines/traveldroid/audio.nix= +** =generated/out_of_tree/machines/traveldroid/audio.nix= This sets audiosystem for this machine -#+BEGIN_SRC nix :tangle assets/flake/machines/traveldroid/audio.nix :noweb tangle :mkdirp yes :eval never-html +#+BEGIN_SRC nix :tangle generated/out_of_tree/machines/traveldroid/audio.nix :noweb tangle :mkdirp yes :eval never-html { config, pkgs, ... }: { services.pipewire = { @@ -531,9 +585,9 @@ This sets audiosystem for this machine } #+END_SRC -** =assets/flake/machines/traveldroid/xdg.nix= +** =generated/out_of_tree/machines/traveldroid/xdg.nix= This sets the XDG implementation -#+BEGIN_SRC nix :tangle assets/flake/machines/traveldroid/xdg.nix :noweb tangle :mkdirp yes :eval never-html +#+BEGIN_SRC nix :tangle generated/out_of_tree/machines/traveldroid/xdg.nix :noweb tangle :mkdirp yes :eval never-html { config, pkgs, ... }: { xdg.portal = { @@ -1036,7 +1090,7 @@ This file sets up wayland } #+END_SRC -** =assets/flake/machones/traveldroid/gtk.nix= +** =generated/out_of_tree/machines/traveldroid/gtk.nix= This file configures gtk #+BEGIN_SRC nix :tangle generated/system/core/gtk.nix :noweb tangle :mkdirp yes :eval never-html { pkgs, ... }: