From 6a9a43478c4ecb575840252c1a5e5af9b54f6d2e Mon Sep 17 00:00:00 2001 From: fleaz Date: Mon, 7 Feb 2022 00:00:41 +0100 Subject: [PATCH] Create all.nix role with common modules --- machines/cray/configuration.nix | 9 +-------- machines/jimbo/configuration.nix | 9 +-------- roles/all.nix | 13 +++++++++++++ 3 files changed, 15 insertions(+), 16 deletions(-) create mode 100644 roles/all.nix diff --git a/machines/cray/configuration.nix b/machines/cray/configuration.nix index 565e96e..0d4fe1a 100644 --- a/machines/cray/configuration.nix +++ b/machines/cray/configuration.nix @@ -10,14 +10,7 @@ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - ../../modules/fonts.nix - ../../modules/sound.nix - ../../modules/opengl.nix - ../../modules/ssh.nix - ../../modules/remote-builder.nix - ../../modules/earlyoom.nix - ../../users/fleaz.nix - ../../home-manager/default.nix + ../../roles/all.nix ]; # Use the systemd-boot EFI boot loader. diff --git a/machines/jimbo/configuration.nix b/machines/jimbo/configuration.nix index 8dd8fb4..925c3c3 100644 --- a/machines/jimbo/configuration.nix +++ b/machines/jimbo/configuration.nix @@ -11,14 +11,7 @@ in { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - ../../home-manager/default.nix - ../../modules/earlyoom.nix - ../../modules/fonts.nix - ../../modules/opengl.nix - ../../modules/remote-builder.nix - ../../modules/sound.nix - ../../modules/ssh.nix - ../../users/fleaz.nix + ../../roles/all.nix ]; diff --git a/roles/all.nix b/roles/all.nix new file mode 100644 index 0000000..ee32477 --- /dev/null +++ b/roles/all.nix @@ -0,0 +1,13 @@ +{ + imports = [ + ../home-manager/default.nix + ../modules/earlyoom.nix + ../modules/fonts.nix + ../modules/opengl.nix + ../modules/remote-builder.nix + ../modules/sound.nix + ../modules/ssh.nix + ../users/fleaz.nix + ]; + } +