configuration.nix

@@ -199,7 +199,6 @@ isMaximal: {
       };
       images = {
         image-nvim.enable = false;
-        img-clip.enable = isMaximal;
       };
     };
 

docs/release-notes/rl-0.8.md

@@ -308,7 +308,6 @@
   `vim.diagnostics.nvim-lint.linters.*.required_files`.
 - Add global function `nvf_lint` under
   `vim.diagnostics.nvim-lint.lint_function`.
-- Deprecate `vim.scrollOffset` in favor of `vim.options.scrolloff`.
 
 [Sc3l3t0n](https://github.com/Sc3l3t0n):
 
@@ -395,15 +394,3 @@
 
 - Add `rubylsp` option in `vim.languages.ruby.lsp.server` to use shopify's
   ruby-lsp language server
-
-[Haskex](https://github.com/haskex):
-
-[solarized-osaka.nvim]: https://github.com/craftzdog/solarized-osaka.nvim
-
-- Add [solarized-osaka.nvim] theme
-
-[img-clip.nvim]: https://github.com/hakonharnes/img-clip.nvim
-
-- Add [img-clip.nvim] plugin in `vim.utility.images.img-clip` with `enable` and
-  `setupOpts`
-- Add `vim.utility.images.img-clip.enable = isMaximal` in configuration.nix

modules/extra/deprecations.nix

@@ -18,7 +18,7 @@
     showSignColumn = "signcolumn";
 
     # 2025-02-07
-    scrollOffset = "scrolloff";
+    scrollOff = "scrolloff";
   };
 in {
   imports = concatLists [

modules/neovim/init/basic.nix

@@ -6,10 +6,11 @@
   inherit (lib.options) mkOption mkEnableOption literalMD;
   inherit (lib.strings) optionalString;
   inherit (lib.attrsets) optionalAttrs;
-  inherit (lib.types) enum bool str either;
+  inherit (lib.types) enum bool str int either;
   inherit (lib.generators) mkLuaInline;
   inherit (lib.nvim.dag) entryAfter;
   inherit (lib.nvim.binds) pushDownDefault;
+  inherit (lib.nvim.lua) toLuaObject;
   inherit (lib.nvim.types) luaInline;
 
   cfg = config.vim;
@@ -21,6 +22,12 @@ in {
       description = "Hide search highlight so it doesn't stay highlighted";
     };
 
+    scrollOffset = mkOption {
+      type = int;
+      default = 8;
+      description = "Start scrolling this number of lines from the top or bottom of the page.";
+    };
+
     syntaxHighlighting = mkOption {
       type = bool;
       default = !config.vim.treesitter.highlight.enable;

modules/plugins/theme/supported-themes.nix

@@ -212,17 +212,4 @@ in {
     '';
     styles = ["dark" "light" "dark_dimmed" "dark_default" "light_default" "dark_high_contrast" "light_high_contrast" "dark_colorblind" "light_colorblind" "dark_tritanopia" "light_tritanopia"];
   };
-  solarized-osaka = {
-    setup = {transparent ? false, ...}: ''
-      require("solarized-osaka").setup({
-        transparent = ${boolToString transparent},
-        styles = {
-          comments = { italic = false },
-          keywords = { italic = false },
-        }
-      })
-
-      vim.cmd.colorscheme("solarized-osaka")
-    '';
-  };
 }

modules/plugins/utility/images/default.nix

@@ -1,6 +1,5 @@
 {
   imports = [
     ./image-nvim
-    ./img-clip
   ];
 }

modules/plugins/utility/images/img-clip/config.nix

@@ -1,23 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  inherit (lib.modules) mkIf;
-  inherit (lib.nvim.dag) entryAnywhere;
-  inherit (lib.nvim.lua) toLuaObject;
-
-  cfg = config.vim.utility.images.img-clip;
-in {
-  config = mkIf cfg.enable {
-    vim = {
-      startPlugins = [
-        "img-clip"
-      ];
-
-      pluginRC.image-nvim = entryAnywhere ''
-        require("img-clip").setup(${toLuaObject cfg.setupOpts})
-      '';
-    };
-  };
-}

modules/plugins/utility/images/img-clip/default.nix

@@ -1,6 +0,0 @@
-{
-  imports = [
-    ./config.nix
-    ./img-clip.nix
-  ];
-}

modules/plugins/utility/images/img-clip/img-clip.nix

@@ -1,11 +0,0 @@
-{lib, ...}: let
-  inherit (lib.options) mkEnableOption;
-
-  inherit (lib.nvim.types) mkPluginSetupOption;
-in {
-  options.vim.utility.images.img-clip = {
-    enable = mkEnableOption "img-clip to paste images into any markup language";
-
-    setupOpts = mkPluginSetupOption "img-clip" {};
-  };
-}

npins/sources.json

@@ -705,19 +705,6 @@
       "url": "https://github.com/3rd/image.nvim/archive/4c51d6202628b3b51e368152c053c3fb5c5f76f2.tar.gz",
       "hash": "16s1wsy9k72qiqzvwij67j2jzwgi6ggl6lhx9p6lfw8dpps3ayxg"
     },
-    "img-clip": {
-      "type": "Git",
-      "repository": {
-        "type": "GitHub",
-        "owner": "hakonharnes",
-        "repo": "img-clip.nvim"
-      },
-      "branch": "main",
-      "submodules": false,
-      "revision": "08a02e14c8c0d42fa7a92c30a98fd04d6993b35d",
-      "url": "https://github.com/hakonharnes/img-clip.nvim/archive/08a02e14c8c0d42fa7a92c30a98fd04d6993b35d.tar.gz",
-      "hash": "0ani8z5pkvqmmalzcgyj27rfhqs76ivmpq79xn8rsdyy5a5fy979"
-    },
     "indent-blankline-nvim": {
       "type": "Git",
       "repository": {
@@ -882,7 +869,6 @@
         "repo": "markview.nvim"
       },
       "branch": "main",
-      "submodules": false,
       "revision": "6c92a6455e97c954a4a419265a032fedd69846f6",
       "url": "https://github.com/OXY2DEV/markview.nvim/archive/6c92a6455e97c954a4a419265a032fedd69846f6.tar.gz",
       "hash": "01sw4iscnciyifpba4cwjb6fs95wrkk60xvqq67b8d5j8yb5449a"
@@ -2248,19 +2234,6 @@
       "url": "https://api.github.com/repos/folke/snacks.nvim/tarball/v2.22.0",
       "hash": "1hbm4fnw51qdp0nz83fcxbvnxjq2k57a37w6dp0wz6wkcx7cwxw9"
     },
-    "solarized-osaka": {
-      "type": "Git",
-      "repository": {
-        "type": "GitHub",
-        "owner": "craftzdog",
-        "repo": "solarized-osaka.nvim"
-      },
-      "branch": "main",
-      "submodules": false,
-      "revision": "f796014c14b1910e08d42cc2077fef34f08e0295",
-      "url": "https://github.com/craftzdog/solarized-osaka.nvim/archive/f796014c14b1910e08d42cc2077fef34f08e0295.tar.gz",
-      "hash": "0jy2hk4fc210jih30ybvisr9pliya1s3nazw4d131vh5k4p1xqi6"
-    },
     "sqls-nvim": {
       "type": "Git",
       "repository": {