feat: change neovim flake, add nixcommunity cache

feat: update plugins
chore(flake): bump versions
2024-11-07 17:16:13 +02:00 · 2024-11-07 15:36:08 +02:00 · 2024-08-30 09:15:07 +03:00 · 2024-06-22 17:33:30 +03:00 · 2024-06-15 23:47:05 +03:00 · 2024-06-13 21:09:23 +00:00
14 changed files with 296 additions and 91 deletions
--- a/.gitea/workflows/check-flake.yml
+++ b/.gitea/workflows/check-flake.yml
@@ -0,0 +1,28 @@
+name: check-flake
+on:
+  push:
+    branches:
+      - main
+  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@v27
+        with:
+          github_access_token: ${{ secrets.GH_ACCESS_TOKEN }}
+          nix_path: nixpkgs=channel:nixos-23.11
+      - 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
--- a/.gitea/workflows/update-flake-lock.yml
+++ b/.gitea/workflows/update-flake-lock.yml
@@ -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
--- a/.gitingore
+++ b/.gitingore
@@ -1 +1,2 @@
+result
 result/
--- a/config/src/lazygit/config.yml
+++ b/config/src/lazygit/config.yml
@@ -1 +1 @@
-/usr/local/etc/xaked-nvim-lazygit-config.yml
+/tmp/lazyvim-lazygit/config.yml
--- a/config/src/lazygit/state.yml
+++ b/config/src/lazygit/state.yml
@@ -1 +1 @@
-/usr/local/etc/xaked-nvim-lazygit-state.yml
+/tmp/lazyvim-lazygit/state.yml
--- a/config/src/nvim/init.lua
+++ b/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")
--- a/config/src/nvim/lazy-lock.json
+++ b/config/src/nvim/lazy-lock.json
@@ -1 +1 @@
-/usr/local/etc/xaked-nvim-lazy-lock.json
+/tmp/lazyvim-nvim/lazy-lock.json
--- a/config/src/nvim/lazyvim.json
+++ b/config/src/nvim/lazyvim.json
@@ -1 +1 @@
-/usr/local/etc/xaked-nvim-lazyvim.json
+/tmp/lazyvim-nvim/lazyvim.json
--- a/config/src/nvim/lua/config/lazy.lua
+++ b/config/src/nvim/lua/config/lazy.lua
@@ -11,28 +11,32 @@ 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.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 = "lazyvim.plugins.extras.ui.treesitter-context" },
    { import = "plugins.tokyonight" },
-    { import = "plugins.telescope" },
-    { import = "plugins.lang.nix" },
    { import = "plugins.lang.shell" },
    { import = "plugins.misc.tmux-navigator" },
-    { import = "plugins.undotree" },
  },
  defaults = {
    -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup.
--- a/config/src/nvim/lua/plugins/telescope.lua
+++ b/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,
+      },
+    },
+  },
 }
--- a/config/src/nvim/lua/plugins/ui/colorizer.lua
+++ b/config/src/nvim/lua/plugins/ui/colorizer.lua
@@ -0,0 +1,6 @@
+return {
+  "chrisbra/Colorizer",
+  keys = {
+    { "<leader>uR", "<cmd>ColorToggle<cr>", desc = "Toggle Colorizer" },
+  },
+}
--- a/flake.lock
+++ b/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,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "lastModified": 1726560853,
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
        "type": "github"
      },
      "original": {
@@ -18,66 +92,149 @@
        "type": "github"
      }
    },
