diff options
| author | Franck Cuny <franck@fcuny.net> | 2022-04-05 17:02:58 -0700 |
|---|---|---|
| committer | Franck Cuny <franck@fcuny.net> | 2022-04-05 17:02:58 -0700 |
| commit | e69ed57ab173b558c3e8bcdb3cbc228fc7ccbc3a (patch) | |
| tree | 2334080d13341b3af19671ec94dd518d97f55959 | |
| parent | sound: add a new module (diff) | |
| download | world-e69ed57ab173b558c3e8bcdb3cbc228fc7ccbc3a.tar.gz | |
nix: refactor to a module
| -rw-r--r-- | hosts/common/system/default.nix | 1 | ||||
| -rw-r--r-- | modules/default.nix | 2 | ||||
| -rw-r--r-- | modules/system/default.nix | 1 | ||||
| -rw-r--r-- | modules/system/nix/default.nix (renamed from hosts/common/system/nix.nix) | 6 |
4 files changed, 4 insertions, 6 deletions
diff --git a/hosts/common/system/default.nix b/hosts/common/system/default.nix index f519766..2e34ede 100644 --- a/hosts/common/system/default.nix +++ b/hosts/common/system/default.nix @@ -6,7 +6,6 @@ ./hardware.nix ./locale.nix ./network.nix - ./nix.nix ./security.nix ./software.nix ./ssh.nix diff --git a/modules/default.nix b/modules/default.nix index 5ec7ef8..189a313 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1 +1 @@ -{ ... }: { imports = [ ./hardware ]; } +{ ... }: { imports = [ ./hardware ./system ]; } diff --git a/modules/system/default.nix b/modules/system/default.nix new file mode 100644 index 0000000..94ac438 --- /dev/null +++ b/modules/system/default.nix @@ -0,0 +1 @@ +{ ... }: { imports = [ ./nix ]; } diff --git a/hosts/common/system/nix.nix b/modules/system/nix/default.nix index 48379a4..2ad20c3 100644 --- a/hosts/common/system/nix.nix +++ b/modules/system/nix/default.nix @@ -1,7 +1,5 @@ -{ lib, pkgs, ... }: - -{ - # Enable flakes and new 'nix' command +# Nix related settings +{ lib, pkgs, ... }: { nix = { package = pkgs.nixFlakes; extraOptions = '' |