From df8534e3aa71385b2e3166768f593e701aca5a7b Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Thu, 12 Mar 2026 20:17:15 +0100 Subject: [PATCH] Recreated flake files --- .../flake/machines/traveldroid/machine.nix | 45 +++++++++++++++++++ .../assets/flake/machines/traveldroid/top.nix | 37 +-------------- .../assets/flake/terminal_shell/devshell.nix | 2 +- 3 files changed, 48 insertions(+), 36 deletions(-) create mode 100644 Droidnix/assets/flake/machines/traveldroid/machine.nix diff --git a/Droidnix/assets/flake/machines/traveldroid/machine.nix b/Droidnix/assets/flake/machines/traveldroid/machine.nix new file mode 100644 index 000000000..b05fa76ed --- /dev/null +++ b/Droidnix/assets/flake/machines/traveldroid/machine.nix @@ -0,0 +1,45 @@ +{ + config, + pkgs, + lib, + user, + inputs, + flakeRoot, + ... +}: + +{ + options = { + wm = lib.mkOption { + type = lib.types.str; + default = "hyprland"; + description = "Type of window manager to use"; + }; + }; + + config = { + # Enable Home Manager for the user + home-manager.users.${user.username} = { + enable = true; + homeDirectory = user.homeDirectory; + }; + + # 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/assets/flake/machines/traveldroid/top.nix b/Droidnix/assets/flake/machines/traveldroid/top.nix index 6cdff7b96..5d9b0eb30 100644 --- a/Droidnix/assets/flake/machines/traveldroid/top.nix +++ b/Droidnix/assets/flake/machines/traveldroid/top.nix @@ -12,40 +12,7 @@ imports = [ ./boot.nix ./hardware-configuration.nix + ./machine.nix inputs.home-manager.nixosModules.home-manager - ]; - - options = { - wm = lib.mkOption { - type = lib.types.str; - default = "hyprland"; - description = "Type of window manager to use"; - }; - }; - - config = { - # Enable Home Manager for the user - home-manager.users.${user.username} = { - enable = true; - homeDirectory = user.homeDirectory; - }; - - # 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/assets/flake/terminal_shell/devshell.nix b/Droidnix/assets/flake/terminal_shell/devshell.nix index c5d5b7e72..a4ef0e369 100644 --- a/Droidnix/assets/flake/terminal_shell/devshell.nix +++ b/Droidnix/assets/flake/terminal_shell/devshell.nix @@ -1,6 +1,6 @@ { mkShell, ... }: mkShell { - buildInputs = with import {}; [ + buildInputs = with import { }; [ nil nixfmt-rfc-style ];