Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
2eb10ca96c
|
|||
|
0572f1394f
|
|||
| b2620d58af | |||
| 97b13465a8 | |||
|
53e48ea9e8
|
|||
|
209f4d3ddd
|
|||
|
73b5a72f6f
|
@@ -16,7 +16,7 @@ jobs:
|
||||
- name: Setup sudo (required for the next step)
|
||||
run: apt-get update && apt-get install -y sudo
|
||||
- name: Setup nix
|
||||
uses: cachix/install-nix-action@v26
|
||||
uses: cachix/install-nix-action@v27
|
||||
with:
|
||||
github_access_token: ${{ secrets.GH_ACCESS_TOKEN }}
|
||||
nix_path: nixpkgs=channel:nixos-23.11
|
||||
|
||||
@@ -1 +1 @@
|
||||
/usr/local/etc/xaked-nvim-lazygit-config.yml
|
||||
/tmp/lazyvim-lazygit/config.yml
|
||||
@@ -1 +1 @@
|
||||
/usr/local/etc/xaked-nvim-lazygit-state.yml
|
||||
/tmp/lazyvim-lazygit/state.yml
|
||||
@@ -1 +1,8 @@
|
||||
-- Configure symlinks needed by LazyVim
|
||||
vim.fn.system({ "mkdir", "-p", os.getenv("HOME") .. "/.config/lazyvim/nvim" })
|
||||
vim.fn.system({ "mkdir", "-p", os.getenv("HOME") .. "/.config/lazyvim/lazygit" })
|
||||
vim.fn.system({ "ln", "-sfT", os.getenv("HOME") .. "/.config/lazyvim/nvim", "/tmp/lazyvim-nvim" })
|
||||
vim.fn.system({ "ln", "-sfT", os.getenv("HOME") .. "/.config/lazyvim/lazygit", "/tmp/lazyvim-lazygit" })
|
||||
|
||||
-- Load lazyvim
|
||||
require("config.lazy")
|
||||
|
||||
@@ -1 +1 @@
|
||||
/usr/local/etc/xaked-nvim-lazy-lock.json
|
||||
/tmp/lazyvim-nvim/lazy-lock.json
|
||||
@@ -1 +1 @@
|
||||
/usr/local/etc/xaked-nvim-lazyvim.json
|
||||
/tmp/lazyvim-nvim/lazyvim.json
|
||||
@@ -11,8 +11,9 @@ require("lazy").setup({
|
||||
spec = {
|
||||
-- add LazyVim and import its plugins
|
||||
{ "LazyVim/LazyVim", import = "lazyvim.plugins" },
|
||||
{ import = "lazyvim.plugins.extras.coding.codeium" },
|
||||
{ import = "lazyvim.plugins.extras.editor.harpoon2" },
|
||||
-- { import = "lazyvim.plugins.extras.coding.codeium" },
|
||||
-- { import = "lazyvim.plugins.extras.editor.harpoon2" },
|
||||
{ import = "lazyvim.plugins.extras.editor.outline" },
|
||||
{ import = "lazyvim.plugins.extras.formatting.prettier" },
|
||||
{ import = "lazyvim.plugins.extras.lang.ansible" },
|
||||
{ import = "lazyvim.plugins.extras.lang.docker" },
|
||||
@@ -25,8 +26,10 @@ require("lazy").setup({
|
||||
{ import = "lazyvim.plugins.extras.lang.rust" },
|
||||
{ import = "lazyvim.plugins.extras.lang.scala" },
|
||||
{ import = "lazyvim.plugins.extras.lang.terraform" },
|
||||
{ import = "lazyvim.plugins.extras.lang.toml" },
|
||||
{ import = "lazyvim.plugins.extras.lang.yaml" },
|
||||
{ import = "lazyvim.plugins.extras.ui.mini-animate" },
|
||||
{ import = "lazyvim.plugins.extras.ui.treesitter-context" },
|
||||
{ import = "plugins.tokyonight" },
|
||||
{ import = "plugins.telescope" },
|
||||
{ import = "plugins.lang.nix" },
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
return {
|
||||
"telescope.nvim",
|
||||
"nvim-telescope/telescope.nvim",
|
||||
dependencies = {
|
||||
"nvim-telescope/telescope-fzf-native.nvim",
|
||||
build = "make",
|
||||
@@ -7,4 +7,25 @@ return {
|
||||
require("telescope").load_extension("fzf")
|
||||
end,
|
||||
},
|
||||
opts = {
|
||||
defaults = {
|
||||
file_ignore_patterns = {
|
||||
".git/",
|
||||
"^node_modules/",
|
||||
".cache",
|
||||
},
|
||||
},
|
||||
pickers = {
|
||||
live_grep = {
|
||||
additional_args = { "-L" },
|
||||
},
|
||||
grep_string = {
|
||||
additional_args = { "-L" },
|
||||
},
|
||||
find_files = {
|
||||
hidden = true,
|
||||
follow = true,
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
38
flake.lock
generated
38
flake.lock
generated
@@ -19,12 +19,15 @@
|
||||
}
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"inputs": {
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1667395993,
|
||||
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
|
||||
"lastModified": 1710146030,
|
||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
|
||||
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -42,11 +45,11 @@
|
||||
},
|
||||
"locked": {
|
||||
"dir": "contrib",
|
||||
"lastModified": 1703942320,
|
||||
"narHash": "sha256-CcaBqA0yFCffNPmXOJTo8c9v1jrEBiqAl8CG5Dj5YxE=",
|
||||
"lastModified": 1721805605,
|
||||
"narHash": "sha256-OsHIacgorYnB/dPbzl1b6rYUzQdhTtsJYLsFLJxregk=",
|
||||
"owner": "neovim",
|
||||
"repo": "neovim",
|
||||
"rev": "8744ee8783a8597f9fce4a573ae05aca2f412120",
|
||||
"rev": "7e194f0d0c33a0a1b7ccfaf2baafdacf7f22fbb5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -59,16 +62,16 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1715218190,
|
||||
"narHash": "sha256-R98WOBHkk8wIi103JUVQF3ei3oui4HvoZcz9tYOAwlk=",
|
||||
"lastModified": 1724727824,
|
||||
"narHash": "sha256-0XH9MJk54imJm+RHOLTUJ7e+ponLW00tw5ke4MTVa1Y=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9a9960b98418f8c385f52de3b09a63f9c561427a",
|
||||
"rev": "36bae45077667aff5720e5b3f1a5458f51cf0776",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-23.11",
|
||||
"ref": "nixos-24.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
@@ -94,6 +97,21 @@
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_2": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
description = "NVIM Configuration";
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
|
||||
flake-utils.url = "github:numtide/flake-utils";
|
||||
neovim = {
|
||||
url = "github:neovim/neovim/stable?dir=contrib";
|
||||
@@ -9,7 +9,6 @@
|
||||
};
|
||||
};
|
||||
outputs = inputs @ {
|
||||
self,
|
||||
nixpkgs,
|
||||
flake-utils,
|
||||
neovim,
|
||||
@@ -17,7 +16,9 @@
|
||||
}:
|
||||
flake-utils.lib.eachDefaultSystem (system: let
|
||||
overlayFlakeInputs = prev: final: {
|
||||
neovim = neovim.packages.${system}.neovim;
|
||||
neovim = neovim.packages.${system}.neovim.overrideAttrs (oa: {
|
||||
nativeBuildInputs = oa.nativeBuildInputs ++ [final.libtermkey];
|
||||
});
|
||||
};
|
||||
|
||||
overlayLazyVim = prev: final: {
|
||||
|
||||
Reference in New Issue
Block a user