move write-text submodule

6 files changed, 5 insertions, 60 deletions

diff --git a/modules/programs/tmux.nix b/modules/programs/tmux.nix
index 259a204..524b307 100644
--- a/modules/programs/tmux.nix
+++ b/modules/programs/tmux.nix
@@ -22,7 +22,7 @@ let
         --add-flags -f --add-flags /etc/tmux.conf
     '';
 
-  text = import ../system/write-text.nix {
+  text = import ../lib/write-text.nix {
     inherit lib;
     mkTextDerivation = name: text: pkgs.writeText "tmux-options-${name}" text;
   };
diff --git a/modules/programs/vim.nix b/modules/programs/vim.nix
index 3319c91..67b557d 100644
--- a/modules/programs/vim.nix
+++ b/modules/programs/vim.nix
@@ -12,7 +12,7 @@ let
     vimrcConfig.vam.pluginDictionaries = cfg.plugins;
   };
 
-  text = import ../system/write-text.nix {
+  text = import ../lib/write-text.nix {
     inherit lib;
     mkTextDerivation = name: text: pkgs.writeText "vim-options-${name}" text;
   };
diff --git a/modules/system/activation-scripts.nix b/modules/system/activation-scripts.nix
index 209b758..4e24098 100644
--- a/modules/system/activation-scripts.nix
+++ b/modules/system/activation-scripts.nix
@@ -8,7 +8,7 @@ let
 
   cfg = config.system;
 
-  script = import ./write-text.nix {
+  script = import ../lib/write-text.nix {
     inherit lib;
     mkTextDerivation = name: text: pkgs.writeScript "activate-${name}" text;
   };
diff --git a/modules/system/etc.nix b/modules/system/etc.nix
index 4ac4a0d..4b92dc0 100644
--- a/modules/system/etc.nix
+++ b/modules/system/etc.nix
@@ -4,7 +4,7 @@ with lib;
 
 let
 
-  text = import ./write-text.nix {
+  text = import ../lib/write-text.nix {
     inherit lib;
     mkTextDerivation = name: text: pkgs.writeText "etc-${name}" text;
   };
diff --git a/modules/system/launchd.nix b/modules/system/launchd.nix
index 4083353..a79c0dd 100644
--- a/modules/system/launchd.nix
+++ b/modules/system/launchd.nix
@@ -6,7 +6,7 @@ let
 
   cfg = config.system;
 
-  text = import ../system/write-text.nix {
+  text = import ../lib/write-text.nix {
     inherit lib;
     mkTextDerivation = pkgs.writeText;
   };
diff --git a/modules/system/write-text.nix b/modules/system/write-text.nix
deleted file mode 100644
index 4ffc081..0000000
--- a/modules/system/write-text.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ lib, mkTextDerivation }:
-
-{ config, name, ... }:
-
-with lib;
-
-let
-
-  sourceDrv = mkTextDerivation name config.text;
-
-in
-
-{
-  options = {
-
-    enable = mkOption {
-      type = types.bool;
-      default = true;
-      description = ''
-        Whether this file should be generated.
-        This option allows specific files to be disabled.
-      '';
-    };
-
-    text = mkOption {
-      type = types.lines;
-      default = "";
-      description = ''
-        Text of the file.
-      '';
-    };
-
-    target = mkOption {
-      type = types.str;
-      default = name;
-      description = ''
-        Name of symlink.  Defaults to the attribute name.
-      '';
-    };
-
-    source = mkOption {
-      type = types.path;
-      description = ''
-        Path of the source file.
-      '';
-    };
-
-  };
-
-  config = {
-
-    source = mkIf (config.text != "") (mkDefault sourceDrv);
-
-  };
-}