feat: Update to latest nixvim and nixpkgs

This commit is contained in:
uttarayan21
2024-09-17 19:21:46 +05:30
parent 8e1bc492a4
commit 33c7d05ba7
6 changed files with 302 additions and 285 deletions

116
neovim/flake.lock generated
View File

@@ -123,11 +123,11 @@
]
},
"locked": {
"lastModified": 1722555600,
"narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
"lastModified": 1726153070,
"narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
"rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
"type": "github"
},
"original": {
@@ -144,11 +144,11 @@
]
},
"locked": {
"lastModified": 1725234343,
"narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=",
"lastModified": 1726153070,
"narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "567b938d64d4b4112ee253b9274472dc3a346eb6",
"rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
"type": "github"
},
"original": {
@@ -201,11 +201,11 @@
"systems": "systems_2"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"lastModified": 1726560853,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github"
},
"original": {
@@ -261,11 +261,11 @@
]
},
"locked": {
"lastModified": 1724857454,
"narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=",
"lastModified": 1725513492,
"narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6",
"rev": "7570de7b9b504cfe92025dd1be797bf546f66528",
"type": "github"
},
"original": {
@@ -288,11 +288,11 @@
]
},
"locked": {
"lastModified": 1724857454,
"narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=",
"lastModified": 1725513492,
"narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6",
"rev": "7570de7b9b504cfe92025dd1be797bf546f66528",
"type": "github"
},
"original": {
@@ -348,11 +348,11 @@
"gp-nvim": {
"flake": false,
"locked": {
"lastModified": 1723453874,
"narHash": "sha256-2vjPoRiT26dftA0t4hdGedN6qZyIgQUjGMRF4IND/O4=",
"lastModified": 1725969177,
"narHash": "sha256-Tvcu8oRfbuc7JX+uYFmpMjzcrnUudJMEMxjd+yNfn5o=",
"owner": "Robitx",
"repo": "gp.nvim",
"rev": "861ed5240214dc76b00edeaec15e71370a7a5046",
"rev": "f4cbbf489fb621ae8f4e512c38ae234ce1157fa7",
"type": "github"
},
"original": {
@@ -407,11 +407,11 @@
]
},
"locked": {
"lastModified": 1724435763,
"narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
"lastModified": 1726357542,
"narHash": "sha256-p4OrJL2weh0TRtaeu1fmNYP6+TOp/W2qdaIJxxQay4c=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
"rev": "e524c57b1fa55d6ca9d8354c6ce1e538d2a1f47f",
"type": "github"
},
"original": {
@@ -423,11 +423,11 @@
"navigator": {
"flake": false,
"locked": {
"lastModified": 1724761847,
"narHash": "sha256-IhCfsuR/ZMvP52aseFFkPsOwbCWIVh0oqImQQeVjko4=",
"lastModified": 1725848935,
"narHash": "sha256-c6LjkRlR4g8lAqI7GqqtJ/tn48Gx2PxXYeeAM/YORbg=",
"owner": "ray-x",
"repo": "navigator.lua",
"rev": "53efe4b5cea5e99d2216449330f205d71251fdc7",
"rev": "df3d3a09d5b4986558062425639ca8dd1e9a34c2",
"type": "github"
},
"original": {
@@ -456,16 +456,16 @@
"neorg": {
"flake": false,
"locked": {
"lastModified": 1703783667,
"narHash": "sha256-Q5V3ru+fgPYS3OxN5jDMh+4Vi9eJOuq5cC/kJ6neJ3I=",
"lastModified": 1721818770,
"narHash": "sha256-f6hJbZEcf9XGTLxUikTOu2Kq53hlAC08JJbz76gQk6I=",
"owner": "nvim-neorg",
"repo": "neorg",
"rev": "4cbedbbdd4ccb6f45a2045477f5658a1311dffa3",
"rev": "81ee90cb2d72ac43bfadb7dd276646f34c8f85be",
"type": "github"
},
"original": {
"owner": "nvim-neorg",
"ref": "v7.0.0",
"ref": "v9.1.1",
"repo": "neorg",
"type": "github"
}
@@ -505,11 +505,11 @@
"neorg_2": {
"flake": false,
"locked": {
"lastModified": 1725315344,
"narHash": "sha256-DFC/qgPAsqEo/ngSx04npdwiRS3qW4bPc5W/0BD2jFY=",
"lastModified": 1725804232,
"narHash": "sha256-IOhb06MIC8LLPpa1XnZ7TRqKWUabHeBa3X2p9Y/bT4s=",
"owner": "nvim-neorg",
"repo": "neorg",
"rev": "d5965efe17e28a60cdbf14e97b87723a83f0c962",
"rev": "ba35900b21921c439e676b063a79c8fad914eac9",
"type": "github"
},
"original": {
@@ -521,11 +521,11 @@
"neovim-src": {
"flake": false,
"locked": {
"lastModified": 1725446059,
"narHash": "sha256-N+XyobzJsFXVivL/uu8lHSc9vxlM3j5SSOc4G9B0SyA=",
"lastModified": 1726482815,
"narHash": "sha256-M2syKjdJH3uBCOAm9PZndNI46m6xGLXsOadUSen8wpY=",
"owner": "neovim",
"repo": "neovim",
"rev": "b6e350a6b4df40fcc99931c460668c36fadc9989",
"rev": "a0d8c2b86e788ce4273f0b8df258cd9e8e432d38",
"type": "github"
},
"original": {
@@ -542,11 +542,11 @@
]
},
"locked": {
"lastModified": 1724561770,
"narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=",
"lastModified": 1726188813,
"narHash": "sha256-Vop/VRi6uCiScg/Ic+YlwsdIrLabWUJc57dNczp0eBc=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e",
"rev": "21fe31f26473c180390cfa81e3ea81aca0204c80",
"type": "github"
},
"original": {
@@ -557,11 +557,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1725432240,
"narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=",
"lastModified": 1726463316,
"narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "ad416d066ca1222956472ab7d0555a6946746a80",
"rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172",
"type": "github"
},
"original": {
@@ -618,11 +618,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1725563454,
"narHash": "sha256-RQ9aKwXmqNHMBFOlHEUVrAFo7YHJSVn4nBgi2rcaCY4=",
"lastModified": 1726502324,
"narHash": "sha256-I/WFSIBeIjlY3CgSJ6IRYxP2aEJ6b42Y1HAeATlBh48=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "84249a9dabdf930d968d248024c4d6240ee14548",
"rev": "2e3083e42509c399b224239f6d7fa17976b18536",
"type": "github"
},
"original": {
@@ -643,11 +643,11 @@
]
},
"locked": {
"lastModified": 1725515460,
"narHash": "sha256-ybr3YTmjhVOuCWdacABUPxfUlVNqy0ya3s2sZ8zgyTw=",
"lastModified": 1726550932,
"narHash": "sha256-3iDVHqGq8mhP46XqIpepiURz4RJXwGUO0cHtplHhbX0=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"rev": "e8df4bbcb3a2d18a32d8a50bd72c3175227f7468",
"rev": "90aaa1e9e6ff67b29840d357413f822056212c08",
"type": "github"
},
"original": {
@@ -668,11 +668,11 @@
"norg-meta": "norg-meta"
},
"locked": {
"lastModified": 1725590404,
"narHash": "sha256-fnbpWkfaenyF0qnw4OIJCRMYfdetxLwA9aHcEl4PyxM=",
"lastModified": 1726561227,
"narHash": "sha256-rrE6YH5jpEzwLcTk9BeNNBhMVg9j7y4X8/4DTysIKWY=",
"owner": "nvim-neorg",
"repo": "nixpkgs-neorg-overlay",
"rev": "df2022d80ed50e7d2ff5a6739a78e1427bb3bdd1",
"rev": "fd8139aca9b75b00eb5ad94923c39ea61e75dbb4",
"type": "github"
},
"original": {
@@ -731,11 +731,11 @@
]
},
"locked": {
"lastModified": 1724584782,
"narHash": "sha256-7FfHv7b1jwMPSu9SPY9hdxStk8E6EeSwzqdvV69U4BM=",
"lastModified": 1726392886,
"narHash": "sha256-9RtOuG7V8KG8IU8nZje5EQ1WSM/inr7+zb3tAgTiHDM=",
"owner": "NuschtOS",
"repo": "search",
"rev": "5a08d691de30b6fc28d58ce71a5e420f2694e087",
"rev": "97d34b70deed4878fcb2449ac89dab717d72efa1",
"type": "github"
},
"original": {
@@ -779,11 +779,11 @@
"rest-nvim": {
"flake": false,
"locked": {
"lastModified": 1725579296,
"narHash": "sha256-Bw5zxVX3a5s9mUfK8XWhE6tUn77q6I7O9iCOEkIEgUg=",
"lastModified": 1726329214,
"narHash": "sha256-Xg2rVQurH/7qnYoIDHeYjRg9rOImeGiWBd/XMI+MTg8=",
"owner": "rest-nvim",
"repo": "rest.nvim",
"rev": "9e00468da985082faa472e689ffda59e63154270",
"rev": "9f6f9dd928d612e52e756f0a0c057ee3cf16c39b",
"type": "github"
},
"original": {
@@ -898,11 +898,11 @@
]
},
"locked": {
"lastModified": 1724833132,
"narHash": "sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos=",
"lastModified": 1725271838,
"narHash": "sha256-VcqxWT0O/gMaeWTTjf1r4MOyG49NaNxW4GHTO3xuThE=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "3ffd842a5f50f435d3e603312eefa4790db46af5",
"rev": "9fb342d14b69aefdf46187f6bb80a4a0d97007cd",
"type": "github"
},
"original": {

View File

@@ -19,7 +19,7 @@
flake = false;
};
neorg = {
url = "github:nvim-neorg/neorg/v7.0.0";
url = "github:nvim-neorg/neorg/v9.1.1";
flake = false;
};
neorg-telescope = {

View File

@@ -94,12 +94,50 @@ in rec {
enable = true;
settings = {
adapters = [
''require('rustaceanvim.neotest')''
# ''require('rustaceanvim.neotest')''
];
};
};
neorg = {
enable = true;
modules = {
"core.defaults" = {
__empty = null;
};
"core.completion" = {
config = {
engine = "nvim-cmp";
name = "[Norg]";
};
};
"core.concealer" = {
config = {
icon_preset = "diamond";
};
};
"core.keybinds" = {
config = {
default_keybinds = true;
neorg_leader = "<C-m>";
};
};
"core.integrations.treesitter" = {
config.install_parsers = false;
config.configure_parsers = false;
};
"core.dirman" = {
config = {
default_workspace = "Notes";
workspaces = {
Notes = "~/Nextcloud/Notes";
Work = "~/Nextcloud/Work";
};
};
};
};
};
rest.enable = true;
# rest.enable = true;
comment = {
enable = true;
@@ -144,14 +182,15 @@ in rec {
settings.indent.enable = true;
folding = true;
grammarPackages =
pkgs.vimPlugins.nvim-treesitter.allGrammars
++ (with pkgs.tree-sitter-grammars; [
tree-sitter-http
(with pkgs.tree-sitter-grammars; [
tree-sitter-norg
tree-sitter-norg-meta
# tree-sitter-http
tree-sitter-just
tree-sitter-nu
tree-sitter-d2
tree-sitter-norg-meta
]);
])
++ pkgs.vimPlugins.nvim-treesitter.allGrammars;
};
telescope = {
@@ -205,24 +244,29 @@ in rec {
'';
};
rustaceanvim = {
enable = true;
enable = false;
settings = {
server = {
# on_attach =
# /*
# lua
# */
# ''
# function(client, bufnr)
# if client.server_capabilities.inlayHintProvider then
# vim.lsp.inlay_hint.enable(true)
# end
# end
# '';
default_settings = {
rust-analyzer = {
files = {
excludeDirs = [".git" ".direnv"];
excludeDirs = [
".cargo"
".direnv"
".git"
"node_modules"
"target"
];
};
diagnostics = {
enable = true;
styleLints.enable = true;
};
checkOnSave = true;
check = {
command = "clippy";
features = "all";
};
};
};
@@ -256,7 +300,22 @@ in rec {
html.enable = true;
ast-grep.enable = true;
# pylyzer.enable = true;
# rust-analyzer.enable = false;
rust-analyzer = {
enable = true;
installCargo = false;
installRustc = false;
settings = {
files = {
excludeDirs = [
".cargo"
".direnv"
".git"
"node_modules"
"target"
];
};
};
};
};
onAttach =
/*
@@ -392,11 +451,11 @@ in rec {
};
autoCmd = [
{
event = ["BufEnter" "BufWinEnter"];
pattern = "*.norg";
command = "set conceallevel=3";
}
# {
# event = ["BufEnter" "BufWinEnter"];
# pattern = "*.norg";
# command = "set conceallevel=3";
# }
{
event = ["BufWinLeave"];
pattern = "?*";
@@ -431,13 +490,12 @@ in rec {
end
end
-- catcher(require('rest-nvim').setup)
-- catcher(require('lspconfig').ast_grep.setup)
-- require('telescope').load_extension("dap")
-- require('telescope').load_extension("rest")
require('telescope').load_extension("neorg")
-- require('telescope').load_extension("neorg")
require("copilot").setup({
suggestion = {
@@ -464,36 +522,6 @@ in rec {
blend = 10,
})
local load = {
["core.defaults"] = {},
["core.completion"] = { config = { engine = "nvim-cmp", name = "[Norg]" } },
["core.concealer"] = {
config = { icon_preset = "diamond" }
},
["core.export"] = {},
["core.keybinds"] = {
-- https://github.com/nvim-neorg/neorg/blob/main/lua/neorg/modules/core/keybinds/keybinds.lua
config = {
default_keybinds = true,
neorg_leader = "<C-m>",
},
},
["core.dirman"] = {
config = {
default_workspace = "Notes",
workspaces = {
Notes = "~/Nextcloud/Notes",
Work = "~/Nextcloud/Work",
}
}
}
}
require('neorg').setup({
load = load,
})
require('octo').setup({
use_local_fs = false,
enable_builtin = false,
@@ -515,11 +543,11 @@ in rec {
if not vim.g.neovide then
require('neoscroll').setup()
require('image').setup({["backend"] = "kitty",["tmux_show_only_in_active_window"] = true})
load["core.integrations.image"] = {
config = {
tmux_show_only_in_active_window = true,
}
}
-- load["core.integrations.image"] = {
-- config = {
-- tmux_show_only_in_active_window = true,
-- }
-- }
else
vim.o.guifont = "Hasklug Nerd Font Mono:h13"
vim.g.neovide_cursor_vfx_mode = "railgun"
@@ -611,11 +639,11 @@ in rec {
ignore_blank_lines = true, -- ignore blank lines when sending visual select lines
})
vim.filetype.add({
extension = {
http = "http",
},
})
-- vim.filetype.add({
-- extension = {
-- http = "http",
-- },
-- })
vim.filetype.add({
filename = {
@@ -649,10 +677,6 @@ in rec {
foldlevelstart = 99;
};
extraPlugins = with pkgs.vimPlugins; [
# neorg
neorg
neorg-telescope
# Wut
image-nvim
@@ -672,9 +696,6 @@ in rec {
crates-nvim
luasnip
# No more postman
# rest-nvim
# UI
nvim-web-devicons
@@ -700,6 +721,9 @@ in rec {
pkgs.tree-sitter-grammars.tree-sitter-just
pkgs.tree-sitter-grammars.tree-sitter-nu
pkgs.tree-sitter-grammars.tree-sitter-norg
pkgs.tree-sitter-grammars.tree-sitter-norg-meta
];
extraLuaPackages = luaPkgs: with luaPkgs; [lua-utils-nvim nvim-nio pathlib-nvim];
};
}