From 14de787e82f6c4aa0ed8cdbbeba1959d23be1a45 Mon Sep 17 00:00:00 2001 From: poslop Date: Thu, 10 Jul 2025 12:12:46 -0500 Subject: [PATCH] started neovim but swtiched to lunarvim --- modules/home/default.nix | 2 +- modules/home/git.nix | 5 ++-- modules/home/neovim.nix | 8 ------ modules/home/nvim/default.nix | 5 ++++ modules/home/nvim/nvim.nix | 14 +++++++++++ modules/home/nvim/nvim/init.lua | 1 + modules/home/nvim/nvim/lua/poslop/init.lua | 1 + modules/home/nvim/nvim/lua/poslop/options.lua | 25 +++++++++++++++++++ modules/home/packages.nix | 1 + 9 files changed, 51 insertions(+), 11 deletions(-) delete mode 100644 modules/home/neovim.nix create mode 100644 modules/home/nvim/default.nix create mode 100644 modules/home/nvim/nvim.nix create mode 100644 modules/home/nvim/nvim/init.lua create mode 100644 modules/home/nvim/nvim/lua/poslop/init.lua create mode 100644 modules/home/nvim/nvim/lua/poslop/options.lua diff --git a/modules/home/default.nix b/modules/home/default.nix index e95598a..6007f24 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -4,6 +4,6 @@ ./zsh ./git.nix ./packages.nix - ./neovim.nix + #./nvim ]; } diff --git a/modules/home/git.nix b/modules/home/git.nix index fc57297..8d17c4a 100644 --- a/modules/home/git.nix +++ b/modules/home/git.nix @@ -1,6 +1,4 @@ { - config, - username, ... }: { @@ -11,6 +9,9 @@ name = "poslop"; email = "poslop@archfox.org"; }; + core = { + editor = "nvim -f"; + }; }; }; } diff --git a/modules/home/neovim.nix b/modules/home/neovim.nix deleted file mode 100644 index 4f86262..0000000 --- a/modules/home/neovim.nix +++ /dev/null @@ -1,8 +0,0 @@ -_: -{ - programs.neovim = { - enable = true; - vimAlias = true; - viAlias = true; - }; -} diff --git a/modules/home/nvim/default.nix b/modules/home/nvim/default.nix new file mode 100644 index 0000000..7c0e9ea --- /dev/null +++ b/modules/home/nvim/default.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ./nvim.nix + ]; +} diff --git a/modules/home/nvim/nvim.nix b/modules/home/nvim/nvim.nix new file mode 100644 index 0000000..6348bc7 --- /dev/null +++ b/modules/home/nvim/nvim.nix @@ -0,0 +1,14 @@ +_: +{ + programs.neovim = { + enable = false; + vimAlias = true; + viAlias = true; + }; + + hj = { + files = { + ".config/nvim".source = ./nvim; + }; + }; +} diff --git a/modules/home/nvim/nvim/init.lua b/modules/home/nvim/nvim/init.lua new file mode 100644 index 0000000..35479d0 --- /dev/null +++ b/modules/home/nvim/nvim/init.lua @@ -0,0 +1 @@ +require('poslop') diff --git a/modules/home/nvim/nvim/lua/poslop/init.lua b/modules/home/nvim/nvim/lua/poslop/init.lua new file mode 100644 index 0000000..7dd8dff --- /dev/null +++ b/modules/home/nvim/nvim/lua/poslop/init.lua @@ -0,0 +1 @@ +require("poslop.options") diff --git a/modules/home/nvim/nvim/lua/poslop/options.lua b/modules/home/nvim/nvim/lua/poslop/options.lua new file mode 100644 index 0000000..7adb417 --- /dev/null +++ b/modules/home/nvim/nvim/lua/poslop/options.lua @@ -0,0 +1,25 @@ +-- Hint: use `:h