bwc9876.dev / nixos-config
this repo has no description
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Format

Ben C 5dc4068f 17ee7cad

+133 -136
+133 -136
nixosModules/dev/nvim.nix
··· 4 4 config, 5 5 lib, 6 6 ... 7 - }: 8 - { 7 + }: { 9 8 environment.systemPackages = with pkgs; [ 10 9 ripgrep 11 10 fd 12 11 ]; 13 12 14 13 home-manager.users.bean = { 15 - imports = [ inputs.nixvim.homeModules.nixvim ]; 14 + imports = [inputs.nixvim.homeModules.nixvim]; 16 15 17 16 programs.nixvim = { 18 17 enable = true; ··· 59 58 background = true; 60 59 }; 61 60 virtual_text = { 62 - errors = [ "italic" ]; 63 - hints = [ "italic" ]; 64 - information = [ "italic" ]; 65 - warnings = [ "italic" ]; 66 - ok = [ "italic" ]; 61 + errors = ["italic"]; 62 + hints = ["italic"]; 63 + information = ["italic"]; 64 + warnings = ["italic"]; 65 + ok = ["italic"]; 67 66 }; 68 67 underlines = { 69 - errors = [ "underline" ]; 70 - hints = [ "underline" ]; 71 - information = [ "underline" ]; 72 - warnings = [ "underline" ]; 68 + errors = ["underline"]; 69 + hints = ["underline"]; 70 + information = ["underline"]; 71 + warnings = ["underline"]; 73 72 }; 74 73 }; 75 74 }; ··· 91 90 ''; 92 91 93 92 autoGroups = { 94 - restore_cursor = { }; 95 - open_neotree = { }; 93 + restore_cursor = {}; 94 + open_neotree = {}; 96 95 }; 97 96 98 97 filetype.extension.mdx = "mdx"; ··· 115 114 autoCmd = [ 116 115 { 117 116 group = "restore_cursor"; 118 - event = [ "BufReadPost" ]; 117 + event = ["BufReadPost"]; 119 118 pattern = "*"; 120 119 callback.__raw = '' 121 120 function() ··· 132 131 } 133 132 { 134 133 group = "open_neotree"; 135 - event = [ "BufRead" ]; 134 + event = ["BufRead"]; 136 135 pattern = "*"; 137 136 once = true; 138 137 callback.__raw = '' ··· 160 159 }; 161 160 }; 162 161 163 - keymaps = 164 - let 165 - prefixMap = 166 - pre: maps: 167 - builtins.map (k: { 168 - action = "<cmd>${k.action}<cr>"; 169 - key = "${pre}${k.key}"; 170 - options = k.options; 171 - }) maps; 172 - in 162 + keymaps = let 163 + prefixMap = pre: maps: 164 + builtins.map (k: { 165 + action = "<cmd>${k.action}<cr>"; 166 + key = "${pre}${k.key}"; 167 + options = k.options; 168 + }) 169 + maps; 170 + in 173 171 lib.lists.flatten ( 174 - builtins.map (g: if builtins.hasAttr "group" g then prefixMap g.prefix g.keys else g) [ 172 + builtins.map (g: 173 + if builtins.hasAttr "group" g 174 + then prefixMap g.prefix g.keys 175 + else g) [ 175 176 { 176 177 action = ''"+p''; 177 178 key = "<C-S-V>"; ··· 312 313 } 313 314 { 314 315 action.__raw = "[[<C-\\><C-n><C-w>]]"; 315 - mode = [ "t" ]; 316 + mode = ["t"]; 316 317 key = "<C-w>"; 317 318 } 318 319 { 319 320 action.__raw = "[[<C-\\><C-n>]]"; 320 - mode = [ "t" ]; 321 + mode = ["t"]; 321 322 key = "<esc>"; 322 323 } 323 324 { ··· 328 329 ); 329 330 330 331 extraPlugins = with pkgs.vimPlugins; [ 331 - { plugin = pkgs.nvim-mdx; } 332 - { plugin = satellite-nvim; } 333 - { plugin = flatten-nvim; } 334 - { plugin = tiny-devicons-auto-colors-nvim; } 332 + {plugin = pkgs.nvim-mdx;} 333 + {plugin = satellite-nvim;} 334 + {plugin = flatten-nvim;} 335 + {plugin = tiny-devicons-auto-colors-nvim;} 335 336 ]; 336 337 337 338 plugins = { ··· 403 404 opts = { 404 405 position = "center"; 405 406 }; 406 - layout = 407 - let 408 - o = { 409 - position = "center"; 410 - }; 411 - txt = s: { 412 - type = "text"; 413 - val = s; 414 - opts = { 407 + layout = let 408 + o = { 409 + position = "center"; 410 + }; 411 + txt = s: { 412 + type = "text"; 413 + val = s; 414 + opts = 415 + { 415 416 hl = "Keyword"; 416 417 } 417 418 // o; 418 - }; 419 - grp = g: { 420 - type = "group"; 421 - val = g; 422 - opts.spacing = 1; 423 - }; 424 - btn = 425 - { 426 - val, 427 - onClick, 428 - ... 429 - }: 430 - { 431 - type = "button"; 432 - inherit val; 433 - opts = o; 434 - on_press.__raw = "function() vim.cmd[[${onClick}]] end"; 435 - }; 436 - cmd = 437 - { 438 - command, 439 - width, 440 - height, 441 - }: 442 - { 443 - type = "terminal"; 444 - inherit command width height; 445 - opts = o; 446 - }; 447 - pad = { 448 - type = "padding"; 449 - val = 2; 450 - }; 451 - in 419 + }; 420 + grp = g: { 421 + type = "group"; 422 + val = g; 423 + opts.spacing = 1; 424 + }; 425 + btn = { 426 + val, 427 + onClick, 428 + ... 429 + }: { 430 + type = "button"; 431 + inherit val; 432 + opts = o; 433 + on_press.__raw = "function() vim.cmd[[${onClick}]] end"; 434 + }; 435 + cmd = { 436 + command, 437 + width, 438 + height, 439 + }: { 440 + type = "terminal"; 441 + inherit command width height; 442 + opts = o; 443 + }; 444 + pad = { 445 + type = "padding"; 446 + val = 2; 447 + }; 448 + in 452 449 [ 453 450 pad 454 451 pad ··· 481 478 (txt " NixVim Rev ${builtins.substring 0 5 inputs.nixvim.rev}") 482 479 ]) 483 480 ]) 484 - ++ [ pad ]; 481 + ++ [pad]; 485 482 }; 486 483 487 484 trouble = { ··· 590 587 hover = { 591 588 enabled = true; 592 589 delay = 150; 593 - reveal = [ "close" ]; 590 + reveal = ["close"]; 594 591 }; 595 592 sort_by = "insert_at_end"; 596 593 diagnostics = "nvim_lsp"; ··· 605 602 606 603 statuscol = { 607 604 enable = true; 608 - settings.segments = 609 - let 610 - dispCond = { 611 - __raw = '' 612 - function(ln) 613 - return vim.bo.filetype ~= "neo-tree" 614 - end 615 - ''; 616 - }; 617 - in 618 - [ 619 - { 620 - click = "v:lua.ScSa"; 621 - condition = [ 622 - dispCond 623 - ]; 624 - text = [ 625 - "%s" 626 - ]; 627 - } 628 - { 629 - click = "v:lua.ScLa"; 630 - condition = [ dispCond ]; 631 - text = [ 632 - { 633 - __raw = "require('statuscol.builtin').lnumfunc"; 634 - } 635 - ]; 636 - } 637 - { 638 - click = "v:lua.ScFa"; 639 - condition = [ 640 - dispCond 641 - { 642 - __raw = "require('statuscol.builtin').not_empty"; 643 - } 644 - ]; 645 - text = [ 646 - { 647 - __raw = "require('statuscol.builtin').foldfunc"; 648 - } 649 - " " 650 - ]; 651 - } 652 - ]; 605 + settings.segments = let 606 + dispCond = { 607 + __raw = '' 608 + function(ln) 609 + return vim.bo.filetype ~= "neo-tree" 610 + end 611 + ''; 612 + }; 613 + in [ 614 + { 615 + click = "v:lua.ScSa"; 616 + condition = [ 617 + dispCond 618 + ]; 619 + text = [ 620 + "%s" 621 + ]; 622 + } 623 + { 624 + click = "v:lua.ScLa"; 625 + condition = [dispCond]; 626 + text = [ 627 + { 628 + __raw = "require('statuscol.builtin').lnumfunc"; 629 + } 630 + ]; 631 + } 632 + { 633 + click = "v:lua.ScFa"; 634 + condition = [ 635 + dispCond 636 + { 637 + __raw = "require('statuscol.builtin').not_empty"; 638 + } 639 + ]; 640 + text = [ 641 + { 642 + __raw = "require('statuscol.builtin').foldfunc"; 643 + } 644 + " " 645 + ]; 646 + } 647 + ]; 653 648 }; 654 649 655 650 dropbar = { ··· 675 670 676 671 options = { 677 672 theme = "catppuccin"; 678 - disabled_filetypes = [ "neo-tree" ]; 679 - ignore_focus = [ "neo-tree" ]; 673 + disabled_filetypes = ["neo-tree"]; 674 + ignore_focus = ["neo-tree"]; 680 675 }; 681 676 }; 682 677 }; 683 678 684 679 nix-develop = { 685 680 enable = true; 686 - package = pkgs.vimPlugins.nix-develop-nvim.overrideAttrs ( 687 - prev: next: { 688 - src = pkgs.fetchFromGitHub { 689 - owner = "Bwc9876"; 690 - repo = "nix-develop.nvim"; 691 - rev = "089cd52191ccbb3726594e21cd96567af6088dd5"; 692 - sha256 = "sha256-EIEJk8/IAuG+UICUJ2F8QakgRpFrQ1ezDSJ79NAVuD8= 681 + package = 682 + pkgs.vimPlugins.nix-develop-nvim.overrideAttrs ( 683 + prev: next: { 684 + src = 685 + pkgs.fetchFromGitHub { 686 + owner = "Bwc9876"; 687 + repo = "nix-develop.nvim"; 688 + rev = "089cd52191ccbb3726594e21cd96567af6088dd5"; 689 + sha256 = "sha256-EIEJk8/IAuG+UICUJ2F8QakgRpFrQ1ezDSJ79NAVuD8= 693 690 "; 694 - }; 695 - } 696 - ); 691 + }; 692 + } 693 + ); 697 694 }; 698 695 699 696 project-nvim = { ··· 784 781 cmp = { 785 782 enable = true; 786 783 settings = { 787 - sources = map (name: { inherit name; }) [ 784 + sources = map (name: {inherit name;}) [ 788 785 "nvim_lsp" 789 786 "nvim_lsp_signature_help" 790 787 "path"