diff --git a/flake.nix b/flake.nix index c2323f6..51b1c7a 100644 --- a/flake.nix +++ b/flake.nix @@ -41,16 +41,10 @@ }; inherit (pkgs) mkShell; - inherit (pkgs.vimUtils) buildVimPlugin; in { packages.${system} = { default = mkShell { buildInputs = with pkgs; [ bashInteractive ]; }; - - opdavies-nvim = buildVimPlugin { - name = "opdavies-nvim"; - src = ./nvim; - }; }; formatter.${system} = pkgs.nixfmt-rfc-style; diff --git a/nix/modules/home-manager/features/cli/neovim.nix b/nix/modules/home-manager/features/cli/neovim.nix index 90fd61a..30bb523 100644 --- a/nix/modules/home-manager/features/cli/neovim.nix +++ b/nix/modules/home-manager/features/cli/neovim.nix @@ -1,8 +1,8 @@ { config, - inputs, lib, pkgs, + self, ... }: @@ -141,19 +141,8 @@ # Themes catppuccin-nvim - - # Configuration. - inputs.self.packages.${pkgs.system}.opdavies-nvim ]; - extraLuaConfig = '' - if vim.loader then - vim.loader.enable() - end - - require "opdavies" - ''; - extraPackages = with pkgs; [ # Languages nodePackages.typescript @@ -199,6 +188,11 @@ ]; }; + xdg.configFile.nvim = { + source = "${self}/nvim"; + recursive = true; + }; + home.file.".markdownlint.yaml".text = '' default: true diff --git a/nvim/init.lua b/nvim/init.lua new file mode 100644 index 0000000..0437de4 --- /dev/null +++ b/nvim/init.lua @@ -0,0 +1 @@ +require "opdavies" diff --git a/nvim/lua/opdavies/init.lua b/nvim/lua/opdavies/init.lua index 7e5bc84..64e7106 100644 --- a/nvim/lua/opdavies/init.lua +++ b/nvim/lua/opdavies/init.lua @@ -1,5 +1,3 @@ -pcall("require", impatient) - require "opdavies.globals" require "opdavies.keymaps" require "opdavies.options"