From 574ae92a43206717f61f105bfb5bebc937800ed9 Mon Sep 17 00:00:00 2001 From: Matt Sturgeon Date: Tue, 22 Oct 2024 09:08:37 +0100 Subject: [PATCH] wrappers/modules: move `enable` to `shared.nix` We may end up having additional "shared" options and/or config. --- wrappers/modules/darwin.nix | 2 +- wrappers/modules/enable.nix | 4 ---- wrappers/modules/hm.nix | 2 +- wrappers/modules/nixos.nix | 2 +- wrappers/modules/shared.nix | 6 ++++++ 5 files changed, 9 insertions(+), 7 deletions(-) delete mode 100644 wrappers/modules/enable.nix create mode 100644 wrappers/modules/shared.nix diff --git a/wrappers/modules/darwin.nix b/wrappers/modules/darwin.nix index 454c45fd..0a497b61 100644 --- a/wrappers/modules/darwin.nix +++ b/wrappers/modules/darwin.nix @@ -1,3 +1,3 @@ { - imports = [ ./enable.nix ]; + imports = [ ./shared.nix ]; } diff --git a/wrappers/modules/enable.nix b/wrappers/modules/enable.nix deleted file mode 100644 index e9ac581e..00000000 --- a/wrappers/modules/enable.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ lib, ... }: -{ - options.enable = lib.mkEnableOption "nixvim"; -} diff --git a/wrappers/modules/hm.nix b/wrappers/modules/hm.nix index 3d4dac35..baa8353c 100644 --- a/wrappers/modules/hm.nix +++ b/wrappers/modules/hm.nix @@ -12,7 +12,7 @@ }; }; - imports = [ ./enable.nix ]; + imports = [ ./shared.nix ]; config = { wrapRc = lib.mkOptionDefault false; diff --git a/wrappers/modules/nixos.nix b/wrappers/modules/nixos.nix index 24037ad9..c1e14607 100644 --- a/wrappers/modules/nixos.nix +++ b/wrappers/modules/nixos.nix @@ -4,5 +4,5 @@ defaultEditor = lib.mkEnableOption "nixvim as the default editor"; }; - imports = [ ./enable.nix ]; + imports = [ ./shared.nix ]; } diff --git a/wrappers/modules/shared.nix b/wrappers/modules/shared.nix new file mode 100644 index 00000000..3b9ace88 --- /dev/null +++ b/wrappers/modules/shared.nix @@ -0,0 +1,6 @@ +{ lib, ... }: +{ + options = { + enable = lib.mkEnableOption "nixvim"; + }; +}