christoph/flake-nixinator
1
Fork 0
Code Activity

Compare commits

base: christoph:bb651a464bf5283bd963c0f17782a62cab90e1c5
Branches Tags
christoph:master
..
compare: christoph:e4df141af53762c9098a81565c31f1ea045f797c
Branches Tags
christoph:master

2 Commits
bb651a464b ... e4df141af5

Author SHA1 Message Date
Christoph Urlacher
e4df141af5 Neovim: Update blink.cmp config to latest version + replace pyright with basedpyright 2024-12-08 16:16:57 +01:00
Christoph Urlacher
82017e3b07 Flake: Update lock 2024-12-08 16:16:39 +01:00
3 changed files with 160 additions and 68 deletions
Expand all files Collapse all files

147
flake.lock generated
View File

@ -85,11 +85,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1733043608,
"narHash": "sha256-00uyKJEgix+TuIvEwH18SCXYXU9VDhRh3Kjxf9xrWgA=",
"lastModified": 1733621237,
"narHash": "sha256-VssGAIF33aFHe+U7DaT9jSHjETD25rVWaW/Y+IWMrSI=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "4ebaf4d0b6b8ab9bacd57f5db199da2d76eea8da",
"rev": "d3f55c978e1faef8940ab52b580bb8a2c3f68cef",
"type": "github"
},
"original": {
@ -135,11 +135,32 @@
]
},
"locked": {
"lastModified": 1730504689,
"narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
"lastModified": 1733312601,
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "506278e768c2a08bec68eb62932193e341f55c90",
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": [
"nur",
"nixpkgs"
]
},
"locked": {
"lastModified": 1733312601,
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
"type": "github"
},
"original": {
@ -201,11 +222,11 @@
]
},
"locked": {
"lastModified": 1732021966,
"narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
"lastModified": 1733318908,
"narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
"rev": "6f4e2a2112050951a314d2733a994fbab94864c6",
"type": "github"
},
"original": {
@ -238,11 +259,11 @@
},
"hardware": {
"locked": {
"lastModified": 1732483221,
"narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=",
"lastModified": 1733481457,
"narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405",
"rev": "e563803af3526852b6b1d77107a81908c66a9fcf",
"type": "github"
},
"original": {
@ -258,11 +279,11 @@
]
},
"locked": {
"lastModified": 1733045511,
"narHash": "sha256-n8AldXJRNVMm2UZ6yN0HwVxlARY2Cm/uhdOw76tQ0OI=",
"lastModified": 1733484277,
"narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "4964f3c6fc17ae4578e762d3dc86b10fe890860e",
"rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a",
"type": "github"
},
"original": {
@ -279,11 +300,11 @@
]
},
"locked": {
"lastModified": 1732884235,
"narHash": "sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB+XG6Q=",
"lastModified": 1733484277,
"narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "819f682269f4e002884702b87e445c82840c68f2",
"rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a",
"type": "github"
},
"original": {
@ -350,11 +371,11 @@
]
},
"locked": {
"lastModified": 1732603785,
"narHash": "sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8=",
"lastModified": 1733570843,
"narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "6ab87b7c84d4ee873e937108c4ff80c015a40c7a",
"rev": "a35b08d09efda83625bef267eb24347b446c80b8",
"type": "github"
},
"original": {
@ -433,11 +454,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1732824227,
"narHash": "sha256-fYNXgpu1AEeLyd3fQt4Ym0tcVP7cdJ8wRoqJ+CtTRyY=",
"lastModified": 1733412085,
"narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c71ad5c34d51dcbda4c15f44ea4e4aa6bb6ac1e9",
"rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541",
"type": "github"
},
"original": {
@ -465,11 +486,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1732837521,
"narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=",
"lastModified": 1733392399,
"narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370",
"rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661",
"type": "github"
},
"original": {
@ -497,11 +518,27 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1732837521,
"narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=",
"lastModified": 1733581040,
"narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370",
"rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1733581040,
"narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01",
"type": "github"
},
"original": {
@ -526,11 +563,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1733010437,
"narHash": "sha256-xPf3jjDBDA9oMVnWU5DJ8gINCq2EPiupvF/4rD/0eEI=",
"lastModified": 1733667809,
"narHash": "sha256-RajfsaKZIc3bk75wiaw+ZYVDSMljdLWW69VCT90f05w=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "80e49e7fd3fa720b93d18e6d859d9b9e7aad4a62",
"rev": "e2f81c8e8e8baa28b100e0e43b721f16de6299d8",
"type": "github"
},
"original": {
@ -540,12 +577,17 @@
}
},
"nur": {
"inputs": {
"flake-parts": "flake-parts_2",
"nixpkgs": "nixpkgs_6",
"treefmt-nix": "treefmt-nix_2"
},
"locked": {
"lastModified": 1733058400,
"narHash": "sha256-5K8V/4sKnALihvxf8oEOl0k0fFGwIxbT47nGIkbeTko=",
"lastModified": 1733669740,
"narHash": "sha256-N+aWRHO1XksDJcMM83Q71HlAkKgAoI9HZ6JdhdUw4aY=",
"owner": "nix-community",
"repo": "NUR",
"rev": "9d1010316997b38f36f28824d95821e63b305657",
"rev": "b7c6c04c716faea302f961e60bb534906bc161d3",
"type": "github"
},
"original": {
@ -564,11 +606,11 @@
]
},
"locked": {
"lastModified": 1731936508,
"narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=",
"lastModified": 1733411491,
"narHash": "sha256-315rJ7O9cOllPDaFscnJhcMleORHbxon0Kq9LAKJ5p4=",
"owner": "NuschtOS",
"repo": "search",
"rev": "fe07070f811b717a4626d01fab714a87d422a9e1",
"rev": "68e9fad70d95d08156cf10a030bd39487bed8ffe",
"type": "github"
},
"original": {
@ -629,11 +671,32 @@
]
},
"locked": {
"lastModified": 1732894027,
"narHash": "sha256-2qbdorpq0TXHBWbVXaTqKoikN4bqAtAplTwGuII+oAc=",
"lastModified": 1733440889,
"narHash": "sha256-qKL3vjO+IXFQ0nTinFDqNq/sbbnnS5bMI1y0xX215fU=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "6209c381904cab55796c5d7350e89681d3b2a8ef",
"rev": "50862ba6a8a0255b87377b9d2d4565e96f29b410",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"treefmt-nix_2": {
"inputs": {
"nixpkgs": [
"nur",
"nixpkgs"
]
},
"locked": {
"lastModified": 1733222881,
"narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "49717b5af6f80172275d47a418c9719a31a78b53",
"type": "github"
},
"original": {

2
flake.nix
View File

@ -58,7 +58,7 @@
# Overlays define changes in the nixpkgs package set.
overlays = [
inputs.devshell.overlays.default
inputs.nur.overlay
inputs.nur.overlays.default
inputs.emacs-overlay.overlay
# All my own overlays

89
home/modules/neovim/default.nix
View File

@ -46,7 +46,7 @@ in {
lua-language-server
nil
nixd
pyright
basedpyright
rust-analyzer
texlab
typescript
@ -387,21 +387,33 @@ in {
config = mkDefaultConfig name;
opts = {
keymap = {
preset = "enter";
};
keymap.preset = "enter";
accept = {
expand_snippet = "require('luasnip').lsp_expand";
auto_brackets = {
enabled = true;
};
};
# NOTE: This config is for version 0.62
trigger = {
signature_help = {
enabled = true;
};
# highlight.use_nvim_cmp_as_default = true;
# nerd_font_variant = "mono";
# sources.completion.enabled_providers = ["lsp" "path" "snippets"]; # No "buffer"
# accept.auto_brackets.enabled = true;
# trigger.signature_help.enabled = true;
# fuzzy = {
# use_typo_resistance = true;
# use_frequency = true;
# use_proximity = true;
# };
# windows = {
# autocomplete.border = "rounded";
# documentation.border = "rounded";
# documentation.auto_show = true;
# signature_help.border = "rounded";
# ghost_text.enabled = true;
# };
# NOTE: This config is for versions > 0.62
appearance = {
use_nvim_cmp_as_default = true;
nerd_font_variant = "mono";
};
fuzzy = {
@ -416,25 +428,37 @@ in {
};
};
windows = {
autocomplete = {
border = "rounded";
draw = "reversed";
};
documentation = {
border = "rounded";
auto_show = true;
auto_show_delay_ms = 250;
};
signature_help = {
border = "rounded";
};
ghost_text = {
completion = {
accept = {
auto_brackets = {
enabled = true;
};
};
nerd_font_variant = "mono";
menu = {
enabled = true;
border = "rounded";
};
documentation = {
auto_show = true;
auto_show_delay_ms = 250;
window = {
border = "rounded";
};
};
ghost_text = {
enabled = false;
};
};
signature = {
enabled = true;
window = {
border = "rounded";
};
};
};
};
@ -963,7 +987,7 @@ in {
};
};
}
{name = "pyright";}
{name = "basedpyright";}
{name = "texlab";}
# {name = "jdtls";} # Don't set up when using nvim-jdtls
@ -985,8 +1009,13 @@ in {
local __lspCapabilities = function()
capabilities = vim.lsp.protocol.make_client_capabilities()
-- I don't remember where this came from, but without cmp it makes no sense
-- capabilities = vim.tbl_deep_extend("force", capabilities, require("cmp_nvim_lsp").default_capabilities())
-- get_lsp_capabilities merges with the existing capabilities
capabilities = require("blink.cmp").get_lsp_capabilities(capabilities)
return capabilities
end