From 4773f8d79a3074f00d050b0d32cf4ee026773cd3 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Thu, 22 Aug 2024 20:56:58 +0200 Subject: [PATCH] really switching to lix now --- flake.nix | 4 +--- hosts/default.nix | 8 +------- modules/system/nix/module.nix | 8 +++++++- parts/default.nix | 7 +++++++ 4 files changed, 16 insertions(+), 11 deletions(-) create mode 100644 parts/default.nix diff --git a/flake.nix b/flake.nix index 0629800..3724c82 100644 --- a/flake.nix +++ b/flake.nix @@ -4,9 +4,7 @@ inputs.flake-parts.lib.mkFlake {inherit inputs;} ({withSystem, ...}: { systems = ["x86_64-linux"]; imports = [ - # inputs.treefmt-nix.flakeModule - ./parts/shell.nix - # ./parts/fmt.nix + ./parts ]; flake = { diff --git a/hosts/default.nix b/hosts/default.nix index 2d97b82..6d5ed71 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -39,13 +39,6 @@ in { ../modules inputs.home-manager.nixosModules.home-manager inputs.lix-module.nixosModules.default - { - imports = [inputs.impurity.nixosModules.impurity]; - impurity = { - enable = true; - configRoot = self; - }; - } ]; }; @@ -56,6 +49,7 @@ in { ./vali/hermit ../modules inputs.home-manager.nixosModules.home-manager + # inputs.lix-module.nixosModules.default inputs.nixos-hardware.nixosModules.dell-xps-15-7590-nvidia ]; }; diff --git a/modules/system/nix/module.nix b/modules/system/nix/module.nix index 30d16df..fdd101e 100644 --- a/modules/system/nix/module.nix +++ b/modules/system/nix/module.nix @@ -1,9 +1,15 @@ # credits to raf -{pkgs, ...}: { +{ + inputs, + pkgs, + ... +}: { imports = [ ./documentation.nix # nixos documentation ./nixpkgs.nix # global nixpkgs configuration.nix ./registry.nix + + inputs.lix-module.nixosModules.default ]; nix = { diff --git a/parts/default.nix b/parts/default.nix new file mode 100644 index 0000000..7d1398d --- /dev/null +++ b/parts/default.nix @@ -0,0 +1,7 @@ +_: { + imports = [ + # ./fmt.nix + ./shell.nix + ./templates + ]; +}