ci: run build on mr and use release from template

.gitea/workflows/build-flake.yml

@@ -1,8 +1,7 @@
-name: check-flake
+---
+name: build-flake
 on:
-  push:
+  workflow_call:
-    branches:
-      - main
   pull_request:
 
 jobs:
@@ -16,10 +15,17 @@ 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@v30
         with:
+          extra_nix_config: |
+            experimental-features = nix-command flakes
           github_access_token: ${{ secrets.GH_ACCESS_TOKEN }}
-          nix_path: nixpkgs=channel:nixos-23.11
+          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 &

.gitea/workflows/release.yml

@@ -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/release.yml@main

.gitingore

@@ -1 +1,2 @@
+result
 result/

config/default.nix

@@ -1,4 +1,4 @@
-{pkgs}:
+{ pkgs }:
 pkgs.stdenv.mkDerivation {
   name = "nvim-config";
   src = ./src;

config/src/lazygit/config.yml

@@ -1 +1 @@
-/usr/local/etc/xaked-nvim-lazygit-config.yml
+/tmp/lazyvim-lazygit/config.yml

config/src/lazygit/state.yml

@@ -1 +1 @@
-/usr/local/etc/xaked-nvim-lazygit-state.yml
+/tmp/lazyvim-lazygit/state.yml

config/src/nvim/init.lua

@@ -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")

config/src/nvim/lazy-lock.json

@@ -1 +1 @@
-/usr/local/etc/xaked-nvim-lazy-lock.json
+/tmp/lazyvim-nvim/lazy-lock.json

config/src/nvim/lazyvim.json

@@ -1 +1 @@
-/usr/local/etc/xaked-nvim-lazyvim.json
+/tmp/lazyvim-nvim/lazyvim.json

config/src/nvim/lua/config/lazy.lua

@@ -11,29 +11,36 @@ require("lazy").setup({
   spec = {
     -- add LazyVim and import its 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.lang.ansible" },
     { import = "lazyvim.plugins.extras.lang.docker" },
+    { import = "lazyvim.plugins.extras.lang.git" },
     { import = "lazyvim.plugins.extras.lang.go" },
     { import = "lazyvim.plugins.extras.lang.helm" },
     { import = "lazyvim.plugins.extras.lang.java" },
     { import = "lazyvim.plugins.extras.lang.json" },
     { import = "lazyvim.plugins.extras.lang.markdown" },
+    { import = "lazyvim.plugins.extras.lang.nix" },
     { import = "lazyvim.plugins.extras.lang.python" },
     { import = "lazyvim.plugins.extras.lang.rust" },
     { import = "lazyvim.plugins.extras.lang.scala" },
+    { import = "lazyvim.plugins.extras.lang.sql" },
     { 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.mini-indentscope" },
-    { import = "plugins.tokyonight" },
+    { import = "lazyvim.plugins.extras.ui.treesitter-context" },
-    { import = "plugins.telescope" },
+    { import = "plugins.catppuccin" },
-    { import = "plugins.lang.nix" },
+    -- { import = "plugins.tokyonight" },
+    -- { import = "plugins.lang.nix" },
     { import = "plugins.lang.shell" },
+    { import = "plugins.misc.bigfile" },
     { import = "plugins.misc.tmux-navigator" },
-    { import = "plugins.undotree" },
-    { import = "plugins.ui.colorizer" },
   },
   defaults = {
     -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup.
@@ -48,7 +55,7 @@ require("lazy").setup({
     lazyvim = false,
     neovim = false,
   },
-  install = { colorscheme = { "tokyonight", "habamax" } },
+  install = { colorscheme = { "catppuccin-macchiato" } },
   checker = { enabled = true }, -- automatically check for plugin updates
   performance = {
     rtp = {

config/src/nvim/lua/plugins/catppuccin.lua

@@ -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",
+    },
+  },
+}

config/src/nvim/lua/plugins/misc/bigfile.lua

@@ -0,0 +1,9 @@
+return {
+  -- Disable certain features if file is big
+  {
+    "LunarVim/bigfile.nvim",
+    opts = {
+      filesize = 0.5,
+    },
+  },
+}

config/src/nvim/lua/plugins/telescope.lua

@@ -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,
+      },
+    },
+  },
 }

config/src/nvim/lua/plugins/tokyonight.lua

@@ -1,10 +1,10 @@
 return {
-	"folke/tokyonight.nvim",
+  "folke/tokyonight.nvim",
-	opts = {
+  opts = {
-		transparent = true,
+    transparent = true,
-		styles = {
+    styles = {
-			sidebars = "transparent",
+      sidebars = "transparent",
-			floats = "transparent",
+      floats = "transparent",
-		},
+    },
-	},
+  },
 }

flake.lock

@@ -1,15 +1,89 @@
 {
   "nodes": {
+    "flake-compat": {
+      "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-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": {
       "inputs": {
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1710146030,
+        "lastModified": 1731533236,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -18,57 +92,144 @@
         "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": {
-        "flake-utils": "flake-utils_2",
+        "flake-compat": "flake-compat_2",
+        "gitignore": "gitignore",
         "nixpkgs": [
+          "neovim-nightly-overlay",
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": [
+          "neovim-nightly-overlay",
           "nixpkgs"
         ]
       },
       "locked": {
-        "dir": "contrib",
+        "lastModified": 1731363552,
-        "lastModified": 1703942320,
+        "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
-        "narHash": "sha256-CcaBqA0yFCffNPmXOJTo8c9v1jrEBiqAl8CG5Dj5YxE=",
+        "owner": "cachix",
-        "owner": "neovim",
+        "repo": "git-hooks.nix",
-        "repo": "neovim",
+        "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
-        "rev": "8744ee8783a8597f9fce4a573ae05aca2f412120",
+        "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"
+      },
+      "locked": {
+        "lastModified": 1732002290,
+        "narHash": "sha256-v17KxlCf0O7hoD9AjiF94T2nuZuh7ZREyI6Ww/Tr4R0=",
+        "owner": "nix-community",
+        "repo": "neovim-nightly-overlay",
+        "rev": "2a9b9e821c7f91eb6ae540925a453f9ebacd0513",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "neovim-nightly-overlay",
+        "type": "github"
+      }
+    },
+    "neovim-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1731949793,
+        "narHash": "sha256-ZXZInL8J38JaVpglSPa78ptn1zlqbaRHDtpa73CqpfI=",
+        "owner": "neovim",
+        "repo": "neovim",
+        "rev": "989a37a594649528f28432388c0e7e28e8be2753",
         "type": "github"
       },
       "original": {
-        "dir": "contrib",
         "owner": "neovim",
-        "ref": "stable",
         "repo": "neovim",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1715218190,
+        "lastModified": 1731890469,
-        "narHash": "sha256-R98WOBHkk8wIi103JUVQF3ei3oui4HvoZcz9tYOAwlk=",
+        "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "5083ec887760adfe12af64830a66807423a859a7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1731755305,
+        "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9a9960b98418f8c385f52de3b09a63f9c561427a",
+        "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-23.11",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -76,8 +237,8 @@
     "root": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "neovim": "neovim",
+        "neovim-nightly-overlay": "neovim-nightly-overlay",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs_2"
       }
     },
     "systems": {

flake.nix

@@ -1,42 +1,59 @@
 {
   description = "NVIM Configuration";
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
     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;
+      }
+    );
 }

packages/lazyVim.nix

@@ -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
-  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}"'';
-  }
+}

runtimeDeps.nix

@@ -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 ]);
 }