From 34e8ea67fcf7be4eb52fdd09213f41939f43e371 Mon Sep 17 00:00:00 2001 From: ant Date: Mon, 1 Sep 2025 22:42:42 +0200 Subject: [PATCH] move machine specific files to their own directory --- flake.nix | 4 ++-- os/{ => basado}/configuration.nix | 6 +++--- os/{ => basado}/hardware-configuration.nix | 0 os/{moon.nix => moon/configuration.nix} | 4 ++-- .../hardware-configuration.nix} | 0 5 files changed, 7 insertions(+), 7 deletions(-) rename os/{ => basado}/configuration.nix (97%) rename os/{ => basado}/hardware-configuration.nix (100%) rename os/{moon.nix => moon/configuration.nix} (97%) rename os/{moon-hardware-configuration.nix => moon/hardware-configuration.nix} (100%) diff --git a/flake.nix b/flake.nix index a360066..60e7f47 100644 --- a/flake.nix +++ b/flake.nix @@ -93,14 +93,14 @@ nixosConfigurations.basado = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ - ./os/configuration.nix + ./os/basado/configuration.nix ]; }; nixosConfigurations.moon = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ - ./os/moon.nix + ./os/moon/configuration.nix ]; }; diff --git a/os/configuration.nix b/os/basado/configuration.nix similarity index 97% rename from os/configuration.nix rename to os/basado/configuration.nix index e17782b..122e861 100644 --- a/os/configuration.nix +++ b/os/basado/configuration.nix @@ -6,9 +6,9 @@ in { imports = [ ./hardware-configuration.nix - ./common.nix - ./common-graphics.nix - (import ./remote-disk-unlock.nix sshKeys) + ../common.nix + ../common-graphics.nix + (import ../remote-disk-unlock.nix sshKeys) ]; boot.loader = { diff --git a/os/hardware-configuration.nix b/os/basado/hardware-configuration.nix similarity index 100% rename from os/hardware-configuration.nix rename to os/basado/hardware-configuration.nix diff --git a/os/moon.nix b/os/moon/configuration.nix similarity index 97% rename from os/moon.nix rename to os/moon/configuration.nix index c800cb6..991c71f 100644 --- a/os/moon.nix +++ b/os/moon/configuration.nix @@ -2,8 +2,8 @@ { imports = [ # Include the results of the hardware scan. ./moon-hardware-configuration.nix - ./common.nix - ./common-graphics.nix + ../common.nix + ../common-graphics.nix ]; # Bootloader. diff --git a/os/moon-hardware-configuration.nix b/os/moon/hardware-configuration.nix similarity index 100% rename from os/moon-hardware-configuration.nix rename to os/moon/hardware-configuration.nix