-    "flake-utils_2": {
-      "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": {
+    "git-hooks": {
      "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": 1703942320,
-        "narHash": "sha256-CcaBqA0yFCffNPmXOJTo8c9v1jrEBiqAl8CG5Dj5YxE=",
-        "owner": "neovim",
-        "repo": "neovim",
-        "rev": "8744ee8783a8597f9fce4a573ae05aca2f412120",
+        "lastModified": 1730814269,
+        "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "d70155fdc00df4628446352fc58adc640cd705c2",
+        "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": 1730914682,
+        "narHash": "sha256-UHFvVeJY64rA5HKoeKCLuJET224GEDGdj7/m1PuShgw=",
+        "owner": "nix-community",
+        "repo": "neovim-nightly-overlay",
+        "rev": "59630b2edb91b71ac0a60b865aaa91cd39946577",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "neovim-nightly-overlay",
+        "type": "github"
+      }
+    },
+    "neovim-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1730893053,
+        "narHash": "sha256-ifiJfPkhyg/9I9aJSbtcHy3jRV4CLig7iF9ACQUycPU=",
+        "owner": "neovim",
+        "repo": "neovim",
+        "rev": "f7e32fb6e626ab198bf401765236783890f3a0d6",
        "type": "github"
      },
      "original": {
-        "dir": "contrib",
        "owner": "neovim",
-        "ref": "stable",
        "repo": "neovim",
        "type": "github"
      }
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1711124224,
-        "narHash": "sha256-l0zlN/3CiodvWDtfBOVxeTwYSRz93muVbXWSpaMjXxM=",
-        "owner": "nixos",
+        "lastModified": 1730831018,
+        "narHash": "sha256-2S0HwIFRxYp+afuoFORcZA9TjryAf512GmE0MTfEOPU=",
+        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "56528ee42526794d413d6f244648aaee4a7b56c0",
+        "rev": "8c4dc69b9732f6bbe826b5fbb32184987520ff26",
        "type": "github"
      },
      "original": {
-        "owner": "nixos",
-        "ref": "nixos-23.11",
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 0,
+        "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
+        "path": "/nix/store/pq1m6x5ilkm3s841g0z0vyrqvmbxc21v-source",
+        "type": "path"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
    "root": {
      "inputs": {
        "flake-utils": "flake-utils",
-        "neovim": "neovim",
-        "nixpkgs": "nixpkgs"
+        "neovim-nightly-overlay": "neovim-nightly-overlay",
+        "nixpkgs": "nixpkgs_2"
      }
    },
    "systems": {
--- a/flake.nix
+++ b/flake.nix
@@ -1,23 +1,34 @@
 {
  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";
-      inputs.nixpkgs.follows = "nixpkgs";
+    neovim-nightly-overlay = {
+      url = "github:nix-community/neovim-nightly-overlay";
+      # inputs.nixpkgs.follows = "nixpkgs";
    };
  };
+
+  nixConfig = {
+    trusted-substituters = [
+      "https://nix-community.cachix.org"
+    ];
+    extra-trusted-public-keys = [
+      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+    ];
+  };
+
  outputs = inputs @ {
-    self,
    nixpkgs,
    flake-utils,
-    neovim,
+    neovim-nightly-overlay,
    ...
  }:
    flake-utils.lib.eachDefaultSystem (system: let
      overlayFlakeInputs = prev: final: {
-        neovim = neovim.packages.${system}.neovim;
+        neovim = neovim-nightly-overlay.packages.${system}.default.overrideAttrs (oa: {
+          nativeBuildInputs = oa.nativeBuildInputs ++ [final.libtermkey];
+        });
      };

      overlayLazyVim = prev: final: {
--- a/renovate.json5
+++ b/renovate.json5
@@ -0,0 +1,7 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["local>local/renovate"],
+  "nix": {
+    "enabled": true
+  }
+}
Author	SHA1	Message	Date
Mykhailo Nikiforov	cb48c6da79	feat: change neovim flake, add nixcommunity cache All checks were successful check-flake / build (push) Successful in 12m14s Details	2024-11-07 17:16:13 +02:00
Mykhailo Nikiforov	0c56f239d1	feat: update plugins Some checks failed check-flake / build (push) Failing after 1m21s Details	2024-11-07 15:36:08 +02:00
Mykhailo Nikiforov	2eb10ca96c	chore(flake): bump versions Some checks failed check-flake / build (push) Failing after 3m31s Details	2024-08-30 09:15:07 +03:00
Mykhailo Nikiforov	0572f1394f	feat: update nvim flake All checks were successful check-flake / build (push) Successful in 2m53s Details	2024-06-22 17:33:30 +03:00
Renovate Bot	b2620d58af	chore(deps): update cachix/install-nix-action action to v27 All checks were successful check-flake / build (push) Successful in 3m13s Details	2024-06-15 23:47:05 +03:00
Renovate Bot	97b13465a8	chore(deps): update nixpkgs to nixos-24.05 Some checks failed check-flake / build (pull_request) Successful in 5m53s Details check-flake / build (push) Has been cancelled Details	2024-06-13 21:09:23 +00:00
Mykhailo Nikiforov	53e48ea9e8	feat: review nvim plugins All checks were successful check-flake / build (push) Successful in 2m47s Details	2024-06-03 15:12:30 +03:00
Mykhailo Nikiforov	209f4d3ddd	feat(telescope): follow symlinks All checks were successful check-flake / build (push) Successful in 3m39s Details	2024-05-27 12:03:40 +03:00
Mykhailo Nikiforov	73b5a72f6f	feat: update how symlinks are created All checks were successful check-flake / build (push) Successful in 3m8s Details	2024-05-11 21:32:23 +03:00
Mykhailo Nikiforov	9c8b4e5d5a	feat: add Colorizer plugin All checks were successful check-flake / build (push) Successful in 4m23s Details	2024-05-11 14:22:40 +03:00
Mykhailo	3f27e8495f	Update renovate.json5 All checks were successful check-flake / build (pull_request) Successful in 2m45s Details check-flake / build (push) Successful in 3m18s Details	2024-03-25 12:59:08 +02:00
Renovate Bot	56460e393c	Add renovate.json5	2024-03-25 12:59:08 +02:00
Mykhailo Nikiforov	15a12bce41	feat: update build ci All checks were successful check-flake / build (push) Successful in 2m38s Details	2024-03-25 12:52:13 +02:00
Mykhailo Nikiforov	f0203cc6fe	feat: update build ci Some checks failed check-flake / build (push) Failing after 4m7s Details	2024-03-25 12:30:06 +02:00
Mykhailo Nikiforov	a99bb19d48	feat: update build ci Some checks failed check-flake / lockfile (push) Failing after 1m35s Details	2024-03-25 12:24:50 +02:00
Mykhailo Nikiforov	1eb5d9d141	feat: update build ci Some checks failed check-flake / lockfile (push) Failing after 2m16s Details	2024-03-25 12:17:49 +02:00
Mykhailo Nikiforov	681e045851	feat: update build ci Some checks failed check-flake / lockfile (push) Failing after 38s Details	2024-03-25 12:14:50 +02:00
Mykhailo Nikiforov	9d1cf13fd1	feat: use nixci to build flake Some checks failed check-flake / lockfile (push) Failing after 7m20s Details	2024-03-25 11:50:36 +02:00
Mykhailo Nikiforov	fa6148515c	feat: remove /homeless-shelter directory before building Some checks failed check-flake / lockfile (push) Failing after 2m31s Details	2024-03-25 11:35:35 +02:00
Mykhailo Nikiforov	e482aa9e63	feat: add check-flake ci Some checks failed check-flake / lockfile (push) Failing after 6m47s Details	2024-03-25 09:43:46 +02:00