2024/07/20-02:44:41

1nv0k32 · Jul 20, 2024 · 57a0662 · 57a0662
1 parent 0d2928c
commit 57a0662
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 22 deletions.
diff --git a/modules/default.nix b/modules/default.nix
@@ -5,6 +5,7 @@
     ++ lib.optional (builtins.pathExists ./dev.nix) (import ./dev.nix)
     ++ [
       ./sysconf.nix
+      ./nvim.nix
       ./cert-der.nix
       ./alpaca.nix
     ];

diff --git a/modules/nvim.nix b/modules/nvim.nix
@@ -0,0 +1,35 @@
+{ lib, ... }:
+with lib;
+{
+  programs = {
+    nixvim = {
+      enable = mkDefault true;
+      viAlias = mkDefault true;
+      vimAlias = mkDefault true;
+      colorschemes.vscode.enable = true;
+      plugins.lightline.enable = true;
+      extraConfigVim = mkDefault ''
+        syntax enable
+        filetype indent on
+        set guicursor=
+        set mouse=a
+        set encoding=utf-8
+        set belloff=all
+        set tabstop=2
+        set softtabstop=2
+        set shiftwidth=2
+        set expandtab
+        set smarttab
+        set nonumber
+        set wildmenu
+        set foldenable
+        set clipboard=unnamedplus
+        set nowrap
+        set modeline
+        set modelines=1
+      '';
+    };
+  };
+}
+
+# vim:expandtab ts=2 sw=2
diff --git a/src/configs.nix b/src/configs.nix
@@ -85,28 +85,6 @@ with lib;
     alias diff='diff --color=auto'
   '';
 
-  VIMRC_CONFIG = ''
-    colorscheme slate
-    syntax enable
-    filetype indent on
-    set guicursor=
-    set mouse=a
-    set encoding=utf-8
-    set belloff=all
-    set tabstop=2
-    set softtabstop=2
-    set shiftwidth=2
-    set expandtab
-    set smarttab
-    set nonumber
-    set wildmenu
-    set foldenable
-    set clipboard=unnamedplus
-    set nowrap
-    set modeline
-    set modelines=1
-  '';
-
   SSH_CLIENT_CONFIG = mkDefault ''
     Host *
       IdentitiesOnly yes