From 7f4b4ba3d3538969fed13383e7b43766570bff7c Mon Sep 17 00:00:00 2001 From: Dmitry Voronin Date: Wed, 31 Jan 2024 01:26:06 +0300 Subject: [PATCH] Flake : Move modules from configurations to flake.nix. --- .config/linux/system/flake.nix | 70 +++++++++++++++++-- .../linux/system/host/dasha/Configuration.nix | 9 --- .../system/host/desktop/Configuration.nix | 9 --- .../linux/system/host/home/Configuration.nix | 9 --- .../system/host/laptop/Configuration.nix | 10 --- .../linux/system/host/work/Configuration.nix | 9 --- 6 files changed, 65 insertions(+), 51 deletions(-) diff --git a/.config/linux/system/flake.nix b/.config/linux/system/flake.nix index 92e61e7..69a47ed 100644 --- a/.config/linux/system/flake.nix +++ b/.config/linux/system/flake.nix @@ -3,27 +3,87 @@ inputs.nixpkgs.url = "github:nixos/nixpkgs/952b64947e0b1300600dda555db35d09122b9612"; outputs = { self, nixpkgs }@inputs: { nixosConfigurations.dasha = nixpkgs.lib.nixosSystem { - modules = [ ./host/dasha/Configuration.nix ]; + modules = [ + ./host/dasha/Configuration.nix + ./module/AmdGpu.nix + ./module/Common.nix + ./module/Dasha.nix + ./module/DockerRootless.nix + ./module/Flatpak.nix + ./module/Gnome.nix + ./module/PowersaveIntel.nix + ./module/Print.nix + ./module/Sshd.nix + ]; specialArgs.inputs = inputs; system = "x86_64-linux"; }; + nixosConfigurations.desktop = nixpkgs.lib.nixosSystem { - modules = [ ./host/desktop/Configuration.nix ]; + modules = [ + ./host/desktop/Configuration.nix + ./module/AmdGpu.nix + ./module/Common.nix + ./module/DockerRootless.nix + ./module/Flatpak.nix + ./module/Gnome.nix + ./module/PowersaveAmd.nix + ./module/Print.nix + ./module/Sshd.nix + ./module/Voronind.nix + ]; specialArgs.inputs = inputs; system = "x86_64-linux"; }; + nixosConfigurations.home = nixpkgs.lib.nixosSystem { - modules = [ ./host/home/Configuration.nix ]; + modules = [ + ./host/home/Configuration.nix + ./module/AmdGpu.nix + ./module/Common.nix + ./module/Docker.nix + ./module/Flatpak.nix + ./module/Ftpd.nix + ./module/Gnome.nix + ./module/PowersaveAmd.nix + ./module/Sshd.nix + ./module/Voronind.nix + ]; specialArgs.inputs = inputs; system = "x86_64-linux"; }; + nixosConfigurations.laptop = nixpkgs.lib.nixosSystem { - modules = [ ./host/laptop/Configuration.nix ]; + modules = [ + ./host/laptop/Configuration.nix + ./module/AmdGpu.nix + ./module/Common.nix + ./module/Dasha.nix + ./module/DockerRootless.nix + ./module/Flatpak.nix + ./module/Gnome.nix + ./module/PowersaveAmd.nix + ./module/Print.nix + ./module/Sshd.nix + ./module/Voronind.nix + ]; specialArgs.inputs = inputs; system = "x86_64-linux"; }; + nixosConfigurations.work = nixpkgs.lib.nixosSystem { - modules = [ ./host/work/Configuration.nix ]; + modules = [ + ./host/work/Configuration.nix + ./module/Common.nix + ./module/DockerRootless.nix + ./module/Flatpak.nix + ./module/Gnome.nix + ./module/PowersaveIntel.nix + ./module/Powerlimit.nix + ./module/Print.nix + ./module/Sshd.nix + ./module/Voronind.nix + ]; specialArgs.inputs = inputs; system = "x86_64-linux"; }; diff --git a/.config/linux/system/host/dasha/Configuration.nix b/.config/linux/system/host/dasha/Configuration.nix index e33a39b..fa2b6d8 100644 --- a/.config/linux/system/host/dasha/Configuration.nix +++ b/.config/linux/system/host/dasha/Configuration.nix @@ -4,15 +4,6 @@ imports = [ ./HardwareConfiguration.nix ./Tablet.nix - ../../module/Common.nix - ../../module/PowersaveIntel.nix - ../../module/AmdGpu.nix - ../../module/Print.nix - ../../module/Gnome.nix - ../../module/Dasha.nix - ../../module/Flatpak.nix - ../../module/DockerRootless.nix - ../../module/Sshd.nix ]; # Network. diff --git a/.config/linux/system/host/desktop/Configuration.nix b/.config/linux/system/host/desktop/Configuration.nix index cba609a..e80cb9f 100644 --- a/.config/linux/system/host/desktop/Configuration.nix +++ b/.config/linux/system/host/desktop/Configuration.nix @@ -3,15 +3,6 @@ { imports = [ ./HardwareConfiguration.nix - ../../module/Common.nix - ../../module/PowersaveAmd.nix - ../../module/AmdGpu.nix - ../../module/Print.nix - ../../module/Gnome.nix - ../../module/Voronind.nix - ../../module/Flatpak.nix - ../../module/DockerRootless.nix - ../../module/Sshd.nix ]; # Network. diff --git a/.config/linux/system/host/home/Configuration.nix b/.config/linux/system/host/home/Configuration.nix index 4be1eee..15e2df1 100644 --- a/.config/linux/system/host/home/Configuration.nix +++ b/.config/linux/system/host/home/Configuration.nix @@ -7,15 +7,6 @@ ./Nextcloud.nix ./PhotosProcess.nix ./YandexMusic.nix - ../../module/Common.nix - ../../module/Flatpak.nix - ../../module/Voronind.nix - ../../module/Gnome.nix - ../../module/Ftpd.nix - ../../module/PowersaveAmd.nix - ../../module/AmdGpu.nix - ../../module/Docker.nix - ../../module/Sshd.nix ]; # Network. diff --git a/.config/linux/system/host/laptop/Configuration.nix b/.config/linux/system/host/laptop/Configuration.nix index d1b0ac7..af35ef0 100644 --- a/.config/linux/system/host/laptop/Configuration.nix +++ b/.config/linux/system/host/laptop/Configuration.nix @@ -4,16 +4,6 @@ imports = [ ./HardwareConfiguration.nix # ./MsiKeyboard.nix - ../../module/Common.nix - ../../module/AmdGpu.nix - ../../module/PowersaveAmd.nix - ../../module/Print.nix - ../../module/Gnome.nix - ../../module/Voronind.nix - ../../module/Dasha.nix - ../../module/Flatpak.nix - ../../module/DockerRootless.nix - ../../module/Sshd.nix ]; # Network. diff --git a/.config/linux/system/host/work/Configuration.nix b/.config/linux/system/host/work/Configuration.nix index ef49d07..d7f5a28 100644 --- a/.config/linux/system/host/work/Configuration.nix +++ b/.config/linux/system/host/work/Configuration.nix @@ -4,15 +4,6 @@ imports = [ ./HardwareConfiguration.nix ./Fprint.nix - ../../module/Common.nix - ../../module/PowersaveIntel.nix - ../../module/Powerlimit.nix - ../../module/Print.nix - ../../module/Gnome.nix - ../../module/Voronind.nix - ../../module/Flatpak.nix - ../../module/DockerRootless.nix - ../../module/Sshd.nix ]; # Network.