From 34bbd0ded16283a874d586bba318a512795e3aee Mon Sep 17 00:00:00 2001
From: Nikita Uvarov <uv.nikita@gmail.com>
Date: Sat, 20 Oct 2018 10:54:44 +0200
Subject: [PATCH] vim: remove deprecated options

---
 modules/programs/vim.nix | 51 ++++------------------------------------
 1 file changed, 4 insertions(+), 47 deletions(-)

diff --git a/modules/programs/vim.nix b/modules/programs/vim.nix
index 99dde760d..86c6910ec 100644
--- a/modules/programs/vim.nix
+++ b/modules/programs/vim.nix
@@ -62,27 +62,6 @@ in
     programs.vim = {
       enable = mkEnableOption "Vim";
 
-      lineNumbers = mkOption {
-        type = types.nullOr types.bool;
-        default = null;
-        description = ''
-          Whether to show line numbers. DEPRECATED: Use
-          <varname>programs.vim.settings.number</varname>.
-        '';
-      };
-
-      tabSize = mkOption {
-        type = types.nullOr types.int;
-        default = null;
-        example = 4;
-        description = ''
-          Set tab size and shift width to a specified number of
-          spaces. DEPRECATED: Use
-          <varname>programs.vim.settings.tabstop</varname> and
-          <varname>programs.vim.settings.shiftwidth</varname>.
-        '';
-      };
-
       plugins = mkOption {
         type = types.listOf types.str;
         default = defaultPlugins;
@@ -163,31 +142,9 @@ in
         ];
       };
 
-    in mkIf cfg.enable (mkMerge [
-      {
-        programs.vim.package = vim;
-        home.packages = [ cfg.package ];
-      }
-
-      (mkIf (cfg.lineNumbers != null) {
-        warnings = [
-          ("'programs.vim.lineNumbers' is deprecated, "
-            + "use 'programs.vim.settings.number'")
-        ];
-
-        programs.vim.settings.number = cfg.lineNumbers;
-      })
-
-      (mkIf (cfg.tabSize != null) {
-        warnings = [
-          ("'programs.vim.tabSize' is deprecated, use "
-            + "'programs.vim.settings.tabstop' and "
-            + "'programs.vim.settings.shiftwidth'")
-        ];
-
-        programs.vim.settings.tabstop = cfg.tabSize;
-        programs.vim.settings.shiftwidth = cfg.tabSize;
-      })
-    ])
+    in mkIf cfg.enable {
+      programs.vim.package = vim;
+      home.packages = [ cfg.package ];
+    }
   );
 }