From fa0cfba45401db15162fe3a98b7cd930801795ef Mon Sep 17 00:00:00 2001 From: Tyler Kelley Date: Thu, 23 May 2024 23:58:07 -0500 Subject: [PATCH] Add config file for fine-cmdline --- config/nvim/plugins/fine-cmdline.lua | 33 ++++++++++++++++++++++++++++ hosts/familypc/config.nix | 2 -- hosts/familypc/home.nix | 21 ++++++------------ 3 files changed, 40 insertions(+), 16 deletions(-) create mode 100644 config/nvim/plugins/fine-cmdline.lua diff --git a/config/nvim/plugins/fine-cmdline.lua b/config/nvim/plugins/fine-cmdline.lua new file mode 100644 index 0000000..1a3f14c --- /dev/null +++ b/config/nvim/plugins/fine-cmdline.lua @@ -0,0 +1,33 @@ +require('fine-cmdline').setup({ + cmdline = { + enable_keymaps = true, + smart_history = true, + prompt = '> ' + }, + popup = { + position = { + row = '10%', + col = '50%', + }, + size = { + width = '60%', + }, + border = { + style = 'rounded', + }, + win_options = { + winhighlight = 'Normal:Normal,FloatBorder:FloatBorder', + }, + }, + hooks = { + before_mount = function(input) + -- code + end, + after_mount = function(input) + -- code + end, + set_keymaps = function(imap, feedkeys) + -- code + end + } +}) diff --git a/hosts/familypc/config.nix b/hosts/familypc/config.nix index dce1f5f..013e4b4 100644 --- a/hosts/familypc/config.nix +++ b/hosts/familypc/config.nix @@ -166,7 +166,6 @@ [ vim wget - handbrake killall git cmatrix @@ -184,7 +183,6 @@ v4l-utils ydotool wl-clipboard - lm_sensors pciutils ffmpeg socat diff --git a/hosts/familypc/home.nix b/hosts/familypc/home.nix index ed4ef96..9ba9d09 100644 --- a/hosts/familypc/home.nix +++ b/hosts/familypc/home.nix @@ -6,6 +6,10 @@ ... }: let + finecmdline = pkgs.vimUtils.buildVimPlugin { + name = "fine-cmdline"; + src = inputs.fine-cmdline; + }; inherit (import ./variables.nix) gitUsername gitEmail @@ -17,19 +21,6 @@ in home.homeDirectory = "/home/${username}"; home.stateVersion = "23.11"; - nixpkgs = { - overlays = [ - (final: prev: { - vimPlugins = prev.vimPlugins // { - fine-cmdline-nvim = prev.vimUtils.buildVimPlugin { - name = "fine-cmdline"; - src = inputs.fine-cmdline; - }; - }; - }) - ]; - }; - # Import Program Configurations imports = [ inputs.hyprland.homeManagerModules.default @@ -204,7 +195,8 @@ in bufferline-nvim dressing-nvim indent-blankline-nvim - fine-cmdline-nvim + nui-nvim + finecmdline nvim-treesitter.withAllGrammars lualine-nvim nvim-autopairs @@ -246,6 +238,7 @@ in ${builtins.readFile ../../config/nvim/plugins/telescope.lua} ${builtins.readFile ../../config/nvim/plugins/todo-comments.lua} ${builtins.readFile ../../config/nvim/plugins/treesitter.lua} + ${builtins.readFile ../../config/nvim/plugins/fine-cmdline.lua} require("ibl").setup() require("bufferline").setup{} require("lualine").setup({