diff options
| author | seth <[email protected]> | 2023-10-21 18:15:13 -0400 |
|---|---|---|
| committer | seth <[email protected]> | 2023-10-21 18:24:16 -0400 |
| commit | bb22116b2d6261da93f1eb58e4b17601e2298f2c (patch) | |
| tree | 1ae48813e17fbefc58dc691ae3e134a7ae5368fc /parts | |
| parent | 7288ffcecd47f0beab4e200416500affe7690941 (diff) | |
seth: use getchvim over in-house config
Diffstat (limited to 'parts')
| -rw-r--r-- | parts/overlays/default.nix | 1 | ||||
| -rw-r--r-- | parts/overlays/neovim.nix | 14 | ||||
| -rw-r--r-- | parts/users/seth/programs/neovim/default.nix | 83 |
3 files changed, 4 insertions, 94 deletions
diff --git a/parts/overlays/default.nix b/parts/overlays/default.nix index 2f81d17..66869c4 100644 --- a/parts/overlays/default.nix +++ b/parts/overlays/default.nix @@ -3,6 +3,5 @@ (import ./btop.nix) (import ./discord.nix) (import ./fish.nix) - (import ./neovim.nix) ]; } diff --git a/parts/overlays/neovim.nix b/parts/overlays/neovim.nix deleted file mode 100644 index 61b5c44..0000000 --- a/parts/overlays/neovim.nix +++ /dev/null @@ -1,14 +0,0 @@ -_: prev: { - neovim = - if prev.stdenv.isLinux - then - prev.symlinkJoin { - inherit (prev.neovim) passthru; - name = "neovim-nodesktop"; - paths = [prev.neovim]; - postBuild = '' - rm $out/share/applications/*.desktop - ''; - } - else prev.neovim; -} diff --git a/parts/users/seth/programs/neovim/default.nix b/parts/users/seth/programs/neovim/default.nix index 2a186ac..f02935a 100644 --- a/parts/users/seth/programs/neovim/default.nix +++ b/parts/users/seth/programs/neovim/default.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + inputs, ... }: let cfg = config.getchoo.programs.neovim; @@ -10,84 +11,8 @@ in { options.getchoo.programs.neovim.enable = mkEnableOption "neovim" // {default = true;}; config = mkIf cfg.enable { - programs.neovim = { - enable = true; - defaultEditor = true; - extraPackages = with pkgs; [ - actionlint - alejandra - beautysh - codespell - deadnix - just - nil - nodePackages.alex - shellcheck - statix - stylua - sumneko-lua-language-server - ]; - plugins = with pkgs.vimPlugins; [ - # general - catppuccin-nvim - - # TODO: don't pin when deprecation notice - # is no longer in nixpkgs - (fidget-nvim.overrideAttrs (_: { - src = pkgs.fetchFromGitHub { - owner = "j-hui"; - repo = "fidget.nvim"; - rev = "41f327b53c7977d47aee56f05e0bdbb4b994c5eb"; - hash = "sha256-v9qARsW8Gozit4Z3+igiemjI467QgRhwM+crqwO9r6U="; - }; - })) - - flash-nvim - gitsigns-nvim - indent-blankline-nvim - lualine-nvim - neo-tree-nvim - nvim-web-devicons - mini-nvim - - # completion - nvim-cmp - cmp-nvim-lsp - cmp-buffer - cmp_luasnip - cmp-async-path - luasnip - - # ui - dressing-nvim - noice-nvim - nui-nvim - nvim-notify - - # lsp - nvim-lspconfig - null-ls-nvim - pkgs.vim-just - - ## utils - bufferline-nvim - plenary-nvim - telescope-nvim - trouble-nvim - which-key-nvim - - # treesitter - nvim-treesitter.withAllGrammars - nvim-ts-context-commentstring - ]; - extraLuaConfig = '' - require("getchoo") - ''; - }; - - xdg.configFile."nvim/lua/getchoo" = { - source = ./config; - recursive = true; - }; + home.packages = [ + inputs.getchvim.packages.${pkgs.stdenv.hostPlatform.system}.default + ]; }; } |
