From 1eb3a3a6f03d15f16674c273a62caf019e7b11bc Mon Sep 17 00:00:00 2001
From: Mel <einebeere@gmail.com>
Date: Tue, 29 Oct 2024 05:27:44 +0100
Subject: Configure YCM for Nix editing

Signed-off-by: Mel <einebeere@gmail.com>
---
 modules/common.nix | 1 +
 modules/vim.nix    | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/common.nix b/modules/common.nix
index 3b3b6ec..209a385 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -76,6 +76,7 @@
     go gopls delve go-task
     meson cmake
     nil nixfmt-rfc-style direnv
+    ycmd
     helix
 
     wineWowPackages.stagingFull winetricks bottles
diff --git a/modules/vim.nix b/modules/vim.nix
index a511bc1..4fe62fe 100644
--- a/modules/vim.nix
+++ b/modules/vim.nix
@@ -1,13 +1,20 @@
 { pkgs, ... }:
 
 let
+  configs = [
+    ../configs/.vimrc
+    ../configs/plugins.vimrc
+  ];
+
+  customRC = with builtins; foldl' (r: f: r + (readFile f)) "" configs;
+
   vim-configured =
     with pkgs;
     vim-full.customize {
       name = "vim"; # explicitly replace vim
 
       vimrcConfig = {
-        customRC = builtins.readFile ../configs/.vimrc;
+        inherit customRC;
 
         packages.collection = with vimPlugins; {
           start = [
-- 
cgit 1.4.1