From ecd400304ffcc7884563ee261aefb8349740a2c8 Mon Sep 17 00:00:00 2001 From: Ahmad Raza Date: Sun, 15 Nov 2026 22:59:00 +0500 Subject: [PATCH 01/18] fix: remove redundant plugin --- modules/plugins/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/plugins/default.nix b/modules/plugins/default.nix index 4569a16..d5010e7 100644 --- a/modules/plugins/default.nix +++ b/modules/plugins/default.nix @@ -37,7 +37,6 @@ git-conflict.enable = true; grug-far.enable = true; lsp.enable = true; - lsp-signature.enable = true; lsp-status.enable = true; lualine.enable = true; luasnip.enable = true; From ba49a87bc5fb2d3ee856aed525fc483a08d2909e Mon Sep 17 00:00:00 2001 From: Ahmad Raza Date: Sun, 15 Nov 2026 23:02:05 +0500 Subject: [PATCH 02/18] fix: swap to right for consistent editor view --- modules/plugins/edgy.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/plugins/edgy.nix b/modules/plugins/edgy.nix index bd3b8b7..132c3c7 100644 --- a/modules/plugins/edgy.nix +++ b/modules/plugins/edgy.nix @@ -51,7 +51,7 @@ _: { } ]; - left = let + right = let size = { width = 0.15; }; From 688a41e87c673c7b3b8d65043963da7ec43a66a0 Mon Sep 17 00:00:00 2001 From: Ahmad Raza Date: Sun, 15 Nov 2026 23:07:53 +0500 Subject: [PATCH 03/18] chore: added todos --- modules/plugins/lualine.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/plugins/lualine.nix b/modules/plugins/lualine.nix index 006da5e..f9ac9e0 100644 --- a/modules/plugins/lualine.nix +++ b/modules/plugins/lualine.nix @@ -20,7 +20,9 @@ _: { ]; lualine_x = [ + # TODO: Recording indicator "diagnostics" + # FIXME: Replace with Lsp Status { __unkeyed-1 = { __raw = '' From f92ce46f1de99fda3c383b61cb7fe75252046ffc Mon Sep 17 00:00:00 2001 From: Ahmad Raza Date: Mon, 16 Nov 2026 15:18:58 +0500 Subject: [PATCH 04/18] feat: added key for toggle inlay hints --- modules/keys/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/keys/default.nix b/modules/keys/default.nix index 4dacf6d..4d7070c 100644 --- a/modules/keys/default.nix +++ b/modules/keys/default.nix @@ -23,6 +23,7 @@ _: { Snacks.toggle.diagnostics():map('c.d') Snacks.toggle.treesitter():map('c.t') Snacks.toggle.indent():map('ui') + Snacks.toggle.inlay_hints():map('uh') Snacks.toggle.option('relativenumber', { name = 'Relative Number' }):map('un') ''; } From 3d96bf3a1efc5d2255008ed076005140ac88bf14 Mon Sep 17 00:00:00 2001 From: Ahmad Raza Date: Mon, 16 Nov 2026 16:09:24 +0500 Subject: [PATCH 05/18] docs: added todo orgfile --- todo.org | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 todo.org diff --git a/todo.org b/todo.org new file mode 100644 index 0000000..8bf2bc2 --- /dev/null +++ b/todo.org @@ -0,0 +1,3 @@ +#+title: Opinionated Nixvim Configuration +#+author: Ahmad Raza +#+filetags: :todo: From d9cc5d29a50bb471c8685c0d66794ba02f2d5720 Mon Sep 17 00:00:00 2001 From: Ahmad Raza Date: Mon, 16 Nov 2026 16:43:06 +0500 Subject: [PATCH 06/18] feat: added recording indicator --- modules/plugins/lualine.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/modules/plugins/lualine.nix b/modules/plugins/lualine.nix index f9ac9e0..9925a23 100644 --- a/modules/plugins/lualine.nix +++ b/modules/plugins/lualine.nix @@ -20,8 +20,19 @@ _: { ]; lualine_x = [ - # TODO: Recording indicator "diagnostics" + { + __unkeyed-1 = { + __raw = '' + function() + local reg = vim.fn.reg_recording() + return (reg ~= "" and reg) or "" + end + ''; + }; + + icon = "⏺️"; + } # FIXME: Replace with Lsp Status { __unkeyed-1 = { From 055e3c4e25552fb96bc9d597a49431387677382c Mon Sep 17 00:00:00 2001 From: Ahmad Raza Date: Mon, 16 Nov 2026 17:35:55 +0500 Subject: [PATCH 07/18] feat: use `lsp-status` for lsp status line --- modules/plugins/lualine.nix | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/modules/plugins/lualine.nix b/modules/plugins/lualine.nix index 9925a23..10e5099 100644 --- a/modules/plugins/lualine.nix +++ b/modules/plugins/lualine.nix @@ -33,28 +33,18 @@ _: { icon = "⏺️"; } - # FIXME: Replace with Lsp Status { __unkeyed-1 = { __raw = '' function() - local msg = "" - local buf_ft = vim.bo[0].filetype - local clients = vim.lsp.get_clients({ bufnr = 0 }) - if next(clients) == nil then - return msg - end - for _, client in ipairs(clients) do - local filetypes = client.config.filetypes - if filetypes and vim.fn.index(filetypes, buf_ft) ~= -1 then - return client.name - end - end - return msg + local ok, status = pcall(function () + return require('lsp-status').status() + end) + + return (ok and status) or "" end ''; }; - icon = "  "; } "encoding" "fileformat" From cfb5a8f0d17388aea2db4d0802cf722312eba1bc Mon Sep 17 00:00:00 2001 From: Ahmad Raza Date: Mon, 16 Nov 2026 17:36:21 +0500 Subject: [PATCH 08/18] fix: yalms module --- modules/xtras/yalms.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/xtras/yalms.nix b/modules/xtras/yalms.nix index 52d7c9e..316d718 100644 --- a/modules/xtras/yalms.nix +++ b/modules/xtras/yalms.nix @@ -7,7 +7,7 @@ cfg = config; in { imports = [ - inputs.orgnomics.nixvimModules.orgnomics + inputs.yalms.nixvimModules.yalms ]; options.nv.xtras.yalms.enable = lib.mkOption { @@ -17,6 +17,6 @@ in { }; config = lib.mkIf cfg.nv.xtras.yalms.enable { - plugins.orgnomics.enable = true; + plugins.yalms.enable = true; }; } From 4f53cd95107aa0f041edae30b8552dc74ec35ae8 Mon Sep 17 00:00:00 2001 From: Ahmad Raza Date: Mon, 16 Nov 2026 17:36:41 +0500 Subject: [PATCH 09/18] feat(langs/astro): enable web by default with astro --- modules/langs/astro.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/langs/astro.nix b/modules/langs/astro.nix index 7ee3744..ab66498 100644 --- a/modules/langs/astro.nix +++ b/modules/langs/astro.nix @@ -15,6 +15,8 @@ in { }; config = lib.mkIf config.nv.langs.astro.enable { + nv.langs.web.enable = lib.mkDefault true; + lsp.servers = { astro = { enable = true; From 581ac88fd2dd4428dbb4eae89131b1ea3362fa62 Mon Sep 17 00:00:00 2001 From: Ahmad Raza Date: Mon, 16 Nov 2026 17:36:58 +0500 Subject: [PATCH 10/18] feat(langs/cpp): enable make by default with cpp --- modules/langs/cpp.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/langs/cpp.nix b/modules/langs/cpp.nix index ff03a42..2004ed9 100644 --- a/modules/langs/cpp.nix +++ b/modules/langs/cpp.nix @@ -16,6 +16,7 @@ config = lib.mkIf config.nv.langs.cpp.enable { lsp.servers.clangd.enable = true; + nv.langs.make.enable = lib.mkDefault true; plugins.treesitter.grammarPackages = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [ c From d73760a18819c80dd3340e6744973593fa739748 Mon Sep 17 00:00:00 2001 From: Ahmad Raza Date: Mon, 16 Nov 2026 17:37:22 +0500 Subject: [PATCH 11/18] chore: organize code --- modules/langs/web.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/langs/web.nix b/modules/langs/web.nix index bda0ff5..8a30221 100644 --- a/modules/langs/web.nix +++ b/modules/langs/web.nix @@ -22,10 +22,10 @@ in { config = lib.mkIf config.nv.langs.web.enable { nv = { langs = { + css.enable = true; javascript.enable = true; sql.enable = true; xml.enable = true; - css.enable = true; }; }; From 343a02a8a722e239880afc711b43e5f3f5337b85 Mon Sep 17 00:00:00 2001 From: Ahmad Raza Date: Mon, 16 Nov 2026 17:37:52 +0500 Subject: [PATCH 12/18] fix: enable orgnomics by default with orgmode --- modules/xtras/orgmode.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/xtras/orgmode.nix b/modules/xtras/orgmode.nix index 0617433..1644bf9 100644 --- a/modules/xtras/orgmode.nix +++ b/modules/xtras/orgmode.nix @@ -1,9 +1,13 @@ { config, + inputs, lib, ... }: { - imports = [./yalms.nix]; + imports = [ + ./yalms.nix + inputs.orgnomics.nixvimModules.orgnomics + ]; options.nv.xtras.orgmode.enable = lib.mkOption { type = lib.types.bool; From 1c45b4cba3b7e807f36c800b02fc4a9238cabad8 Mon Sep 17 00:00:00 2001 From: Ahmad Raza Date: Mon, 16 Nov 2026 17:38:32 +0500 Subject: [PATCH 13/18] feat: provided `nv.langs.enableAll` to enable all langs --- modules/langs/default.nix | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/modules/langs/default.nix b/modules/langs/default.nix index ce9f002..9407265 100644 --- a/modules/langs/default.nix +++ b/modules/langs/default.nix @@ -1,4 +1,8 @@ -_: { +{ + config, + lib, + ... +}: { imports = [ ./astro.nix ./cpp.nix @@ -15,4 +19,18 @@ _: { ./web.nix ./xml.nix ]; + + options.nv.langs.enableAll = lib.mkEnableOption "Enable all langs!"; + config = lib.mkIf config.nv.langs.enableAll { + nv.langs = { + astro.enable = true; # astro + web + xml + cpp.enable = true; # c/c++ + make + docker.enable = true; + dotnet.enable = true; + mjml.enable = true; + python.enable = true; + svelte.enable = true; + rust.enable = true; + }; + }; } From 228fe0f18525b33d46f3814849620da1b8f184d3 Mon Sep 17 00:00:00 2001 From: Ahmad Raza Date: Mon, 16 Nov 2026 17:39:08 +0500 Subject: [PATCH 14/18] feat: introduce prebuilt variants --- README.md | 15 ++++++++++++++ flake.lock | 6 +++--- flake.nix | 57 ++++++++++++++++++++++++++++++++++++++---------------- 3 files changed, 58 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 09d84ec..c06504d 100644 --- a/README.md +++ b/README.md @@ -97,6 +97,21 @@ A common use case is adding it to development flakes for a personalized editing } ``` +### Variants + +While it is easy to build your own configs using options, two additional variants are available +from the flake for convenience. + +#### Langed (All Languages) + +Langed comes with all supported languages enabled out of the box. Use it by adding `nvl` instead of +`nv` to your package set. + +#### Web + +Similar to Langed, Web comes with essential web development languages enabled out of the box. Use it +by adding `nvw` instead of `nv` to your package set. + ## Languages Several languages are supported. You can enable them by setting the diff --git a/flake.lock b/flake.lock index c7a5f6c..b770072 100644 --- a/flake.lock +++ b/flake.lock @@ -528,11 +528,11 @@ ] }, "locked": { - "lastModified": 1794460623, - "narHash": "sha256-OhxkecQDKlVcrs1KKssIzk3fY+Ksuv3jGmHWfNcX8gk=", + "lastModified": 1794831922, + "narHash": "sha256-Iz1LDwfXxj+TTmKPIjqCH7tDnybx/U6v14h8Ua3eLzQ=", "owner": "ar-at-localhost", "repo": "yalms", - "rev": "2ee65ede73558adb435eb46d53a394da5b104794", + "rev": "c6808484788b3ecec8604c7665e1db76f7dccd91", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 46195f1..3f42ce4 100644 --- a/flake.nix +++ b/flake.nix @@ -62,28 +62,45 @@ pkgs, system, ... - }: { - yalms = pkgs.vimPlugins.yalms; - default = - (inputs.nixvim.lib.evalNixvim - { - inherit system; - modules = [./modules]; - extraSpecialArgs = { - inherit inputs pkgs; - }; - }).config.build.package; + }: let + base = + inputs.nixvim.lib.evalNixvim + { + inherit system; + modules = [./modules]; + extraSpecialArgs = { + inherit inputs pkgs; + }; + }; + in { + default = base.config.build.package; + langed = + (base.extendModules { + modules = [ + { + nv.langs.enableAll = true; + } + ]; + }).config.build.package; + web = + (base.extendModules { + modules = [ + { + nv.langs.astro.enable = true; + } + ]; + }).config.build.package; }; in { apps = forEachSupportedSystem ( {pkgs, ...}: let outputs = mkOutputs pkgs; - in { - default = { + in + builtins.mapAttrs (_k: v: { type = "app"; - program = "${outputs.default}/bin/nvim"; - }; - } + program = "${v}/bin/nvim"; + }) + outputs ); devShells = forEachSupportedSystem ( @@ -103,7 +120,11 @@ ); packages = forEachSupportedSystem ( - {pkgs, ...}: mkOutputs pkgs + {pkgs, ...}: + (mkOutputs pkgs) + // { + yalms = pkgs.vimPlugins.yalms; + } ); overlays.default = nixpkgs.lib.composeManyExtensions [ @@ -114,6 +135,8 @@ outputs = mkOutputs prev; in { nv = outputs.default; + nvl = outputs.langed; + nvw = outputs.web; })) ]; From 3270b31b9eb07bf5c0b8cf7767be300e8ee21813 Mon Sep 17 00:00:00 2001 From: Ahmad Raza Date: Mon, 16 Nov 2026 23:28:51 +0500 Subject: [PATCH 15/18] chore: added a todo --- todo.org | 3 +++ 1 file changed, 3 insertions(+) diff --git a/todo.org b/todo.org index 8bf2bc2..c1493ee 100644 --- a/todo.org +++ b/todo.org @@ -1,3 +1,6 @@ #+title: Opinionated Nixvim Configuration #+author: Ahmad Raza #+filetags: :todo: + +* TODO Disable inlay hints by default + Inlay hints often cause too much noise. They can be toggled anytime anyway. Keeping them disabled by default will keep it zen. \ No newline at end of file From 0a2d8e4e3a74aff4c1d845856db317e9ab5f71bc Mon Sep 17 00:00:00 2001 From: Ahmad Raza Date: Tue, 17 Nov 2026 08:18:38 +0500 Subject: [PATCH 16/18] fix(plugins/orgmode): enable required plugin yalms --- modules/xtras/orgmode.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/xtras/orgmode.nix b/modules/xtras/orgmode.nix index 1644bf9..08cfc5a 100644 --- a/modules/xtras/orgmode.nix +++ b/modules/xtras/orgmode.nix @@ -18,7 +18,6 @@ config = lib.mkIf config.nv.xtras.orgmode.enable { plugins = { orgmode.enable = true; - orgnomics = { enable = true; @@ -56,6 +55,8 @@ icon = ""; } ]; + + yalms.enable = true; }; keymaps = [ From ef725af95e6fa61287bd02c8f0d0a5338826eb55 Mon Sep 17 00:00:00 2001 From: Ahmad Raza Date: Tue, 17 Nov 2026 08:25:23 +0500 Subject: [PATCH 17/18] fix: yalms does not need a setup --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index b770072..ee4d524 100644 --- a/flake.lock +++ b/flake.lock @@ -528,11 +528,11 @@ ] }, "locked": { - "lastModified": 1794831922, - "narHash": "sha256-Iz1LDwfXxj+TTmKPIjqCH7tDnybx/U6v14h8Ua3eLzQ=", + "lastModified": 1794885663, + "narHash": "sha256-XYUh67ScyNkxQWF2QCmB5eiidWQks4jvENuSeFA5Gts=", "owner": "ar-at-localhost", "repo": "yalms", - "rev": "c6808484788b3ecec8604c7665e1db76f7dccd91", + "rev": "07ad6b32b8e3db4f7eabc4a036084a300a968d93", "type": "github" }, "original": { From 156afe77d5edbc4132de44c499ebed3a4368c547 Mon Sep 17 00:00:00 2001 From: Ahmad Raza Date: Tue, 17 Nov 2026 08:30:59 +0500 Subject: [PATCH 18/18] style(lsp): keep inlay hints disabled by default --- docs/index.org | 16 ++++++++++++++++ modules/lsp.nix | 1 - todo.org | 4 ++-- 3 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 docs/index.org diff --git a/docs/index.org b/docs/index.org new file mode 100644 index 0000000..d9feec2 --- /dev/null +++ b/docs/index.org @@ -0,0 +1,16 @@ +#+title: Docs - Opinionated Nixvim Configuration +#+author: Ahmad Raza +#+filetags: :todo: + +* Docs + + This document explains the configuration decisions and defaults. + +** Reading this document + +*** Abbreviations +| Abbr. | Explanation +| ~~ | Leader key, used in keybindings. + +** Developer Experience + + No inlay hints by default. They add visual noise. Use ~uh~ to toggle them. diff --git a/modules/lsp.nix b/modules/lsp.nix index 3f0fa07..28d21f6 100644 --- a/modules/lsp.nix +++ b/modules/lsp.nix @@ -1,6 +1,5 @@ _: { lsp = { - inlayHints.enable = true; servers = { lua_ls.enable = true; jsonls.enable = true; diff --git a/todo.org b/todo.org index c1493ee..99fe03a 100644 --- a/todo.org +++ b/todo.org @@ -2,5 +2,5 @@ #+author: Ahmad Raza #+filetags: :todo: -* TODO Disable inlay hints by default - Inlay hints often cause too much noise. They can be toggled anytime anyway. Keeping them disabled by default will keep it zen. \ No newline at end of file +* DONE Disable inlay hints by default + Inlay hints often cause too much noise. They can be toggled anytime anyway. Keeping them disabled by default will keep it zen.