| author |  clover caruso <git@paperclover.net> 2025-07-04 21:29:59-07:00 |
| committer | clover caruso <git@paperclover.net> 2025-07-04 21:29:59-07:00 |
| log | ac6a00196705a795ac82a59eeacd7eee59587cee |
| tree | d10cac04a5b4b7f9fd6c419ab70f5895be7ff8c9 |
| parent | 926f53011d593219726d6432324071a2d589df96 |
| parent | ab7dc1a69776f3bde087126d89f6e6eac17d56e0 |
Merge paperclover.dev:clo/config into chloe
3 files changed, 36 insertions(+), 17 deletions(-)
lib
modules
neovim
users
chloe
lib/mkNeovim.nix+15-13
| ... | ... | @@ -4,7 +4,9 @@ |
| 4 | 4 | # TODO: apply overlays here |
| 5 | 5 | overlays, |
| 6 | 6 | inputs, |
| 7 | }: user: system: let | |
| 7 | }: | |
| 8 | user: system: | |
| 9 | let | |
| 8 | 10 | darwin = nixpkgs.lib.strings.hasSuffix "-darwin" system; |
| 9 | 11 | |
| 10 | 12 | host = { |
| ... | ... | @@ -15,15 +17,15 @@ |
| 15 | 17 | userDir = ../users + "/${user}"; |
| 16 | 18 | userConfig = import (userDir + "/user.nix"); |
| 17 | 19 | in |
| 18 | (inputs.nvf.lib.neovimConfiguration { | |
| 19 | pkgs = nixpkgs.legacyPackages.${system}; | |
| 20 | modules = builtins.filter (f: f != null) [ | |
| 21 | (../users + ("/" + user + "/vim.nix")) | |
| 22 | ../modules/neovim | |
| 23 | ]; | |
| 24 | extraSpecialArgs = { | |
| 25 | inherit host; | |
| 26 | flake = self; | |
| 27 | user = userConfig; | |
| 28 | }; | |
| 29 | }).neovim | |
| 20 | (inputs.nvf.lib.neovimConfiguration { | |
| 21 | pkgs = nixpkgs.legacyPackages.${system}; | |
| 22 | modules = builtins.filter (f: f != null) [ | |
| 23 | (../users + ("/" + user + "/vim.nix")) | |
| 24 | ../modules/neovim | |
| 25 | ]; | |
| 26 | extraSpecialArgs = { | |
| 27 | inherit host; | |
| 28 | flake = self; | |
| 29 | user = userConfig; | |
| 30 | }; | |
| 31 | }).neovim |
modules/neovim/default.nix+20-2
| ... | ... | @@ -1,4 +1,9 @@ |
| 1 | { config, lib, ... }: | |
| 1 | { | |
| 2 | config, | |
| 3 | pkgs, | |
| 4 | lib, | |
| 5 | ... | |
| 6 | }: | |
| 2 | 7 | { |
| 3 | 8 | # based on default options from upstream: |
| 4 | 9 | # https://github.com/NotAShelf/nvf/blob/main/configuration.nix |
| ... | ... | @@ -8,7 +13,7 @@ |
| 8 | 13 | # |
| 9 | 14 | # override level 999 is used to not conflict with mkDefault as used by nvf. |
| 10 | 15 | # which allows user configurations to disable/override anything here. |
| 11 | vim = lib.mkOverride 999 { | |
| 16 | config.vim = lib.mkOverride 999 { | |
| 12 | 17 | theme = { |
| 13 | 18 | enable = true; |
| 14 | 19 | }; |
| ... | ... | @@ -70,8 +75,21 @@ |
| 70 | 75 | zig.enable = true; |
| 71 | 76 | # sort-lines: off |
| 72 | 77 | |
| 78 | ts.format.enable = false; # deno fmt is enabled elsewhere | |
| 73 | 79 | nix.format.type = "nixfmt"; # looks so much nicer |
| 74 | 80 | }; |
| 81 | formatter.conform-nvim = { | |
| 82 | enable = true; | |
| 83 | setupOpts.formatters_by_ft = { | |
| 84 | typescript = [ "deno_fmt" ]; | |
| 85 | typescriptreact = [ "deno_fmt" ]; | |
| 86 | javascript = [ "deno_fmt" ]; | |
| 87 | javascriptreact = [ "deno_fmt" ]; | |
| 88 | }; | |
| 89 | setupOpts.formatters.deno_fmt = { | |
| 90 | command = lib.meta.getExe pkgs.deno; | |
| 91 | }; | |
| 92 | }; | |
| 75 | 93 | filetree = { |
| 76 | 94 | neo-tree = { |
| 77 | 95 | enable = false; |
users/chloe/vim.nix+1-2
| ... | ... | @@ -1,5 +1,6 @@ |
| 1 | 1 | _: { |
| 2 | 2 | vim = { |
| 3 | languages.astro.enable = true; | |
| 3 | 4 | options = { |
| 4 | 5 | tabstop = 2; |
| 5 | 6 | softtabstop = 2; |
| ... | ... | @@ -13,7 +14,6 @@ _: { |
| 13 | 14 | foldenable = true; |
| 14 | 15 | linebreak = true; |
| 15 | 16 | }; |
| 16 | ||
| 17 | 17 | binds = { |
| 18 | 18 | hardtime-nvim.setupOpts = { |
| 19 | 19 | restriction_mode = "block"; |
| ... | ... | @@ -33,7 +33,6 @@ _: { |
| 33 | 33 | }; |
| 34 | 34 | }; |
| 35 | 35 | }; |
| 36 | ||
| 37 | 36 | keymaps = |
| 38 | 37 | let |
| 39 | 38 | mkKeymap = mode: key: action: desc: { |