Compare commits
3 commits
0f5f848c7e
...
bd69e28143
| Author | SHA1 | Date | |
|---|---|---|---|
| bd69e28143 | |||
| 516df86b3f | |||
| 28187c3b8f |
5 changed files with 60 additions and 7 deletions
|
|
@ -33,13 +33,10 @@ in
|
|||
enable = true;
|
||||
|
||||
package = pkgs.firefox.override {
|
||||
cfg = {
|
||||
enableTridactylNative = cfg.tridactyl.enable;
|
||||
};
|
||||
|
||||
extraNativeMessagingHosts = with pkgs; ([ ]
|
||||
nativeMessagingHosts = ([ ]
|
||||
++ lib.optional cfg.tridactyl.enable pkgs.tridactyl-native
|
||||
# Watch videos using mpv
|
||||
++ lib.optional cfg.ff2mpv.enable ambroisie.ff2mpv-go
|
||||
++ lib.optional cfg.ff2mpv.enable pkgs.ambroisie.ff2mpv-go
|
||||
);
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ in
|
|||
nvim-lspconfig # Easy LSP configuration
|
||||
lsp-format-nvim # Simplified formatting configuration
|
||||
lsp_lines-nvim # Show diagnostics *over* regions
|
||||
null-ls-nvim # LSP integration for linters and formatters
|
||||
none-ls-nvim # LSP integration for linters and formatters
|
||||
nvim-treesitter.withAllGrammars # Better highlighting
|
||||
nvim-treesitter-textobjects # More textobjects
|
||||
nvim-ts-context-commentstring # Comment string in nested language blocks
|
||||
|
|
|
|||
28
overlays/gruvbox-nvim-better-diff/colours.patch
Normal file
28
overlays/gruvbox-nvim-better-diff/colours.patch
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
From 416b3c9c5e783d173ac0fd5310a76c1b144b92c1 Mon Sep 17 00:00:00 2001
|
||||
From: eeeXun <sdes96303@gmail.com>
|
||||
Date: Thu, 19 Oct 2023 02:34:12 +0800
|
||||
Subject: Use better diff colours
|
||||
|
||||
---
|
||||
README.md | 3 ++-
|
||||
lua/gruvbox.lua | 7 ++++---
|
||||
2 files changed, 6 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/lua/gruvbox.lua b/lua/gruvbox.lua
|
||||
index ceba0735..a319fc6a 100644
|
||||
--- a/lua/gruvbox.lua
|
||||
+++ b/lua/gruvbox.lua
|
||||
@@ -360,9 +361,9 @@ local function get_groups()
|
||||
PmenuSel = { fg = colors.bg2, bg = colors.blue, bold = config.bold },
|
||||
PmenuSbar = { bg = colors.bg2 },
|
||||
PmenuThumb = { bg = colors.bg4 },
|
||||
- DiffDelete = { bg = colors.dark_red },
|
||||
- DiffAdd = { bg = colors.dark_green },
|
||||
- DiffChange = { bg = colors.dark_aqua },
|
||||
- DiffText = { bg = colors.yellow, fg = colors.bg0 },
|
||||
+ DiffDelete = { fg = colors.red },
|
||||
+ DiffAdd = { fg = colors.green },
|
||||
+ DiffChange = { fg = colors.aqua },
|
||||
+ DiffText = { fg = colors.yellow, bg = colors.bg0 },
|
||||
SpellCap = { link = "GruvboxBlueUnderline" },
|
||||
SpellBad = { link = "GruvboxRedUnderline" },
|
||||
4
overlays/gruvbox-nvim-better-diff/default.nix
Normal file
4
overlays/gruvbox-nvim-better-diff/default.nix
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
self: prev:
|
||||
{
|
||||
vimPlugins = prev.vimPlugins.extend (self.callPackage ./generated.nix { });
|
||||
}
|
||||
24
overlays/gruvbox-nvim-better-diff/generated.nix
Normal file
24
overlays/gruvbox-nvim-better-diff/generated.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{ vimUtils, fetchFromGitHub }:
|
||||
|
||||
_final: _prev: {
|
||||
gruvbox-nvim = vimUtils.buildVimPlugin {
|
||||
pname = "gruvbox.nvim";
|
||||
version = "2023-10-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ellisonleao";
|
||||
repo = "gruvbox.nvim";
|
||||
rev = "477c62493c82684ed510c4f70eaf83802e398898";
|
||||
sha256 = "0250c24c6n6yri48l288irdawhqs16qna3y74rdkgjd2jvh66vdm";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Inspired by https://github.com/ellisonleao/gruvbox.nvim/pull/291
|
||||
./colours.patch
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/ellisonleao/gruvbox.nvim/";
|
||||
};
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue