diff --git a/homeConfig/modules/neovim/config/plugins/theme/default.nix b/homeConfig/modules/neovim/config/plugins/theme/default.nix index 775821d..86b783c 100644 --- a/homeConfig/modules/neovim/config/plugins/theme/default.nix +++ b/homeConfig/modules/neovim/config/plugins/theme/default.nix @@ -1,56 +1,6 @@ -{ pkgs, lib, ... }: +{ pkgs, ... }: -let - - panvimdoc = pkgs.fetchFromGitHub { - owner = "kdheepak"; - repo = "panvimdoc"; - rev = "v3.0.6"; - sha256 = "0smij72mpd1lm6akjzkmh2z76xfgn86n7n1ah36fz16p1krc1nwv"; - }; - github-theme = pkgs.stdenv.mkDerivation { - pname = "github-theme"; - version = "1.0.0"; - src = pkgs.fetchFromGitHub { - owner = "projekt0n"; - repo = "github-nvim-theme"; - rev = "v1.0.0"; - sha256 = "1b9fac3ajqr9i5291k3z3pgrh3l08ga1ghdw05s1nq3xvbzcicn5"; - }; - buildInputs = [ pkgs.makeWrapper ]; - - buildPhase = '' - # replace misc/panvimdoc with our pre-fetched version - rm -rf misc/panvimdoc - ln -s ${panvimdoc} misc/panvimdoc - - # carry on with the build as normal - make - ''; - - installPhase = '' - # install the plugin to $out - mkdir -p $out - cp -r * $out - ''; - - meta = with lib; { - description = "A dark theme for Neovim"; - homepage = "https://github.com/projekt0n/github-nvim-theme"; - license = licenses.mit; - platforms = platforms.all; - }; - }; - -in +with pkgs.vimPlugins; [ - { - plugin = github-theme; - config = '' - lua << EOF - vim.cmd('colorscheme github_dark_high_contrast') - EOF - ''; - } + { plugin = catppuccin-nvim; } ] - diff --git a/homeConfig/modules/neovim/config/plugins/theme/github.nix b/homeConfig/modules/neovim/config/plugins/theme/github.nix new file mode 100644 index 0000000..775821d --- /dev/null +++ b/homeConfig/modules/neovim/config/plugins/theme/github.nix @@ -0,0 +1,56 @@ +{ pkgs, lib, ... }: + +let + + panvimdoc = pkgs.fetchFromGitHub { + owner = "kdheepak"; + repo = "panvimdoc"; + rev = "v3.0.6"; + sha256 = "0smij72mpd1lm6akjzkmh2z76xfgn86n7n1ah36fz16p1krc1nwv"; + }; + github-theme = pkgs.stdenv.mkDerivation { + pname = "github-theme"; + version = "1.0.0"; + src = pkgs.fetchFromGitHub { + owner = "projekt0n"; + repo = "github-nvim-theme"; + rev = "v1.0.0"; + sha256 = "1b9fac3ajqr9i5291k3z3pgrh3l08ga1ghdw05s1nq3xvbzcicn5"; + }; + buildInputs = [ pkgs.makeWrapper ]; + + buildPhase = '' + # replace misc/panvimdoc with our pre-fetched version + rm -rf misc/panvimdoc + ln -s ${panvimdoc} misc/panvimdoc + + # carry on with the build as normal + make + ''; + + installPhase = '' + # install the plugin to $out + mkdir -p $out + cp -r * $out + ''; + + meta = with lib; { + description = "A dark theme for Neovim"; + homepage = "https://github.com/projekt0n/github-nvim-theme"; + license = licenses.mit; + platforms = platforms.all; + }; + }; + +in +[ + { + plugin = github-theme; + config = '' + lua << EOF + vim.cmd('colorscheme github_dark_high_contrast') + EOF + ''; + } +] +