From 90a5961845b0fe0c99ba37459154d615ff39dad7 Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Sat, 24 Aug 2024 00:15:58 +0200 Subject: [PATCH] Move hardware config files again --- hosts/inspiron/default.nix | 3 ++- hosts/inspiron/{hardware => }/disko.nix | 0 hosts/inspiron/{hardware/default.nix => hardware.nix} | 5 +---- hosts/north/default.nix | 4 +++- hosts/north/{hardware => }/disko.nix | 0 hosts/north/{hardware/default.nix => hardware.nix} | 6 +----- hosts/north/{hardware => }/nvidia.nix | 0 hosts/proxima/default.nix | 3 ++- hosts/proxima/{hardware => }/disko.nix | 0 hosts/proxima/{hardware/default.nix => hardware.nix} | 5 +---- 10 files changed, 10 insertions(+), 16 deletions(-) rename hosts/inspiron/{hardware => }/disko.nix (100%) rename hosts/inspiron/{hardware/default.nix => hardware.nix} (86%) rename hosts/north/{hardware => }/disko.nix (100%) rename hosts/north/{hardware/default.nix => hardware.nix} (94%) rename hosts/north/{hardware => }/nvidia.nix (100%) rename hosts/proxima/{hardware => }/disko.nix (100%) rename hosts/proxima/{hardware/default.nix => hardware.nix} (86%) diff --git a/hosts/inspiron/default.nix b/hosts/inspiron/default.nix index 82a571a..c0c3048 100644 --- a/hosts/inspiron/default.nix +++ b/hosts/inspiron/default.nix @@ -2,7 +2,8 @@ { imports = [ ../common.nix - ./hardware + ./hardware.nix + ./disko.nix ]; system.stateVersion = "23.11"; diff --git a/hosts/inspiron/hardware/disko.nix b/hosts/inspiron/disko.nix similarity index 100% rename from hosts/inspiron/hardware/disko.nix rename to hosts/inspiron/disko.nix diff --git a/hosts/inspiron/hardware/default.nix b/hosts/inspiron/hardware.nix similarity index 86% rename from hosts/inspiron/hardware/default.nix rename to hosts/inspiron/hardware.nix index 6d9d426..2ca8ccf 100644 --- a/hosts/inspiron/hardware/default.nix +++ b/hosts/inspiron/hardware.nix @@ -1,9 +1,6 @@ { inputs, ... }: { - imports = [ - inputs.disko.nixosModules.default - ./disko.nix - ]; + imports = [ inputs.disko.nixosModules.default ]; nixpkgs.hostPlatform = "x86_64-linux"; diff --git a/hosts/north/default.nix b/hosts/north/default.nix index ea73511..fc78d94 100644 --- a/hosts/north/default.nix +++ b/hosts/north/default.nix @@ -2,7 +2,9 @@ { imports = [ ../common.nix - ./hardware + ./hardware.nix + ./disko.nix + ./nvidia.nix ]; system.stateVersion = "23.11"; diff --git a/hosts/north/hardware/disko.nix b/hosts/north/disko.nix similarity index 100% rename from hosts/north/hardware/disko.nix rename to hosts/north/disko.nix diff --git a/hosts/north/hardware/default.nix b/hosts/north/hardware.nix similarity index 94% rename from hosts/north/hardware/default.nix rename to hosts/north/hardware.nix index 89f04eb..6950ca1 100644 --- a/hosts/north/hardware/default.nix +++ b/hosts/north/hardware.nix @@ -1,10 +1,6 @@ { inputs, ... }: { - imports = [ - inputs.disko.nixosModules.default - ./disko.nix - ./nvidia.nix - ]; + imports = [ inputs.disko.nixosModules.default ]; nixpkgs.hostPlatform = "x86_64-linux"; diff --git a/hosts/north/hardware/nvidia.nix b/hosts/north/nvidia.nix similarity index 100% rename from hosts/north/hardware/nvidia.nix rename to hosts/north/nvidia.nix diff --git a/hosts/proxima/default.nix b/hosts/proxima/default.nix index 98d3418..1277caa 100644 --- a/hosts/proxima/default.nix +++ b/hosts/proxima/default.nix @@ -1,7 +1,8 @@ { imports = [ ../common.nix - ./hardware + ./hardware.nix + ./disko.nix ]; system.stateVersion = "24.05"; diff --git a/hosts/proxima/hardware/disko.nix b/hosts/proxima/disko.nix similarity index 100% rename from hosts/proxima/hardware/disko.nix rename to hosts/proxima/disko.nix diff --git a/hosts/proxima/hardware/default.nix b/hosts/proxima/hardware.nix similarity index 86% rename from hosts/proxima/hardware/default.nix rename to hosts/proxima/hardware.nix index ee769d0..0bcd3b8 100644 --- a/hosts/proxima/hardware/default.nix +++ b/hosts/proxima/hardware.nix @@ -1,9 +1,6 @@ { inputs, ... }: { - imports = [ - inputs.disko.nixosModules.default - ./disko.nix - ]; + imports = [ inputs.disko.nixosModules.default ]; nixpkgs.hostPlatform = "x86_64-linux";