Compare commits
37 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
dc5cb9f99f
|
|||
|
fde597485f
|
|||
|
ad8dc7546b
|
|||
|
640e246954
|
|||
|
52de2b8f4d
|
|||
|
4f822e88b8
|
|||
|
204ad75438
|
|||
|
761311c5f0
|
|||
|
90d3255556
|
|||
|
9734dc46e0
|
|||
| eb332e0123 | |||
|
11fd98c16b
|
|||
|
8cdea2c53b
|
|||
|
562db427c6
|
|||
|
aef12de964
|
|||
|
e24df7ff1f
|
|||
|
7e6617d3f4
|
|||
|
cb48c6da79
|
|||
|
0c56f239d1
|
|||
|
2eb10ca96c
|
|||
|
0572f1394f
|
|||
| b2620d58af | |||
| 97b13465a8 | |||
|
53e48ea9e8
|
|||
|
209f4d3ddd
|
|||
|
73b5a72f6f
|
|||
|
9c8b4e5d5a
|
|||
| 3f27e8495f | |||
| 56460e393c | |||
|
15a12bce41
|
|||
|
f0203cc6fe
|
|||
|
a99bb19d48
|
|||
|
1eb5d9d141
|
|||
|
681e045851
|
|||
|
9d1cf13fd1
|
|||
|
fa6148515c
|
|||
|
e482aa9e63
|
34
.gitea/workflows/build-flake.yml
Normal file
34
.gitea/workflows/build-flake.yml
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
---
|
||||||
|
name: build-flake
|
||||||
|
on:
|
||||||
|
workflow_call:
|
||||||
|
pull_request:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout repository
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
ref: "main"
|
||||||
|
- 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@v30
|
||||||
|
with:
|
||||||
|
extra_nix_config: |
|
||||||
|
experimental-features = nix-command flakes
|
||||||
|
github_access_token: ${{ secrets.GH_ACCESS_TOKEN }}
|
||||||
|
nix_path: nixpkgs=channel:nixos-24.05
|
||||||
|
- uses: cachix/cachix-action@v15
|
||||||
|
with:
|
||||||
|
name: palkx
|
||||||
|
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
|
||||||
|
extraPullNames: nix-community
|
||||||
|
- name: Build nix flake
|
||||||
|
run: |
|
||||||
|
while true; do sleep 1; rm -rf /homeless-shelter; done &
|
||||||
|
nix build
|
||||||
|
- name: Check nix flake
|
||||||
|
run: nix flake check --all-systems
|
||||||
9
.gitea/workflows/check-commits.yml
Normal file
9
.gitea/workflows/check-commits.yml
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
---
|
||||||
|
name: check-commits
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
check-commits:
|
||||||
|
name: Check commits
|
||||||
|
uses: xaked/actions/.gitea/workflows/cog-check.yml@2.0.0
|
||||||
15
.gitea/workflows/release.yml
Normal file
15
.gitea/workflows/release.yml
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
---
|
||||||
|
name: build-flake
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
name: Build flake
|
||||||
|
uses: ./.gitea/workflows/build-flake.yml
|
||||||
|
release:
|
||||||
|
name: Release a new version
|
||||||
|
needs: build
|
||||||
|
uses: xaked/actions/.gitea/workflows/cog-release.yml@2.0.0
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
name: update-flake-lock
|
|
||||||
on:
|
|
||||||
schedule:
|
|
||||||
- cron: "0 1 0 * *"
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
lockfile:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Checkout repository
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
ref: "main"
|
|
||||||
- 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
|
|
||||||
with:
|
|
||||||
github_access_token: ${{ secrets.GH_ACCESS_TOKEN }}
|
|
||||||
- name: Update nix flake lockfile
|
|
||||||
run: |
|
|
||||||
nix --extra-experimental-features nix-command --extra-experimental-features flakes flake update
|
|
||||||
- name: Verify Changed files
|
|
||||||
uses: tj-actions/verify-changed-files@v19
|
|
||||||
id: verify-changed-files
|
|
||||||
with:
|
|
||||||
files: |
|
|
||||||
flake.lock
|
|
||||||
- name: Push updated lockfile
|
|
||||||
if: steps.verify-changed-files.outputs.files_changed == 'true'
|
|
||||||
run: |
|
|
||||||
git diff
|
|
||||||
git config --global user.name "Gitea Bot"
|
|
||||||
git config --global user.email "bot@git.palkoi.net"
|
|
||||||
git add flake.lock
|
|
||||||
git commit -m 'choke(nix-lock): bump flake.lock versions'
|
|
||||||
git push
|
|
||||||
@@ -1 +1,2 @@
|
|||||||
|
result
|
||||||
result/
|
result/
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{pkgs}:
|
{ pkgs }:
|
||||||
pkgs.stdenv.mkDerivation {
|
pkgs.stdenv.mkDerivation {
|
||||||
name = "nvim-config";
|
name = "nvim-config";
|
||||||
src = ./src;
|
src = ./src;
|
||||||
|
|||||||
@@ -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")
|
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,28 +11,35 @@ require("lazy").setup({
|
|||||||
spec = {
|
spec = {
|
||||||
-- add LazyVim and import its plugins
|
-- add LazyVim and import its plugins
|
||||||
{ "LazyVim/LazyVim", import = "lazyvim.plugins" },
|
{ "LazyVim/LazyVim", import = "lazyvim.plugins" },
|
||||||
{ import = "lazyvim.plugins.extras.coding.codeium" },
|
-- Blink currently not supported by all extras 2024-11-19 11:08
|
||||||
{ import = "lazyvim.plugins.extras.editor.harpoon2" },
|
-- { import = "lazyvim.plugins.extras.coding.blink" },
|
||||||
|
{ import = "lazyvim.plugins.extras.editor.illuminate" },
|
||||||
|
{ import = "lazyvim.plugins.extras.editor.outline" },
|
||||||
|
{ import = "lazyvim.plugins.extras.editor.telescope" },
|
||||||
{ import = "lazyvim.plugins.extras.formatting.prettier" },
|
{ import = "lazyvim.plugins.extras.formatting.prettier" },
|
||||||
{ import = "lazyvim.plugins.extras.lang.ansible" },
|
{ import = "lazyvim.plugins.extras.lang.ansible" },
|
||||||
{ import = "lazyvim.plugins.extras.lang.docker" },
|
{ import = "lazyvim.plugins.extras.lang.docker" },
|
||||||
|
{ import = "lazyvim.plugins.extras.lang.git" },
|
||||||
{ import = "lazyvim.plugins.extras.lang.go" },
|
{ import = "lazyvim.plugins.extras.lang.go" },
|
||||||
{ import = "lazyvim.plugins.extras.lang.helm" },
|
{ import = "lazyvim.plugins.extras.lang.helm" },
|
||||||
{ import = "lazyvim.plugins.extras.lang.java" },
|
{ import = "lazyvim.plugins.extras.lang.java" },
|
||||||
{ import = "lazyvim.plugins.extras.lang.json" },
|
{ import = "lazyvim.plugins.extras.lang.json" },
|
||||||
{ import = "lazyvim.plugins.extras.lang.markdown" },
|
{ import = "lazyvim.plugins.extras.lang.markdown" },
|
||||||
|
{ import = "lazyvim.plugins.extras.lang.nix" },
|
||||||
{ import = "lazyvim.plugins.extras.lang.python" },
|
{ import = "lazyvim.plugins.extras.lang.python" },
|
||||||
{ import = "lazyvim.plugins.extras.lang.rust" },
|
{ import = "lazyvim.plugins.extras.lang.rust" },
|
||||||
{ import = "lazyvim.plugins.extras.lang.scala" },
|
{ import = "lazyvim.plugins.extras.lang.scala" },
|
||||||
|
{ import = "lazyvim.plugins.extras.lang.sql" },
|
||||||
{ import = "lazyvim.plugins.extras.lang.terraform" },
|
{ import = "lazyvim.plugins.extras.lang.terraform" },
|
||||||
|
{ import = "lazyvim.plugins.extras.lang.toml" },
|
||||||
|
{ import = "lazyvim.plugins.extras.lang.typescript" },
|
||||||
{ import = "lazyvim.plugins.extras.lang.yaml" },
|
{ import = "lazyvim.plugins.extras.lang.yaml" },
|
||||||
{ import = "lazyvim.plugins.extras.ui.mini-animate" },
|
{ import = "lazyvim.plugins.extras.ui.mini-animate" },
|
||||||
{ import = "plugins.tokyonight" },
|
{ import = "lazyvim.plugins.extras.ui.mini-indentscope" },
|
||||||
{ import = "plugins.telescope" },
|
{ import = "lazyvim.plugins.extras.ui.treesitter-context" },
|
||||||
{ import = "plugins.lang.nix" },
|
{ import = "plugins.catppuccin" },
|
||||||
{ import = "plugins.lang.shell" },
|
{ import = "plugins.lang.shell" },
|
||||||
{ import = "plugins.misc.tmux-navigator" },
|
{ import = "plugins.misc.tmux-navigator" },
|
||||||
{ import = "plugins.undotree" },
|
|
||||||
},
|
},
|
||||||
defaults = {
|
defaults = {
|
||||||
-- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup.
|
-- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup.
|
||||||
@@ -40,28 +47,14 @@ require("lazy").setup({
|
|||||||
lazy = false,
|
lazy = false,
|
||||||
-- It's recommended to leave version=false for now, since a lot the plugin that support versioning,
|
-- It's recommended to leave version=false for now, since a lot the plugin that support versioning,
|
||||||
-- have outdated releases, which may break your Neovim install.
|
-- have outdated releases, which may break your Neovim install.
|
||||||
version = false, -- always use the latest git commit
|
version = nil, -- always use the latest git commit
|
||||||
-- version = "*", -- try installing the latest stable version for plugins that support semver
|
-- version = "*", -- try installing the latest stable version for plugins that support semver
|
||||||
},
|
},
|
||||||
news = {
|
install = { colorscheme = { "catppuccin-macchiato" } },
|
||||||
lazyvim = false,
|
checker = { enabled = true, frequency = 60 * 60 * 24 }, -- automatically check for plugin updates once per day
|
||||||
neovim = false,
|
|
||||||
},
|
|
||||||
install = { colorscheme = { "tokyonight", "habamax" } },
|
|
||||||
checker = { enabled = true }, -- automatically check for plugin updates
|
|
||||||
performance = {
|
performance = {
|
||||||
rtp = {
|
cache = {
|
||||||
-- disable some rtp plugins
|
enabled = true,
|
||||||
disabled_plugins = {
|
|
||||||
"gzip",
|
|
||||||
-- "matchit",
|
|
||||||
-- "matchparen",
|
|
||||||
-- "netrwPlugin",
|
|
||||||
"tarPlugin",
|
|
||||||
"tohtml",
|
|
||||||
"tutor",
|
|
||||||
"zipPlugin",
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|||||||
62
config/src/nvim/lua/plugins/catppuccin.lua
Normal file
62
config/src/nvim/lua/plugins/catppuccin.lua
Normal file
@@ -0,0 +1,62 @@
|
|||||||
|
return {
|
||||||
|
"catppuccin/nvim",
|
||||||
|
lazy = true,
|
||||||
|
name = "catppuccin",
|
||||||
|
opts = {
|
||||||
|
flavour = "macchiato",
|
||||||
|
transparent_background = false,
|
||||||
|
integrations = {
|
||||||
|
aerial = true,
|
||||||
|
alpha = true,
|
||||||
|
cmp = true,
|
||||||
|
dashboard = true,
|
||||||
|
flash = true,
|
||||||
|
grug_far = true,
|
||||||
|
gitsigns = true,
|
||||||
|
headlines = true,
|
||||||
|
illuminate = true,
|
||||||
|
indent_blankline = { enabled = true },
|
||||||
|
leap = true,
|
||||||
|
lsp_trouble = true,
|
||||||
|
mason = true,
|
||||||
|
markdown = true,
|
||||||
|
mini = true,
|
||||||
|
native_lsp = {
|
||||||
|
enabled = true,
|
||||||
|
underlines = {
|
||||||
|
errors = { "undercurl" },
|
||||||
|
hints = { "undercurl" },
|
||||||
|
warnings = { "undercurl" },
|
||||||
|
information = { "undercurl" },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
navic = { enabled = true, custom_bg = "lualine" },
|
||||||
|
neotest = true,
|
||||||
|
neotree = true,
|
||||||
|
noice = true,
|
||||||
|
notify = true,
|
||||||
|
semantic_tokens = true,
|
||||||
|
telescope = true,
|
||||||
|
treesitter = true,
|
||||||
|
treesitter_context = true,
|
||||||
|
which_key = true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
specs = {
|
||||||
|
{
|
||||||
|
"akinsho/bufferline.nvim",
|
||||||
|
optional = true,
|
||||||
|
opts = function(_, opts)
|
||||||
|
if (vim.g.colors_name or ""):find("catppuccin") then
|
||||||
|
opts.highlights = require("catppuccin.groups.integrations.bufferline").get()
|
||||||
|
end
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"LazyVim/LazyVim",
|
||||||
|
opts = {
|
||||||
|
colorscheme = "catppuccin-macchiato",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
9
config/src/nvim/lua/plugins/misc/bigfile.lua
Normal file
9
config/src/nvim/lua/plugins/misc/bigfile.lua
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
return {
|
||||||
|
-- Disable certain features if file is big
|
||||||
|
{
|
||||||
|
"LunarVim/bigfile.nvim",
|
||||||
|
opts = {
|
||||||
|
filesize = 0.5,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
return {
|
return {
|
||||||
"telescope.nvim",
|
"nvim-telescope/telescope.nvim",
|
||||||
dependencies = {
|
dependencies = {
|
||||||
"nvim-telescope/telescope-fzf-native.nvim",
|
"nvim-telescope/telescope-fzf-native.nvim",
|
||||||
build = "make",
|
build = "make",
|
||||||
@@ -7,4 +7,25 @@ return {
|
|||||||
require("telescope").load_extension("fzf")
|
require("telescope").load_extension("fzf")
|
||||||
end,
|
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,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
return {
|
return {
|
||||||
"folke/tokyonight.nvim",
|
"folke/tokyonight.nvim",
|
||||||
opts = {
|
opts = {
|
||||||
transparent = true,
|
transparent = true,
|
||||||
styles = {
|
styles = {
|
||||||
sidebars = "transparent",
|
sidebars = "transparent",
|
||||||
floats = "transparent",
|
floats = "transparent",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
6
config/src/nvim/lua/plugins/ui/colorizer.lua
Normal file
6
config/src/nvim/lua/plugins/ui/colorizer.lua
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
return {
|
||||||
|
"chrisbra/Colorizer",
|
||||||
|
keys = {
|
||||||
|
{ "<leader>uR", "<cmd>ColorToggle<cr>", desc = "Toggle Colorizer" },
|
||||||
|
},
|
||||||
|
}
|
||||||
213
flake.lock
generated
213
flake.lock
generated
@@ -1,15 +1,89 @@
|
|||||||
{
|
{
|
||||||
"nodes": {
|
"nodes": {
|
||||||
|
"flake-compat": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1732722421,
|
||||||
|
"narHash": "sha256-HRJ/18p+WoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg=",
|
||||||
|
"owner": "edolstra",
|
||||||
|
"repo": "flake-compat",
|
||||||
|
"rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "edolstra",
|
||||||
|
"repo": "flake-compat",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"flake-compat_2": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1696426674,
|
||||||
|
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
||||||
|
"owner": "edolstra",
|
||||||
|
"repo": "flake-compat",
|
||||||
|
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "edolstra",
|
||||||
|
"repo": "flake-compat",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"flake-parts": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs-lib": [
|
||||||
|
"neovim-nightly-overlay",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1730504689,
|
||||||
|
"narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
|
||||||
|
"owner": "hercules-ci",
|
||||||
|
"repo": "flake-parts",
|
||||||
|
"rev": "506278e768c2a08bec68eb62932193e341f55c90",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "hercules-ci",
|
||||||
|
"repo": "flake-parts",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"flake-parts_2": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs-lib": [
|
||||||
|
"neovim-nightly-overlay",
|
||||||
|
"hercules-ci-effects",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1712014858,
|
||||||
|
"narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
|
||||||
|
"owner": "hercules-ci",
|
||||||
|
"repo": "flake-parts",
|
||||||
|
"rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"id": "flake-parts",
|
||||||
|
"type": "indirect"
|
||||||
|
}
|
||||||
|
},
|
||||||
"flake-utils": {
|
"flake-utils": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710146030,
|
"lastModified": 1731533236,
|
||||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -18,57 +92,130 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-utils_2": {
|
"git-hooks": {
|
||||||
"locked": {
|
|
||||||
"lastModified": 1667395993,
|
|
||||||
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"neovim": {
|
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_2",
|
"flake-compat": "flake-compat_2",
|
||||||
|
"gitignore": "gitignore",
|
||||||
|
"nixpkgs": [
|
||||||
|
"neovim-nightly-overlay",
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"nixpkgs-stable": [
|
||||||
|
"neovim-nightly-overlay",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1732021966,
|
||||||
|
"narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
|
||||||
|
"owner": "cachix",
|
||||||
|
"repo": "git-hooks.nix",
|
||||||
|
"rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "cachix",
|
||||||
|
"repo": "git-hooks.nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"gitignore": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"neovim-nightly-overlay",
|
||||||
|
"git-hooks",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1709087332,
|
||||||
|
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
|
||||||
|
"owner": "hercules-ci",
|
||||||
|
"repo": "gitignore.nix",
|
||||||
|
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "hercules-ci",
|
||||||
|
"repo": "gitignore.nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"hercules-ci-effects": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-parts": "flake-parts_2",
|
||||||
|
"nixpkgs": [
|
||||||
|
"neovim-nightly-overlay",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1730903510,
|
||||||
|
"narHash": "sha256-mnynlrPeiW0nUQ8KGZHb3WyxAxA3Ye/BH8gMjdoKP6E=",
|
||||||
|
"owner": "hercules-ci",
|
||||||
|
"repo": "hercules-ci-effects",
|
||||||
|
"rev": "b89ac4d66d618b915b1f0a408e2775fe3821d141",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "hercules-ci",
|
||||||
|
"repo": "hercules-ci-effects",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"neovim-nightly-overlay": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-compat": "flake-compat",
|
||||||
|
"flake-parts": "flake-parts",
|
||||||
|
"git-hooks": "git-hooks",
|
||||||
|
"hercules-ci-effects": "hercules-ci-effects",
|
||||||
|
"neovim-src": "neovim-src",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "contrib",
|
"lastModified": 1733098025,
|
||||||
"lastModified": 1703942320,
|
"narHash": "sha256-HOzahkMv67wtSYcudRpGqNXjFwFoc2lwq0+Ev6h8T3k=",
|
||||||
"narHash": "sha256-CcaBqA0yFCffNPmXOJTo8c9v1jrEBiqAl8CG5Dj5YxE=",
|
"owner": "nix-community",
|
||||||
"owner": "neovim",
|
"repo": "neovim-nightly-overlay",
|
||||||
"repo": "neovim",
|
"rev": "73ec92a4c2773ead4af1c657ea81142d4a27fe78",
|
||||||
"rev": "8744ee8783a8597f9fce4a573ae05aca2f412120",
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "neovim-nightly-overlay",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"neovim-src": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1733090308,
|
||||||
|
"narHash": "sha256-oIbVYa5y0lgXDRaZUn0MdAKC2Vf9OakbtIFmbhL8K1k=",
|
||||||
|
"owner": "neovim",
|
||||||
|
"repo": "neovim",
|
||||||
|
"rev": "feb62d5429680278c1353c565db6bb3ecb3b7c24",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"dir": "contrib",
|
|
||||||
"owner": "neovim",
|
"owner": "neovim",
|
||||||
"ref": "stable",
|
|
||||||
"repo": "neovim",
|
"repo": "neovim",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1711124224,
|
"lastModified": 1732981179,
|
||||||
"narHash": "sha256-l0zlN/3CiodvWDtfBOVxeTwYSRz93muVbXWSpaMjXxM=",
|
"narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "56528ee42526794d413d6f244648aaee4a7b56c0",
|
"rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"ref": "nixos-23.11",
|
"ref": "nixos-24.11",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
@@ -76,7 +223,7 @@
|
|||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils",
|
"flake-utils": "flake-utils",
|
||||||
"neovim": "neovim",
|
"neovim-nightly-overlay": "neovim-nightly-overlay",
|
||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
79
flake.nix
79
flake.nix
@@ -1,42 +1,59 @@
|
|||||||
{
|
{
|
||||||
description = "NVIM Configuration";
|
description = "NVIM Configuration";
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
|
||||||
flake-utils.url = "github:numtide/flake-utils";
|
flake-utils.url = "github:numtide/flake-utils";
|
||||||
neovim = {
|
neovim-nightly-overlay = {
|
||||||
url = "github:neovim/neovim/stable?dir=contrib";
|
url = "github:nix-community/neovim-nightly-overlay";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
outputs = inputs @ {
|
|
||||||
self,
|
|
||||||
nixpkgs,
|
|
||||||
flake-utils,
|
|
||||||
neovim,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
flake-utils.lib.eachDefaultSystem (system: let
|
|
||||||
overlayFlakeInputs = prev: final: {
|
|
||||||
neovim = neovim.packages.${system}.neovim;
|
|
||||||
};
|
|
||||||
|
|
||||||
overlayLazyVim = prev: final: {
|
nixConfig = {
|
||||||
lazyVim = import ./packages/lazyVim.nix {
|
trusted-substituters = [
|
||||||
pkgs = final;
|
"https://nix-community.cachix.org"
|
||||||
|
"https://palkx.cachix.org"
|
||||||
|
];
|
||||||
|
extra-trusted-public-keys = [
|
||||||
|
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||||
|
"palkx.cachix.org-1:qaQoL5CXpGzUbqsIvxUEL7wUhoIrjV0Q8M4HbJ8/8S4="
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
outputs =
|
||||||
|
inputs@{
|
||||||
|
nixpkgs,
|
||||||
|
flake-utils,
|
||||||
|
neovim-nightly-overlay,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
flake-utils.lib.eachDefaultSystem (
|
||||||
|
system:
|
||||||
|
let
|
||||||
|
overlayFlakeInputs = prev: final: {
|
||||||
|
neovim = neovim-nightly-overlay.packages.${system}.default.overrideAttrs (oa: {
|
||||||
|
nativeBuildInputs = oa.nativeBuildInputs ++ [ final.libtermkey ];
|
||||||
|
});
|
||||||
};
|
};
|
||||||
};
|
|
||||||
|
|
||||||
pkgs = import nixpkgs {
|
overlayLazyVim = prev: final: { lazyVim = import ./packages/lazyVim.nix { pkgs = final; }; };
|
||||||
inherit system;
|
|
||||||
overlays = [overlayFlakeInputs overlayLazyVim];
|
pkgs = import nixpkgs {
|
||||||
};
|
inherit system;
|
||||||
in rec {
|
overlays = [
|
||||||
packages.lazyVim = pkgs.lazyVim;
|
overlayFlakeInputs
|
||||||
apps.lazyVim = {
|
overlayLazyVim
|
||||||
type = "app";
|
];
|
||||||
program = "${packages.default}/bin/nvim";
|
};
|
||||||
};
|
in
|
||||||
packages.default = packages.lazyVim;
|
rec {
|
||||||
apps.default = apps.lazyVim;
|
packages.lazyVim = pkgs.lazyVim;
|
||||||
});
|
apps.lazyVim = {
|
||||||
|
type = "app";
|
||||||
|
program = "${packages.default}/bin/nvim";
|
||||||
|
};
|
||||||
|
packages.default = packages.lazyVim;
|
||||||
|
apps.default = apps.lazyVim;
|
||||||
|
}
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,12 +1,13 @@
|
|||||||
{pkgs}: let
|
{ pkgs }:
|
||||||
config = import ../config {inherit pkgs;};
|
let
|
||||||
runtimeDeps = import ../runtimeDeps.nix {inherit pkgs;};
|
config = import ../config { inherit pkgs; };
|
||||||
|
runtimeDeps = import ../runtimeDeps.nix { inherit pkgs; };
|
||||||
in
|
in
|
||||||
pkgs.wrapNeovim pkgs.neovim {
|
pkgs.wrapNeovim pkgs.neovim {
|
||||||
viAlias = true;
|
viAlias = true;
|
||||||
vimAlias = true;
|
vimAlias = true;
|
||||||
withNodeJs = true;
|
withNodeJs = true;
|
||||||
withPython3 = true;
|
withPython3 = true;
|
||||||
withRuby = false;
|
withRuby = false;
|
||||||
extraMakeWrapperArgs = ''--prefix PATH : "${pkgs.lib.makeBinPath runtimeDeps.dependencies}" --set XDG_CONFIG_HOME "${config}"'';
|
extraMakeWrapperArgs = ''--prefix PATH : "${pkgs.lib.makeBinPath runtimeDeps.dependencies}" --set XDG_CONFIG_HOME "${config}"'';
|
||||||
}
|
}
|
||||||
|
|||||||
7
renovate.json5
Normal file
7
renovate.json5
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
||||||
|
"extends": ["local>local/renovate"],
|
||||||
|
"nix": {
|
||||||
|
"enabled": true
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,28 +1,34 @@
|
|||||||
{pkgs}: {
|
{ pkgs }:
|
||||||
dependencies = with pkgs; [
|
{
|
||||||
nixd # nix lsp
|
dependencies =
|
||||||
alejandra # nix formatter
|
with pkgs;
|
||||||
statix # linter for nix
|
[
|
||||||
ripgrep
|
nixfmt-rfc-style # nix formatter
|
||||||
fd
|
(terraform.overrideAttrs (oldAttrs: {
|
||||||
git
|
meta.license = lib.licenses.mpl20;
|
||||||
curl # needed to fetch titles from urls
|
})) # terraform fmt
|
||||||
wget
|
ripgrep
|
||||||
cargo
|
fd
|
||||||
php82
|
git
|
||||||
php82Packages.composer
|
curl # needed to fetch titles from urls
|
||||||
go
|
wget
|
||||||
ruby
|
cargo
|
||||||
luarocks
|
php82
|
||||||
zulu #java11
|
php82Packages.composer
|
||||||
fish
|
go
|
||||||
fzf
|
ruby
|
||||||
perl536
|
luarocks
|
||||||
perl536Packages.CPAN
|
zulu # java11
|
||||||
unzip
|
fish
|
||||||
tree-sitter
|
fzf
|
||||||
gcc
|
perl540
|
||||||
gnumake
|
perl540Packages.CPAN
|
||||||
lazygit
|
unzip
|
||||||
];
|
tree-sitter
|
||||||
|
gnumake
|
||||||
|
lazygit
|
||||||
|
python312
|
||||||
|
python312Packages.pip
|
||||||
|
]
|
||||||
|
++ (if pkgs.stdenv.hostPlatform.isDarwin then [ ] else [ gcc ]);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user