summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <git@lassul.us>2023-09-03 12:33:23 +0200
committerlassulus <git@lassul.us>2023-09-03 12:33:23 +0200
commitf0af62110fdab7f9eb4d65a58ad0d2cd4eaaaa67 (patch)
treef150dcff8503fe9beae88d6fed38f8ee98151345
parentc15ec193d6a4210d15576340fc4f4d769c297f0c (diff)
l vim: update
-rw-r--r--lass/2configs/vim.nix45
1 files changed, 20 insertions, 25 deletions
diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix
index 210133f48..efe6a739c 100644
--- a/lass/2configs/vim.nix
+++ b/lass/2configs/vim.nix
@@ -1,15 +1,15 @@
{ config, lib, pkgs, ... }:
-with import <stockholm/lib>;
let
out = {
environment.systemPackages = [
- (hiPrio vim)
+ (lib.hiPrio vim)
];
environment.etc.vimrc.source = vimrc;
+ environment.etc.vim.source = vim;
- environment.variables.EDITOR = mkForce "vim";
+ environment.variables.EDITOR = lib.mkForce "vim";
environment.variables.VIMINIT = ":so /etc/vimrc";
};
@@ -43,6 +43,9 @@ let
set wildmenu
set wildmode=longest,full
+ " enable better-whitespace
+ let g:better_whitespace_enabled=1
+
set title
set titleold=
set titlestring=(vim)\ %t%(\ %M%)%(\ (%{expand(\"%:p:h\")})%)%(\ %a%)\ -\ %{v:servername}
@@ -122,10 +125,12 @@ let
let g:fzf_layout = { 'down': '~15%' }
'';
- extra-runtimepath = concatMapStringsSep "," (pkg: "${pkg.rtp}") [
+ extra-runtimepath = lib.concatMapStringsSep "," (pkg: "${pkg.rtp}") [
+ pkgs.vimPlugins.copilot-vim
pkgs.vimPlugins.undotree
pkgs.vimPlugins.fzf-vim
pkgs.vimPlugins.fzfWrapper
+ pkgs.vimPlugins.vim-better-whitespace
(pkgs.vimUtils.buildVimPlugin {
name = "file-line-1.0";
src = pkgs.fetchFromGitHub {
@@ -145,19 +150,6 @@ let
};
})
((rtp: rtp // { inherit rtp; }) (pkgs.writeTextFile (let
- name = "vim";
- in {
- name = "vim-syntax-${name}-1.0.0";
- destination = "/syntax/${name}.vim";
- text = /* vim */ ''
- ${concatMapStringsSep "\n" (s: /* vim */ ''
- syn keyword vimColor${s} ${s}
- \ containedin=ALLBUT,vimComment,vimLineComment
- hi vimColor${s} ctermfg=${s}
- '') (map (i: lpad 3 "0" (toString i)) (range 0 255))}
- '';
- })))
- ((rtp: rtp // { inherit rtp; }) (pkgs.writeTextFile (let
name = "showsyntax";
in {
name = "vim-plugin-${name}-1.0.0";
@@ -193,16 +185,19 @@ let
};
mkdirs = let
- dirOf = s: let out = concatStringsSep "/" (init (splitString "/" s));
+ dirOf = s: let out = lib.concatStringsSep "/" (lib.init (lib.splitString "/" s));
in assert out != ""; out;
- alldirs = attrValues dirs ++ map dirOf (attrValues files);
- in unique (sort lessThan alldirs);
+ alldirs = lib.attrValues dirs ++ map dirOf (lib.attrValues files);
+ in lib.unique (lib.sort lib.lessThan alldirs);
vim = pkgs.symlinkJoin {
name = "vim";
paths = [
- (pkgs.writeDashBin "vim" ''
+ (pkgs.writers.writeDashBin "vim" ''
set -efu
+ export PATH=$PATH:${lib.makeBinPath [
+ pkgs.nodejs
+ ]}
(umask 0077; exec ${pkgs.coreutils}/bin/mkdir -p ${toString mkdirs})
exec ${pkgs.vim}/bin/vim "$@"
'')
@@ -267,18 +262,18 @@ let
syn cluster nix_ind_strings contains=NixIND_STRING
syn cluster nix_strings contains=NixSTRING
- ${concatStringsSep "\n" (mapAttrsToList (lang: { extraStart ? null }: let
- startAlts = filter isString [
+ ${lib.concatStringsSep "\n" (lib.mapAttrsToList (lang: { extraStart ? null }: let
+ startAlts = lib.filter lib.isString [
''/\* ${lang} \*/''
extraStart
];
- sigil = ''\(${concatStringsSep ''\|'' startAlts}\)[ \t\r\n]*'';
+ sigil = ''\(${lib.concatStringsSep ''\|'' startAlts}\)[ \t\r\n]*'';
in /* vim */ ''
syn include @nix_${lang}_syntax syntax/${lang}.vim
unlet b:current_syntax
syn match nix_${lang}_sigil
- \ X${replaceStrings ["X"] ["\\X"] sigil}\ze\('''\|"\)X
+ \ X${lib.replaceStrings ["X"] ["\\X"] sigil}\ze\('''\|"\)X
\ nextgroup=nix_${lang}_region_IND_STRING,nix_${lang}_region_STRING
\ transparent