Compare commits

...

11 commits

Author SHA1 Message Date
haskex
23e40da9a4 remove temp file and add changelog 2025-05-17 12:08:24 -03:00
haskex
ab991a7e57 Merge branch 'main' into imgclip 2025-05-17 12:04:51 -03:00
haskex
1643b5262b Fixing conflits 2025-05-17 12:04:44 -03:00
raf
4399a05a46
Merge pull request #904 from rice-cracker-dev/deprecate-scrolloffset
Some checks are pending
Set up binary cache / cachix (default) (push) Waiting to run
Set up binary cache / cachix (maximal) (push) Waiting to run
Set up binary cache / cachix (nix) (push) Waiting to run
Treewide Checks / Validate flake (push) Waiting to run
Treewide Checks / Check formatting (push) Waiting to run
Treewide Checks / Check source tree for typos (push) Waiting to run
Treewide Checks / Validate documentation builds (push) Waiting to run
Treewide Checks / Validate hyperlinks in documentation sources (push) Waiting to run
Treewide Checks / Validate Editorconfig conformance (push) Waiting to run
Build and deploy documentation / Check latest commit (push) Waiting to run
Build and deploy documentation / publish (push) Blocked by required conditions
basic: deprecate vim.scrollOffset
2025-05-17 08:03:38 +03:00
rice-cracker-dev
6d1b7ec094 docs: deprecate vim.scrollOffset 2025-05-17 11:53:39 +07:00
rice-cracker-dev
a0905ee428 basic: deprecate scrollOffset 2025-05-17 11:46:43 +07:00
raf
a595233c46
Merge pull request #899 from haskex/solarized-osaka
themes/solarized-osaka: init
2025-05-17 05:01:37 +03:00
Jhuan Nycolas
35b888c00d
Merge branch 'main' into solarized-osaka 2025-05-16 10:24:08 -03:00
haskex
fde3dfbabd Adding changelog, and test again 2025-05-15 10:07:31 -03:00
Jhuan Nycolas
8f87f05b45
Merge branch 'NotAShelf:main' into solarized-osaka 2025-05-15 09:14:33 -03:00
haskex
3dcd8c796e themes/solarized-osaka: init 2025-05-14 22:01:05 -03:00
5 changed files with 33 additions and 9 deletions

View file

@ -308,6 +308,7 @@
`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,6 +396,10 @@
[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

View file

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

View file

@ -6,11 +6,10 @@
inherit (lib.options) mkOption mkEnableOption literalMD;
inherit (lib.strings) optionalString;
inherit (lib.attrsets) optionalAttrs;
inherit (lib.types) enum bool str int either;
inherit (lib.types) enum bool str 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;
@ -22,12 +21,6 @@ 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;

View file

@ -212,4 +212,17 @@ 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")
'';
};
}

View file

@ -2248,6 +2248,19 @@
"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": {