From e777c4f7bb39cee053ef998d6afc2d69e1f51a33 Mon Sep 17 00:00:00 2001 From: joygnu Date: Wed, 17 Jul 2024 23:02:23 +0200 Subject: [PATCH] no more vim --- home/default.nix | 1 - home/helix/default.nix | 4 +- home/neovim/default.nix | 32 ------------ home/neovim/plugins/cmp.nix | 81 ------------------------------- home/neovim/plugins/default.nix | 9 ---- home/neovim/plugins/lsp.nix | 12 ----- home/neovim/plugins/luasnip.nix | 16 ------ home/neovim/plugins/telescope.nix | 48 ------------------ home/zsh/default.nix | 1 - 9 files changed, 2 insertions(+), 202 deletions(-) delete mode 100644 home/neovim/default.nix delete mode 100644 home/neovim/plugins/cmp.nix delete mode 100644 home/neovim/plugins/default.nix delete mode 100644 home/neovim/plugins/lsp.nix delete mode 100644 home/neovim/plugins/luasnip.nix delete mode 100644 home/neovim/plugins/telescope.nix diff --git a/home/default.nix b/home/default.nix index 6d79fdc..1a2165f 100644 --- a/home/default.nix +++ b/home/default.nix @@ -11,7 +11,6 @@ ./gtk ./git ./ags -# ./neovim ./helix ./misc inputs.ags.homeManagerModules.default diff --git a/home/helix/default.nix b/home/helix/default.nix index 8abbac3..5bcbcf2 100644 --- a/home/helix/default.nix +++ b/home/helix/default.nix @@ -7,8 +7,8 @@ # lsp.display-messages = true; keys.normal = { space.space = "file_picker"; - # Z.Z = ":wq"; - # Z.Q = ":q"; + Z.Z = ":wq"; + Z.Q = ":q"; }; }; }; diff --git a/home/neovim/default.nix b/home/neovim/default.nix deleted file mode 100644 index f785187..0000000 --- a/home/neovim/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ ... }: -{ - imports = [ - ./plugins - ]; - programs.nixvim = { - enable = true; - defaultEditor = true; - clipboard.register = "unnamedplus"; - colorschemes.gruvbox.enable = true; - - plugins = { - lualine.enable = true; - }; - - opts = { - number = true; - tabstop = 2; - softtabstop = 2; - showtabline = 2; - expandtab = true; - shiftwidth = 2; - smartindent = true; - breakindent = true; - cursorline = true; - scrolloff = 8; - cmdheight = 0; - wrap = true; - termguicolors = true; - }; - }; -} diff --git a/home/neovim/plugins/cmp.nix b/home/neovim/plugins/cmp.nix deleted file mode 100644 index 309fbcc..0000000 --- a/home/neovim/plugins/cmp.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ ... }: -{ - programs.nixvim = { - plugins = { - cmp-nvim-lsp.enable = true; - cmp_luasnip.enable = true; - cmp = { - enable = true; - settings = { - autoEnableSources = true; - experimental = { ghost_text = true; }; - performance = { - debounce = 57; - fetchingTimeout = 197; - maxViewEntries = 27; - }; - - snippet.expand = '' - function(args) - require('luasnip').lsp_expand(args.body) - end - ''; - - formatting.fields = ["kind" "abbr" "menu"]; - - sources = [ - { - name = "nvim_lsp"; - } - { - name = "luasnip"; - } - ]; - - mapping = { - "" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})"; - "" = "cmp.mapping.confirm({ select = true })"; - "" = "cmp.mapping.complete()"; - "" = "cmp.mapping.select_next_item()"; - "" = "cmp.mapping.select_prev_item()"; - }; - - window = { - completion.border = "solid"; - documentation.border = "solid"; - }; - }; - }; - }; - extraConfigLua = '' - luasnip = require("luasnip") - kind_icons = { - Text = "󰊄", - Method = "", - Function = "󰡱", - Constructor = "", - Field = "", - Variable = "󱀍", - Class = "", - Interface = "", - Module = "󰕳", - Property = "", - Unit = "", - Value = "", - Enum = "", - Keyword = "", - Snippet = "", - Color = "", - File = "", - Reference = "", - Folder = "", - EnumMember = "", - Constant = "", - Struct = "", - Event = "", - Operator = "", - TypeParameter = "", - } - ''; - }; -} diff --git a/home/neovim/plugins/default.nix b/home/neovim/plugins/default.nix deleted file mode 100644 index 589a4f5..0000000 --- a/home/neovim/plugins/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ ... }: -{ - imports = [ - ./cmp.nix - ./lsp.nix - ./luasnip.nix - ./telescope.nix - ]; -} diff --git a/home/neovim/plugins/lsp.nix b/home/neovim/plugins/lsp.nix deleted file mode 100644 index c133f97..0000000 --- a/home/neovim/plugins/lsp.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ ... }: -{ - programs.nixvim.plugins.lsp = { - enable = true; - servers = { - nil-ls = { enable = true; }; - kotlin-language-server = { enable = true; }; - rust-analyzer = { enable = true; installCargo = true; installRustc = true; }; - pyright = { enable = true; }; - }; - }; -} diff --git a/home/neovim/plugins/luasnip.nix b/home/neovim/plugins/luasnip.nix deleted file mode 100644 index 888df13..0000000 --- a/home/neovim/plugins/luasnip.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ pkgs, ... }: -{ - programs.nixvim.plugins.luasnip = { - enable = true; - extraConfig = { - enable_autosnippets = true; - store_selection_keys = ""; - }; - fromVscode = [ - { - lazyLoad = true; - paths = "${pkgs.vimPlugins.friendly-snippets}"; - } - ]; - }; -} diff --git a/home/neovim/plugins/telescope.nix b/home/neovim/plugins/telescope.nix deleted file mode 100644 index 7996520..0000000 --- a/home/neovim/plugins/telescope.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = [ - pkgs.ripgrep - ]; - - programs.nixvim.plugins.telescope = { - enable = true; - extensions = { - file-browser = { - enable = true; - }; - fzf-native = { - enable = true; - }; - }; - settings = { - defaults = { - layout_config = { - horizontal = { - prompt_position = "top"; - }; - }; - sorting_strategy = "ascending"; - }; - }; - keymaps = { - "" = { - action = "find_files, {}"; - options = { - desc = "Find project files"; - }; - }; - "/" = { - action = "live_grep"; - options = { - desc = "Grep (root dir)"; - }; - }; - "" = { - action = "git_files, {}"; - options = { - desc = "Search git files"; - }; - }; - }; - }; -} diff --git a/home/zsh/default.nix b/home/zsh/default.nix index 28adb10..df1d0e3 100644 --- a/home/zsh/default.nix +++ b/home/zsh/default.nix @@ -45,4 +45,3 @@ }; } -