summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--flake.lock86
-rw-r--r--pkgs/custom-neovim/config/lua/keymaps.lua7
-rw-r--r--pkgs/custom-neovim/config/lua/plugins/completion.lua25
-rw-r--r--pkgs/custom-neovim/default.nix5
4 files changed, 78 insertions, 45 deletions
diff --git a/flake.lock b/flake.lock
index fd9f42e..2e80500 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
"systems": "systems"
},
"locked": {
- "lastModified": 1750173260,
- "narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=",
+ "lastModified": 1754433428,
+ "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=",
"owner": "ryantm",
"repo": "agenix",
- "rev": "531beac616433bac6f9e2a19feb8e99a22a66baf",
+ "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d",
"type": "github"
},
"original": {
@@ -126,11 +126,11 @@
]
},
"locked": {
- "lastModified": 1753294394,
- "narHash": "sha256-1Dfgq09lHZ8AdYB2Deu/mYP1pMNpob8CgqT5Mzo44eI=",
+ "lastModified": 1755442500,
+ "narHash": "sha256-RHK4H6SWzkAtW/5WBHsyugaXJX25yr5y7FAZznxcBJs=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "1fde6fb1be6cd5dc513dc1c287d69e4eb2de973e",
+ "rev": "d2ffdedfc39c591367b1ddf22b4ce107f029dcc3",
"type": "github"
},
"original": {
@@ -146,11 +146,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
- "lastModified": 1753257349,
- "narHash": "sha256-Zb4528e94DwdUC0rKIX1+EFtkoelggWQakZ/YKemqJ4=",
+ "lastModified": 1755151620,
+ "narHash": "sha256-fVMalQZ+tRXR8oue2SdWu4CdlsS2NII+++rI40XQ8rU=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
- "rev": "e89a3203fbb3a833d7b7777efc13697b6a962cfd",
+ "rev": "16e12d22754d97064867006acae6e16da7a142a6",
"type": "github"
},
"original": {
@@ -161,11 +161,11 @@
},
"mnw": {
"locked": {
- "lastModified": 1748710831,
- "narHash": "sha256-eZu2yH3Y2eA9DD3naKWy/sTxYS5rPK2hO7vj8tvUCSU=",
+ "lastModified": 1755352557,
+ "narHash": "sha256-v3ECXf6adCp3kCgZpbMAK244oXR50ghtFR2+0ekptMg=",
"owner": "Gerg-L",
"repo": "mnw",
- "rev": "cff958a4e050f8d917a6ff3a5624bc4681c6187d",
+ "rev": "93edfdc3015f2c6aaddba074ed8ae0e78569fff7",
"type": "github"
},
"original": {
@@ -184,11 +184,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
},
"locked": {
- "lastModified": 1753180174,
- "narHash": "sha256-YeCLUjYOjTN2c29ch5ELoYGRW/BMmyv+a0Q16FhmlnQ=",
+ "lastModified": 1755424351,
+ "narHash": "sha256-xcorYLNdtLpb0wH5CPlUcpmYQUxeK95j1X855xQw+DY=",
"owner": "sodiboo",
"repo": "niri-flake",
- "rev": "fdeb0c5367f6e183f19ee1521644cb0440582bde",
+ "rev": "9aa137af01f05386e5bb5050e983750017007a66",
"type": "github"
},
"original": {
@@ -217,11 +217,11 @@
"niri-unstable": {
"flake": false,
"locked": {
- "lastModified": 1752870529,
- "narHash": "sha256-23DJk5EfEDCq7Xy1QELcayG0VxbbWpdQ6t7jbhae1Ok=",
+ "lastModified": 1755419373,
+ "narHash": "sha256-EFH3zbpyLYjEboNV2Lmkxf9joEuFCmeYX+MMLRPStpg=",
"owner": "YaLTeR",
"repo": "niri",
- "rev": "fefc0bc0a71556eb75352e2b611e50eb5d3bf9c2",
+ "rev": "a6febb86aa5af0df7bf2792ca027ef95a503d599",
"type": "github"
},
"original": {
@@ -232,11 +232,11 @@
},
"nix-flatpak": {
"locked": {
- "lastModified": 1751276396,
- "narHash": "sha256-oOYrnKStMsOXST+wKnzuSZ49h8Dr1Q3mIn2f5Kb5GAw=",
+ "lastModified": 1754777568,
+ "narHash": "sha256-0bBqT+3XncgF8F03RFAamw9vdf0VmaDoIJLTGkjfQZs=",
"owner": "gmodena",
"repo": "nix-flatpak",
- "rev": "59adb9ad1cbd915494fc35cd0e0a9d582ca9de74",
+ "rev": "62f636b87ef6050760a8cb325cadb90674d1e23e",
"type": "github"
},
"original": {
@@ -274,11 +274,11 @@
"nixpkgs": "nixpkgs_4"
},
"locked": {
- "lastModified": 1753237324,
- "narHash": "sha256-iXvv/VYLMyAoaTadYrX0PGwd6N2wVX337Os6k8TAlF4=",
+ "lastModified": 1755309798,
+ "narHash": "sha256-eE0NI54C8Agj7xVpO+lwJG74u6dzID8HWxCP2sA5U/Y=",
"owner": "Infinidoge",
"repo": "nix-minecraft",
- "rev": "64ca2cbbf9c65dd3bd98192d74872a80e8dcb871",
+ "rev": "cedd99dd11cb48b4fdf40d69fbcba42acab1b629",
"type": "github"
},
"original": {
@@ -289,27 +289,27 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1745391562,
- "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=",
+ "lastModified": 1754028485,
+ "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7",
+ "rev": "59e69648d345d6e8fef86158c555730fa12af9de",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-unstable",
+ "ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1753115646,
- "narHash": "sha256-yLuz5cz5Z+sn8DRAfNkrd2Z1cV6DaYO9JMrEz4KZo/c=",
+ "lastModified": 1755274400,
+ "narHash": "sha256-rTInmnp/xYrfcMZyFMH3kc8oko5zYfxsowaLv1LVobY=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "92c2e04a475523e723c67ef872d8037379073681",
+ "rev": "ad7196ae55c295f53a7d1ec39e4a06d922f3b899",
"type": "github"
},
"original": {
@@ -321,11 +321,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1751984180,
- "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=",
+ "lastModified": 1755027561,
+ "narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0",
+ "rev": "005433b926e16227259a1843015b5b2b7f7d1fc3",
"type": "github"
},
"original": {
@@ -337,11 +337,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1752950548,
- "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=",
+ "lastModified": 1755186698,
+ "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "c87b95e25065c028d31a94f06a62927d18763fdf",
+ "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c",
"type": "github"
},
"original": {
@@ -369,11 +369,11 @@
},
"nixpkgs_5": {
"locked": {
- "lastModified": 1752950548,
- "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=",
+ "lastModified": 1755186698,
+ "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "c87b95e25065c028d31a94f06a62927d18763fdf",
+ "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c",
"type": "github"
},
"original": {
@@ -497,11 +497,11 @@
"xwayland-satellite-unstable": {
"flake": false,
"locked": {
- "lastModified": 1752338000,
- "narHash": "sha256-Fxlp/yKtynug0jyuauAmvZU2SzHCfwlwWf85j+IvQ0U=",
+ "lastModified": 1755219541,
+ "narHash": "sha256-yKV6xHaPbEbh5RPxAJnb9yTs1wypr7do86hFFGQm1w8=",
"owner": "Supreeeme",
"repo": "xwayland-satellite",
- "rev": "ba78881a68182ce338041846164cbfed0d70935c",
+ "rev": "5a184d435927c3423f0ad189ea2b490578450fb7",
"type": "github"
},
"original": {
diff --git a/pkgs/custom-neovim/config/lua/keymaps.lua b/pkgs/custom-neovim/config/lua/keymaps.lua
index 92dfd46..9b86e97 100644
--- a/pkgs/custom-neovim/config/lua/keymaps.lua
+++ b/pkgs/custom-neovim/config/lua/keymaps.lua
@@ -1,6 +1,6 @@
-- Create keymap function
local mapkey = function(mode, key, desc, action, plugin)
- local keymapper = plugin and require("lz.n").keymap(plugin).set or vim.keymap.set
+ local keymapper = plugin and require("lz.n").keymap(plugin).set or vim.keymap.set
keymapper(mode, key, action, {noremap = true, silent = true, desc = desc})
end
@@ -20,11 +20,14 @@ mapkey("n", "<leader>e", "Open file manager", ":lua MiniFiles.open()<cr>", "mini
mapkey("n", "<leader>g", "Manage git", "")
mapkey("n", "<leader>gg", "Open neogit", ":Neogit<cr>", "neogit")
mapkey("n", "<leader>ga", "Git add", ":Git add %:p<cr>", "mini-git")
-mapkey("n", "<leader>gr", "Git rm", ":Git rm %:p<cr>", "mini-git")
+mapkey("n", "<leader>gr", "Git remove", ":Git rm %:p<cr>", "mini-git")
mapkey("n", "<leader>gc", "Git commit", ":Git commit<cr>", "mini-git")
mapkey("n", "<leader>gp", "Git pull", ":Git pull<cr>", "mini-git")
mapkey("n", "<leader>gP", "Git push", ":Git push<cr>", "mini-git")
+-- Terminal
+mapkey("n", "<leader>t", "Open terminal", ":botright terminal<cr>")
+
-- Really delete
mapkey({"n", "v"}, "<leader>d", "Really delete", [["_d]])
mapkey({"n", "v"}, "<leader>x", "Really delete character", [["_x]])
diff --git a/pkgs/custom-neovim/config/lua/plugins/completion.lua b/pkgs/custom-neovim/config/lua/plugins/completion.lua
new file mode 100644
index 0000000..c238ebe
--- /dev/null
+++ b/pkgs/custom-neovim/config/lua/plugins/completion.lua
@@ -0,0 +1,25 @@
+return {
+ {
+ -- when in doubt, this plugin is the cause of cpu issues.
+ "blink.cmp",
+ enabled = true,
+ lazy = true,
+ event = {
+ "InsertEnter",
+ "CmdlineEnter",
+ },
+ after = function()
+ require("luasnip.loaders.from_vscode").lazy_load()
+ vim.cmd.packadd("luasnip")
+ vim.cmd.packadd("friendly-snippets")
+
+ require("blink.cmp").setup {
+ snippets = { preset = 'luasnip' },
+ sources = {
+ default = { 'lsp', 'path', 'snippets', 'buffer' },
+ },
+ }
+ end,
+ },
+ test = f
+}
diff --git a/pkgs/custom-neovim/default.nix b/pkgs/custom-neovim/default.nix
index 500ebde..a005656 100644
--- a/pkgs/custom-neovim/default.nix
+++ b/pkgs/custom-neovim/default.nix
@@ -26,6 +26,11 @@ inputs.mnw.lib.wrap pkgs {
mini-extra
plenary-nvim
+ # Completion Plugins
+ blink-cmp
+ luasnip
+ friendly-snippets
+
# Utility Plugins
mini-pairs
comment-nvim
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-04 02:45:59 +0000