From 4ce5d01b83b694329d655148be2b03ce6dfbd646 Mon Sep 17 00:00:00 2001
From: Dmitry Voronin <hi@voronind.com>
Date: Sun, 1 Sep 2024 04:05:55 +0300
Subject: [PATCH] Idea : Configure ideavimrc.

---
 home/config/default.nix                | 34 ++++++++++++++------------
 home/config/jetbrains/default.nix      | 11 +++++++++
 home/config/nvim/module/config/Etc.nix |  4 ++-
 3 files changed, 32 insertions(+), 17 deletions(-)
 create mode 100644 home/config/jetbrains/default.nix

diff --git a/home/config/default.nix b/home/config/default.nix
index a79a5bc3..726251c3 100644
--- a/home/config/default.nix
+++ b/home/config/default.nix
@@ -1,20 +1,21 @@
 { self, config, ... } @args: let
-	btop     = import ./top/btop     args;
-	editor   = import ./editorconfig args;
-	foot     = import ./foot         args;
-	fuzzel   = import ./fuzzel       args;
-	git      = import ./git          args;
-	gtk3     = import ./gtk/3        args;
-	htop     = import ./top/htop     args;
-	keyd     = import ./keyd         args;
-	mako     = import ./mako         args;
-	mangohud = import ./mangohud     args;
-	nvim     = import ./nvim         args;
-	ssh      = import ./ssh          args;
-	sway     = import ./sway         args;
-	tmux     = import ./tmux         args;
-	waybar   = import ./waybar       args;
-	yazi     = import ./yazi         args;
+	btop      = import ./top/btop     args;
+	editor    = import ./editorconfig args;
+	foot      = import ./foot         args;
+	fuzzel    = import ./fuzzel       args;
+	git       = import ./git          args;
+	gtk3      = import ./gtk/3        args;
+	htop      = import ./top/htop     args;
+	jetbrains = import ./jetbrains    args;
+	keyd      = import ./keyd         args;
+	mako      = import ./mako         args;
+	mangohud  = import ./mangohud     args;
+	nvim      = import ./nvim         args;
+	ssh       = import ./ssh          args;
+	sway      = import ./sway         args;
+	tmux      = import ./tmux         args;
+	waybar    = import ./waybar       args;
+	yazi      = import ./yazi         args;
 in {
 	".config/MangoHud/MangoHud.conf".text   = mangohud.config;
 	".config/MangoHud/presets.conf".text    = mangohud.presets;
@@ -41,4 +42,5 @@ in {
 	".ssh/config".text                      = ssh.text;
 	".Wallpaper".source                     = config.module.wallpaper.path;
 	".template".source                      = ./template;
+	".ideavimrc".text                       = jetbrains.ideavimrc;
 }
diff --git a/home/config/jetbrains/default.nix b/home/config/jetbrains/default.nix
new file mode 100644
index 00000000..d396f356
--- /dev/null
+++ b/home/config/jetbrains/default.nix
@@ -0,0 +1,11 @@
+{ util, ... }: {
+	ideavimrc = util.trimTabs ''
+		set scrolloff=4
+		set incsearch
+		set hlsearch
+		set clipboard=unnamedplus
+
+		Plug 'tpope/vim-commentary'
+		Plug 'machakann/vim-highlightedyank'
+	'';
+}
diff --git a/home/config/nvim/module/config/Etc.nix b/home/config/nvim/module/config/Etc.nix
index dbf41992..89768fc4 100644
--- a/home/config/nvim/module/config/Etc.nix
+++ b/home/config/nvim/module/config/Etc.nix
@@ -2,15 +2,17 @@
 	text = ''
 		-- TODO: Add comments and separate files.
 		vim.opt.clipboard     = "unnamedplus"
-		-- vim.opt.completeopt   = "menuone,noselect"
 		vim.opt.cursorline    = false
 		vim.opt.fixeol        = false
+		vim.opt.incsearch     = true;
 		vim.opt.number        = true
+		vim.opt.scrolloff     = 4
 		vim.opt.splitbelow    = true
 		vim.opt.splitright    = true
 		vim.opt.termguicolors = true
 		vim.opt.ttyfast       = true
 		vim.opt.wildmode      = "longest,list"
+		-- vim.opt.completeopt   = "menuone,noselect"
 
 		-- Disable continuing comments on newline.
 		vim.cmd("autocmd BufEnter * set fo-=c fo-=r fo-=o")