From 243a6b5217ebd8d0f0f2134c61b96a73e008e9af Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Mon, 16 Mar 2026 08:26:24 +0000 Subject: [PATCH] moving flake into generated --- .../machines/traveldroid/audio.nix | 0 .../machines/traveldroid/bluetooth.nix | 0 .../machines/traveldroid/boot.nix | 0 .../machines/traveldroid/dbus.nix | 0 .../traveldroid/hardware-configuration.nix | 0 .../machines/traveldroid/machine.nix | 0 .../machines/traveldroid/networking.nix | 0 .../machines/traveldroid/session.nix | 0 .../machines/traveldroid/top.nix | 0 .../machines/traveldroid/xdg.nix | 0 .../terminal_shell/devshell.nix | 0 .../{flake => flake_kanweg}/users/henrov.nix | 0 .../{flake => flake_kanweg}/users/top.nix | 0 .../{flake => flake_kanweg}/users/user.nix | 0 Droidnix/flake.nix | 2 +- .../machines/traveldroid/audio.nix | 12 +++++ .../machines/traveldroid/bluetooth.nix | 28 +++++++++++ .../out_of_tree/machines/traveldroid/boot.nix | 25 ++++++++++ .../out_of_tree/machines/traveldroid/dbus.nix | 13 +++++ .../traveldroid/hardware-configuration.nix | 47 +++++++++++++++++++ .../machines/traveldroid/machine.nix | 38 +++++++++++++++ .../machines/traveldroid/networking.nix | 38 +++++++++++++++ .../machines/traveldroid/session.nix | 20 ++++++++ .../out_of_tree/machines/traveldroid/top.nix | 23 +++++++++ .../out_of_tree/machines/traveldroid/xdg.nix | 7 +++ 25 files changed, 252 insertions(+), 1 deletion(-) rename Droidnix/assets/{flake => flake_kanweg}/machines/traveldroid/audio.nix (100%) rename Droidnix/assets/{flake => flake_kanweg}/machines/traveldroid/bluetooth.nix (100%) rename Droidnix/assets/{flake => flake_kanweg}/machines/traveldroid/boot.nix (100%) rename Droidnix/assets/{flake => flake_kanweg}/machines/traveldroid/dbus.nix (100%) rename Droidnix/assets/{flake => flake_kanweg}/machines/traveldroid/hardware-configuration.nix (100%) rename Droidnix/assets/{flake => flake_kanweg}/machines/traveldroid/machine.nix (100%) rename Droidnix/assets/{flake => flake_kanweg}/machines/traveldroid/networking.nix (100%) rename Droidnix/assets/{flake => flake_kanweg}/machines/traveldroid/session.nix (100%) rename Droidnix/assets/{flake => flake_kanweg}/machines/traveldroid/top.nix (100%) rename Droidnix/assets/{flake => flake_kanweg}/machines/traveldroid/xdg.nix (100%) rename Droidnix/assets/{flake => flake_kanweg}/terminal_shell/devshell.nix (100%) rename Droidnix/assets/{flake => flake_kanweg}/users/henrov.nix (100%) rename Droidnix/assets/{flake => flake_kanweg}/users/top.nix (100%) rename Droidnix/assets/{flake => flake_kanweg}/users/user.nix (100%) create mode 100644 Droidnix/generated/out_of_tree/machines/traveldroid/audio.nix create mode 100644 Droidnix/generated/out_of_tree/machines/traveldroid/bluetooth.nix create mode 100644 Droidnix/generated/out_of_tree/machines/traveldroid/boot.nix create mode 100644 Droidnix/generated/out_of_tree/machines/traveldroid/dbus.nix create mode 100644 Droidnix/generated/out_of_tree/machines/traveldroid/hardware-configuration.nix create mode 100644 Droidnix/generated/out_of_tree/machines/traveldroid/machine.nix create mode 100644 Droidnix/generated/out_of_tree/machines/traveldroid/networking.nix create mode 100644 Droidnix/generated/out_of_tree/machines/traveldroid/session.nix create mode 100644 Droidnix/generated/out_of_tree/machines/traveldroid/top.nix create mode 100644 Droidnix/generated/out_of_tree/machines/traveldroid/xdg.nix diff --git a/Droidnix/assets/flake/machines/traveldroid/audio.nix b/Droidnix/assets/flake_kanweg/machines/traveldroid/audio.nix similarity index 100% rename from Droidnix/assets/flake/machines/traveldroid/audio.nix rename to Droidnix/assets/flake_kanweg/machines/traveldroid/audio.nix diff --git a/Droidnix/assets/flake/machines/traveldroid/bluetooth.nix b/Droidnix/assets/flake_kanweg/machines/traveldroid/bluetooth.nix similarity index 100% rename from Droidnix/assets/flake/machines/traveldroid/bluetooth.nix rename to Droidnix/assets/flake_kanweg/machines/traveldroid/bluetooth.nix diff --git a/Droidnix/assets/flake/machines/traveldroid/boot.nix b/Droidnix/assets/flake_kanweg/machines/traveldroid/boot.nix similarity index 100% rename from Droidnix/assets/flake/machines/traveldroid/boot.nix rename to Droidnix/assets/flake_kanweg/machines/traveldroid/boot.nix diff --git a/Droidnix/assets/flake/machines/traveldroid/dbus.nix b/Droidnix/assets/flake_kanweg/machines/traveldroid/dbus.nix similarity index 100% rename from Droidnix/assets/flake/machines/traveldroid/dbus.nix rename to Droidnix/assets/flake_kanweg/machines/traveldroid/dbus.nix diff --git a/Droidnix/assets/flake/machines/traveldroid/hardware-configuration.nix b/Droidnix/assets/flake_kanweg/machines/traveldroid/hardware-configuration.nix similarity index 100% rename from Droidnix/assets/flake/machines/traveldroid/hardware-configuration.nix rename to Droidnix/assets/flake_kanweg/machines/traveldroid/hardware-configuration.nix diff --git a/Droidnix/assets/flake/machines/traveldroid/machine.nix b/Droidnix/assets/flake_kanweg/machines/traveldroid/machine.nix similarity index 100% rename from Droidnix/assets/flake/machines/traveldroid/machine.nix rename to Droidnix/assets/flake_kanweg/machines/traveldroid/machine.nix diff --git a/Droidnix/assets/flake/machines/traveldroid/networking.nix b/Droidnix/assets/flake_kanweg/machines/traveldroid/networking.nix similarity index 100% rename from Droidnix/assets/flake/machines/traveldroid/networking.nix rename to Droidnix/assets/flake_kanweg/machines/traveldroid/networking.nix diff --git a/Droidnix/assets/flake/machines/traveldroid/session.nix b/Droidnix/assets/flake_kanweg/machines/traveldroid/session.nix similarity index 100% rename from Droidnix/assets/flake/machines/traveldroid/session.nix rename to Droidnix/assets/flake_kanweg/machines/traveldroid/session.nix diff --git a/Droidnix/assets/flake/machines/traveldroid/top.nix b/Droidnix/assets/flake_kanweg/machines/traveldroid/top.nix similarity index 100% rename from Droidnix/assets/flake/machines/traveldroid/top.nix rename to Droidnix/assets/flake_kanweg/machines/traveldroid/top.nix diff --git a/Droidnix/assets/flake/machines/traveldroid/xdg.nix b/Droidnix/assets/flake_kanweg/machines/traveldroid/xdg.nix similarity index 100% rename from Droidnix/assets/flake/machines/traveldroid/xdg.nix rename to Droidnix/assets/flake_kanweg/machines/traveldroid/xdg.nix diff --git a/Droidnix/assets/flake/terminal_shell/devshell.nix b/Droidnix/assets/flake_kanweg/terminal_shell/devshell.nix similarity index 100% rename from Droidnix/assets/flake/terminal_shell/devshell.nix rename to Droidnix/assets/flake_kanweg/terminal_shell/devshell.nix diff --git a/Droidnix/assets/flake/users/henrov.nix b/Droidnix/assets/flake_kanweg/users/henrov.nix similarity index 100% rename from Droidnix/assets/flake/users/henrov.nix rename to Droidnix/assets/flake_kanweg/users/henrov.nix diff --git a/Droidnix/assets/flake/users/top.nix b/Droidnix/assets/flake_kanweg/users/top.nix similarity index 100% rename from Droidnix/assets/flake/users/top.nix rename to Droidnix/assets/flake_kanweg/users/top.nix diff --git a/Droidnix/assets/flake/users/user.nix b/Droidnix/assets/flake_kanweg/users/user.nix similarity index 100% rename from Droidnix/assets/flake/users/user.nix rename to Droidnix/assets/flake_kanweg/users/user.nix diff --git a/Droidnix/flake.nix b/Droidnix/flake.nix index a50556052..cb0e991d6 100644 --- a/Droidnix/flake.nix +++ b/Droidnix/flake.nix @@ -50,7 +50,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 diff --git a/Droidnix/generated/out_of_tree/machines/traveldroid/audio.nix b/Droidnix/generated/out_of_tree/machines/traveldroid/audio.nix new file mode 100644 index 000000000..6b3bcbc17 --- /dev/null +++ b/Droidnix/generated/out_of_tree/machines/traveldroid/audio.nix @@ -0,0 +1,12 @@ +{ config, pkgs, ... }: +{ + services.pipewire = { + enable = true; + alsa.enable = true; # ALSA compatibility + pulse.enable = true; # PulseAudio compatibility + wireplumber.enable = true; # Session manager for PipeWire + }; + + # Realtime privileges for pro audio (optional) + security.rtkit.enable = true; +} diff --git a/Droidnix/generated/out_of_tree/machines/traveldroid/bluetooth.nix b/Droidnix/generated/out_of_tree/machines/traveldroid/bluetooth.nix new file mode 100644 index 000000000..b985e6742 --- /dev/null +++ b/Droidnix/generated/out_of_tree/machines/traveldroid/bluetooth.nix @@ -0,0 +1,28 @@ +{ config, pkgs, ... }: +{ + # Enable Bluetooth hardware and daemon + hardware.bluetooth = { + enable = true; + powerOnBoot = true; + packages = with pkgs; [ bluez ]; + }; + + # Enable Bluetooth audio support in PipeWire + services.pipewire = { + config.pulse = { + bluez5.enable = true; + }; + }; + + # Optional: Additional Bluetooth settings + hardware.bluetooth.extraConfig = '' + AutoEnable=true + DiscoverableTimeout=0 + PairableTimeout=0 + ''; + + # Install a graphical Bluetooth manager (optional) + environment.systemPackages = with pkgs; [ + blueman + ]; +} diff --git a/Droidnix/generated/out_of_tree/machines/traveldroid/boot.nix b/Droidnix/generated/out_of_tree/machines/traveldroid/boot.nix new file mode 100644 index 000000000..a488f34e1 --- /dev/null +++ b/Droidnix/generated/out_of_tree/machines/traveldroid/boot.nix @@ -0,0 +1,25 @@ +{ pkgs, ... } : +{ + boot = { + initrd = { + verbose = false; # its a lot of logs. dont need it, unless we do. + kernelModules = [ ]; # no kernel modules on boot + }; + + extraModulePackages = [ ]; # no extra packages on boot either + kernelPackages = pkgs.linuxPackages_latest; # latest greatest linux kernel + kernelParams = [ "silent" ]; # quiet those logs + + consoleLogLevel = 0; # quiten more logs + plymouth.enable = true; # graphical boot animation instead + + supportedFilesystems = [ "ntfs" ]; # should see the ntfs (windows) + + loader = { + systemd-boot.enable = true; # systemd-boot + systemd-boot.configurationLimit = 10; + efi.canTouchEfiVariables = true; # allow editing efi to edit the boot loader + timeout = 5; # grub timeout to make a selection + }; + }; +} diff --git a/Droidnix/generated/out_of_tree/machines/traveldroid/dbus.nix b/Droidnix/generated/out_of_tree/machines/traveldroid/dbus.nix new file mode 100644 index 000000000..b39025a6b --- /dev/null +++ b/Droidnix/generated/out_of_tree/machines/traveldroid/dbus.nix @@ -0,0 +1,13 @@ +{ config, pkgs, lib, ... }: +{ + services.dbus = lib.mkForce { + enable = true; # Force this to be true + }; + + # Configure dbus-broker via its configuration file + environment.etc."dbus-broker/launch.conf".text = '' + [General] + LogLevel=warning + MaxConnectionsPerUser=2048 + ''; +} diff --git a/Droidnix/generated/out_of_tree/machines/traveldroid/hardware-configuration.nix b/Droidnix/generated/out_of_tree/machines/traveldroid/hardware-configuration.nix new file mode 100644 index 000000000..802b3df31 --- /dev/null +++ b/Droidnix/generated/out_of_tree/machines/traveldroid/hardware-configuration.nix @@ -0,0 +1,47 @@ +{ + 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; +} diff --git a/Droidnix/generated/out_of_tree/machines/traveldroid/machine.nix b/Droidnix/generated/out_of_tree/machines/traveldroid/machine.nix new file mode 100644 index 000000000..352b795b2 --- /dev/null +++ b/Droidnix/generated/out_of_tree/machines/traveldroid/machine.nix @@ -0,0 +1,38 @@ +{ + config, + pkgs, + lib, + user, + inputs, + flakeRoot, + ... +}: + +{ + options = { + wm = lib.mkOption { + type = lib.types.str; + default = "hyprland"; + description = "Type of window manager to use"; + }; + }; + + config = { + # Minimal settings that must be defined here + networking.hostName = "traveldroid"; + wm.type = "hyprland"; + + # User configuration + users.users.${user.username} = { + isNormalUser = true; + extraGroups = [ + "wheel" + "networkmanager" + ]; + hashedPassword = user.hashedPassword; + home = user.homeDirectory; + }; + # Optional: Enable auto-login for testing + services.getty.autologinUser = user.username; + }; +} diff --git a/Droidnix/generated/out_of_tree/machines/traveldroid/networking.nix b/Droidnix/generated/out_of_tree/machines/traveldroid/networking.nix new file mode 100644 index 000000000..95d838197 --- /dev/null +++ b/Droidnix/generated/out_of_tree/machines/traveldroid/networking.nix @@ -0,0 +1,38 @@ +{ + config, + pkgs, + lib, + ... +}: + +{ + networking = { + useDHCP = lib.mkDefault true; + networkmanager.enable = true; + networkmanager.wifi.backend = "iwd"; + wireless.iwd.enable = true; + wireless.userControlled.enable = true; + firewall = { + enable = true; + # KDE Connect: discovery + encrypted connections + allowedTCPPortRanges = [ + { + from = 1714; + to = 1764; + } + ]; + allowedUDPPortRanges = [ + { + from = 1714; + to = 1764; + } + ]; + }; + }; + + # Install NetworkManager and wofi + environment.systemPackages = with pkgs; [ + networkmanager + wofi + ]; +} diff --git a/Droidnix/generated/out_of_tree/machines/traveldroid/session.nix b/Droidnix/generated/out_of_tree/machines/traveldroid/session.nix new file mode 100644 index 000000000..de9a335df --- /dev/null +++ b/Droidnix/generated/out_of_tree/machines/traveldroid/session.nix @@ -0,0 +1,20 @@ +{ config, pkgs, user, ... }: +{ + environment.sessionVariables = { + XDG_SESSION_TYPE = "wayland"; + XDG_CURRENT_DESKTOP = "Hyprland"; + XCURSOR_SIZE = "24"; + GTK_ENABLE_DARK_MODE = "1"; + GTK_THEME = "Catppuccin-Mocha-Standard-Blue-Dark"; + GTK_ICON_THEME = "Papirus-Dark"; + # Use this instead of GTK_APPLICATION_PREFER_DARK_THEME for newer GTK apps: + GTK_THEME_VARIANT = "dark"; + # For Qt apps (if any): + QT_STYLE_OVERRIDE = "gtk2"; + # For Zen Browser (Firefox fork): + MOZ_ENABLE_WAYLAND = "1"; + GSETTINGS_SCHEMA_DIR = "${pkgs.gsettings-desktop-schemas}/share/glib-2.0/schemas"; + }; + + # Add other session-wide variables here (e.g., QT_QPA_PLATFORM, SDL_VIDEODRIVER) +} diff --git a/Droidnix/generated/out_of_tree/machines/traveldroid/top.nix b/Droidnix/generated/out_of_tree/machines/traveldroid/top.nix new file mode 100644 index 000000000..f1e743bb6 --- /dev/null +++ b/Droidnix/generated/out_of_tree/machines/traveldroid/top.nix @@ -0,0 +1,23 @@ +{ + config, + pkgs, + lib, + user, + inputs, + flakeRoot, + ... +}: + +{ + imports = [ + ./boot.nix + ./hardware-configuration.nix + ./machine.nix + ./dbus.nix + ./audio.nix + ./xdg.nix + ./session.nix + ./networking.nix + inputs.home-manager.nixosModules.home-manager + ]; +} diff --git a/Droidnix/generated/out_of_tree/machines/traveldroid/xdg.nix b/Droidnix/generated/out_of_tree/machines/traveldroid/xdg.nix new file mode 100644 index 000000000..ed37e204f --- /dev/null +++ b/Droidnix/generated/out_of_tree/machines/traveldroid/xdg.nix @@ -0,0 +1,7 @@ +{ config, pkgs, ... }: +{ + xdg.portal = { + enable = true; + config.system.default = [ "hyprland" "gtk" ]; + }; +}