Update Nix to get Neovim 0.8
This commit is contained in:
parent
44d9115424
commit
aec63889ec
3 changed files with 34 additions and 24 deletions
30
flake.lock
30
flake.lock
|
@ -7,11 +7,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1657835815,
|
"lastModified": 1664210064,
|
||||||
"narHash": "sha256-CnZszAYpNKydh6N7+xg+eRtWNVoAAGqc6bg+Lpgq1xc=",
|
"narHash": "sha256-df6nKVZe/yAhmJ9csirTPahc0dldwm3HBhCVNA6qWr0=",
|
||||||
"owner": "lnl7",
|
"owner": "lnl7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "54a24f042f93c79f5679f133faddedec61955cf2",
|
"rev": "02d2551c927b7d65ded1b3c7cd13da5cc7ae3fcf",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -29,11 +29,11 @@
|
||||||
"utils": "utils"
|
"utils": "utils"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1659878744,
|
"lastModified": 1665226338,
|
||||||
"narHash": "sha256-81a9Mx5pDMBGN4WnVhcQVkW5mXNTZOt8DZOSI8bVKpU=",
|
"narHash": "sha256-P+A9MEClkeZSaS4zZvrpfVfUUqU5mmdZgEz/FGDSgno=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "f5e9879e74e6202e2dbb3628fad2d20eac0d8be4",
|
"rev": "3b5a8d3dc79e05213d3c428a0b8777e21cb0c6b8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -44,11 +44,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1659803779,
|
"lastModified": 1665081174,
|
||||||
"narHash": "sha256-+5zkHlbcbFyN5f3buO1RAZ9pH1wXLxCesUJ0vFmLr9Y=",
|
"narHash": "sha256-6hsmzdhdy8Kbvl5e0xZNE83pW3fKQvNiobJkM6KQrgA=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "f44884060cb94240efbe55620f38a8ec8d9af601",
|
"rev": "598f83ebeb2235435189cf84d844b8b73e858e0f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -60,11 +60,11 @@
|
||||||
},
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1659937593,
|
"lastModified": 1665240972,
|
||||||
"narHash": "sha256-tJBCAV7GwxxisvnlUK5YWwzeCm4q9OGgvEE9WFiypiI=",
|
"narHash": "sha256-g8D/+byiwKD1pyFPUtVe9e3tmJtbnXXMh5b+jBLAokQ=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nur",
|
"repo": "nur",
|
||||||
"rev": "6daa0a7c4ae5c3951ac945b299d40e232674aaaf",
|
"rev": "216b4de2d1351cd1c09f1cd6b7345053dffdc50d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -83,11 +83,11 @@
|
||||||
},
|
},
|
||||||
"utils": {
|
"utils": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1653893745,
|
"lastModified": 1659877975,
|
||||||
"narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
|
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
|
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
14
home.nix
14
home.nix
|
@ -24,12 +24,14 @@
|
||||||
VISUAL = "$EDITOR";
|
VISUAL = "$EDITOR";
|
||||||
};
|
};
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
( python39.withPackages (ps: with ps; [ pip flake8 black ]) )
|
( python310.withPackages (ps: with ps; [ pip flake8 black ]) )
|
||||||
adoptopenjdk-bin
|
# adoptopenjdk-hotspot-bin-17
|
||||||
|
jdk
|
||||||
any-nix-shell
|
any-nix-shell
|
||||||
aspell
|
aspell
|
||||||
bloop
|
bloop
|
||||||
cabal-install
|
cabal-install
|
||||||
|
cabal2nix
|
||||||
cachix
|
cachix
|
||||||
cmake
|
cmake
|
||||||
coursier
|
coursier
|
||||||
|
@ -39,9 +41,11 @@
|
||||||
ffmpeg
|
ffmpeg
|
||||||
font-awesome
|
font-awesome
|
||||||
gitAndTools.diff-so-fancy
|
gitAndTools.diff-so-fancy
|
||||||
|
ghc
|
||||||
|
ghcid
|
||||||
gnupg
|
gnupg
|
||||||
go
|
go
|
||||||
haskellPackages.implicit-hie
|
haskell-language-server
|
||||||
hugo
|
hugo
|
||||||
luajit
|
luajit
|
||||||
luajitPackages.luarocks
|
luajitPackages.luarocks
|
||||||
|
@ -56,7 +60,7 @@
|
||||||
niv
|
niv
|
||||||
nix-index
|
nix-index
|
||||||
nixfmt
|
nixfmt
|
||||||
nixFlakes
|
nix-prefetch-git
|
||||||
nodePackages.pyright
|
nodePackages.pyright
|
||||||
nodePackages.typescript-language-server
|
nodePackages.typescript-language-server
|
||||||
nodePackages.vscode-html-languageserver-bin
|
nodePackages.vscode-html-languageserver-bin
|
||||||
|
@ -65,7 +69,7 @@
|
||||||
openssl
|
openssl
|
||||||
pandoc
|
pandoc
|
||||||
patchelf
|
patchelf
|
||||||
poetry
|
# poetry
|
||||||
rclone
|
rclone
|
||||||
readline
|
readline
|
||||||
ripgrep
|
ripgrep
|
||||||
|
|
|
@ -62,6 +62,14 @@ local function load_plugins()
|
||||||
'f3fora/nvim-texlabconfig',
|
'f3fora/nvim-texlabconfig',
|
||||||
run = 'go build'
|
run = 'go build'
|
||||||
}
|
}
|
||||||
|
use {
|
||||||
|
'phaazon/mind.nvim',
|
||||||
|
branch = 'v2.2',
|
||||||
|
requires = { 'nvim-lua/plenary.nvim' },
|
||||||
|
config = function()
|
||||||
|
require'mind'.setup()
|
||||||
|
end
|
||||||
|
}
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -462,7 +470,7 @@ _G.load_config = function()
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Enable the following language servers
|
-- Enable the following language servers
|
||||||
local servers = { 'html', 'jdtls', 'jsonls', 'pyright', 'rnix', 'rust_analyzer','sourcekit', 'tsserver', 'yamlls' }
|
local servers = { 'hls', 'html', 'jdtls', 'jsonls', 'pyright', 'rnix', 'rust_analyzer','sourcekit', 'tsserver', 'yamlls' }
|
||||||
for _, lsp in ipairs(servers) do
|
for _, lsp in ipairs(servers) do
|
||||||
nvim_lsp[lsp].setup { on_attach = on_attach }
|
nvim_lsp[lsp].setup { on_attach = on_attach }
|
||||||
end
|
end
|
||||||
|
@ -513,9 +521,7 @@ _G.load_config = function()
|
||||||
nvim_lsp.sumneko_lua.setup(luadev)
|
nvim_lsp.sumneko_lua.setup(luadev)
|
||||||
|
|
||||||
-- metals
|
-- metals
|
||||||
vim.g.metals_server_version = '0.11.8'
|
vim.g.metals_server_version = '0.11.9'
|
||||||
vim.opt_global.completeopt = { "menuone", "noinsert", "noselect" }
|
|
||||||
vim.opt_global.shortmess:remove("F"):append("c")
|
|
||||||
local metals_config = require('metals').bare_config()
|
local metals_config = require('metals').bare_config()
|
||||||
metals_config.settings = {
|
metals_config.settings = {
|
||||||
showImplicitArguments = true,
|
showImplicitArguments = true,
|
||||||
|
|
Loading…
Reference in a new issue