diff options
| -rw-r--r-- | flake.lock | 109 | ||||
| -rw-r--r-- | flake.nix | 10 | ||||
| -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 |
5 files changed, 123 insertions, 94 deletions
@@ -150,6 +150,37 @@ "type": "github" } }, + "getchvim": { + "inputs": { + "neovim": "neovim", + "neovim-nix": "neovim-nix", + "nixpkgs": [ + "nixpkgs" + ], + "parts": [ + "parts" + ], + "pre-commit": [ + "pre-commit" + ], + "utils": [ + "flake-utils" + ] + }, + "locked": { + "lastModified": 1697926294, + "narHash": "sha256-MzHRLhL2L4Su7rthqkdupxooETN3dq9waEmXSw4kKWQ=", + "owner": "getchoo", + "repo": "getchvim", + "rev": "ca59ebcf3dd17153b90a0ceca86af14db941ac3c", + "type": "github" + }, + "original": { + "owner": "getchoo", + "repo": "getchvim", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -251,6 +282,83 @@ "type": "github" } }, + "lazy-nvim": { + "flake": false, + "locked": { + "lastModified": 1678889456, + "narHash": "sha256-R+sfPOuWfwbrNXUiKQcb8MHYqK+o5Pw8gkEaYaidqp0=", + "owner": "folke", + "repo": "lazy.nvim", + "rev": "6b55862d2d264f0b48e0b9e42cc2d14f136bed55", + "type": "github" + }, + "original": { + "owner": "folke", + "repo": "lazy.nvim", + "type": "github" + } + }, + "neovim": { + "inputs": { + "flake-utils": [ + "getchvim", + "utils" + ], + "nixpkgs": [ + "getchvim", + "nixpkgs" + ] + }, + "locked": { + "dir": "contrib", + "lastModified": 1697918051, + "narHash": "sha256-fMlw0rw3sO5GsjQVowSo79fSnZQAMT+w1gAkuKuNxw0=", + "owner": "neovim", + "repo": "neovim", + "rev": "3a3e0251267a99eec6cfb2a058f9e992d01107fd", + "type": "github" + }, + "original": { + "dir": "contrib", + "owner": "neovim", + "repo": "neovim", + "type": "github" + } + }, + "neovim-nix": { + "inputs": { + "flake-parts": [ + "getchvim", + "parts" + ], + "lazy-nvim": "lazy-nvim", + "neovim": [ + "getchvim", + "neovim" + ], + "nixpkgs": [ + "getchvim", + "nixpkgs" + ], + "pre-commit-nix": [ + "getchvim", + "pre-commit" + ] + }, + "locked": { + "lastModified": 1690613475, + "narHash": "sha256-DyhvApZb/NBZ92dBgr0deJi4XQZ6lppIc92aDGrj8OY=", + "owner": "willruggiano", + "repo": "neovim.nix", + "rev": "b9ba181c5e20287aeeda4203e02c73f2cff370c4", + "type": "github" + }, + "original": { + "owner": "willruggiano", + "repo": "neovim.nix", + "type": "github" + } + }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -440,6 +548,7 @@ "flake-compat": "flake-compat", "flake-utils": "flake-utils", "getchoo": "getchoo", + "getchvim": "getchvim", "guzzle_api": "guzzle_api", "hm": "hm", "lanzaboote": "lanzaboote", @@ -43,6 +43,16 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + getchvim = { + url = "github:getchoo/getchvim"; + inputs = { + nixpkgs.follows = "nixpkgs"; + parts.follows = "parts"; + pre-commit.follows = "pre-commit"; + utils.follows = "flake-utils"; + }; + }; + guzzle_api = { url = "github:getchoo/guzzle_api"; inputs = { 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 + ]; }; } |