update flake.lock

fix nix syntax change in update
fix neorg dependencies and nix syntax change in update
2024-08-07 16:41:18 +08:00 · 2024-08-07 16:41:03 +08:00 · 2024-08-07 16:40:14 +08:00 · 2024-08-07 16:39:09 +08:00 · 2024-08-07 12:53:02 +08:00 · 2024-08-07 09:08:11 +08:00
24 changed files with 1154 additions and 926 deletions
--- a/config/colorscheme/onedark.nix
+++ b/config/colorscheme/onedark.nix
@ -55,5 +55,4 @@ require('onedark').load()
    -- END custom setup for onedark
    ----------------------------------
  '';
-
 }
--- a/config/default.nix
+++ b/config/default.nix
@ -1,5 +1,3 @@
-# The line beneath this is called `modeline`. See `:help modeline`
-# vim: ts=4:sts=0:sw=0:tw=78:noet
 {
  # Import all your configuration modules here
  imports = [
--- a/config/keymaps.nix
+++ b/config/keymaps.nix
@ -1,10 +1,11 @@
-# The line beneath this is called `modeline`. See `:help modeline`
-# vim: ts=4:sts=0:sw=0:tw=78:noet
 {
  keymaps = [
    {
      #	vim.keymap.set({ "n", "v" }, "\\y", '"+y', {noremap=true, silent=true})
-				mode = [ "n" "v" ];
+      mode = [
+        "n"
+        "v"
+      ];
      key = "\\y";
      action = "\"+y";
      options = {
--- a/config/plugins/extra/vim-rhubarb.nix
+++ b/config/plugins/extra/vim-rhubarb.nix
@ -1,6 +1,4 @@
-{ pkgs
-, ...}:{
-	extraPlugins = with pkgs.vimPlugins; [
-		vim-rhubarb
-	];
+{ pkgs, ... }:
+{
+  extraPlugins = with pkgs.vimPlugins; [ vim-rhubarb ];
 }
--- a/config/plugins/extra/vim-sleuth.nix
+++ b/config/plugins/extra/vim-sleuth.nix
@ -1,6 +1,4 @@
-{ pkgs
-, ...}:{
-	extraPlugins = with pkgs.vimPlugins; [
-		vim-sleuth
-	];
+{ pkgs, ... }:
+{
+  extraPlugins = with pkgs.vimPlugins; [ vim-sleuth ];
 }
--- a/config/plugins/leap.nix
+++ b/config/plugins/leap.nix
@ -1,3 +1,4 @@
+{ helpers, ...}:
 {
  plugins.leap = {
    enable = true;
@ -5,24 +6,39 @@
  };
  keymaps = [
    {
-		  	mode = [ "n" "x" "o" ];
+      mode = [
+        "n"
+        "x"
+        "o"
+      ];
      key = "<leader>ss";
-			action = "function() require('leap').leap {} end";
-			lua = true;
+      action = helpers.mkRaw "function() require('leap').leap {} end";
      # action = "require('leap').leap";
    }
    {
-		  	mode = [ "n" "x" "o" ];
+      mode = [
+        "n"
+        "x"
+        "o"
+      ];
      key = "<leader>sS";
      action = "<Plug>(leap-backward-to)";
    }
    {
-		  	mode = [ "n" "x" "o" ];
+      mode = [
+        "n"
+        "x"
+        "o"
+      ];
      key = "<leader>sx";
      action = "<Plug>(leap-forward-till)";
    }
    {
-		  	mode = [ "n" "x" "o" ];
+      mode = [
+        "n"
+        "x"
+        "o"
+      ];
      key = "<leader>sX";
      action = "<Plug>(leap-backward-till)";
    }
--- a/config/plugins/lsp/lsp.nix
+++ b/config/plugins/lsp/lsp.nix
@ -59,7 +59,9 @@
          #   };
          # };
        };
-          clangd = {enable = true;};
+        clangd = {
+          enable = true;
+        };
        lua-ls = {
          enable = true;
          extraOptions = {
@ -71,15 +73,24 @@
                telemetry = {
                  enabled = false;
                };
-                  hint = {enable = true;};
+                hint = {
+                  enable = true;
                };
              };
            };
          };
-          nil_ls = {enable = true;};
+        };
+        nil-ls = {
+          enable = true;
+        };
        tsserver = {
          enable = false;
-            filetypes = ["javascript" "javascriptreact" "typescript" "typescriptreact"];
+          filetypes = [
+            "javascript"
+            "javascriptreact"
+            "typescript"
+            "typescriptreact"
+          ];
          extraOptions = {
            settings = {
              javascript = {
@ -107,9 +118,15 @@
            };
          };
        };
-          eslint = {enable = true;};
-          pyright = {enable = true;};
-          ruff-lsp = {enable = true;};
+        eslint = {
+          enable = true;
+        };
+        pyright = {
+          enable = true;
+        };
+        ruff-lsp = {
+          enable = true;
+        };

        rust-analyzer = {
          enable = true;
--- a/config/plugins/neorg.nix
+++ b/config/plugins/neorg.nix
@ -1,12 +1,22 @@
-# vim: ts=4:sts=0:sw=0:noet
-{
-pkgs-stable
-, ... }:
+{ pkgs, pkgs-stable, ... }:
 {
+  # https://github.com/nvim-neorg/neorg
+  # NOW neorg require lua-utils.nvim, nvim-nio, pathlib.vim
+  # https://github.com/nix-community/nixvim/issues/1395#issuecomment-2267262919
+  # Workaround
+  extraPlugins = [
+    (pkgs.vimUtils.buildVimPlugin { inherit (pkgs.luaPackages.lua-utils-nvim) pname version src; })
+
+    (pkgs.vimUtils.buildVimPlugin { inherit (pkgs.luaPackages.pathlib-nvim) pname version src; })
+
+    (pkgs.vimUtils.buildVimPlugin { inherit (pkgs.luaPackages.nvim-nio) pname version src; })
+  ];
+
  plugins = {
    neorg = {
      enable = true;
-			package = pkgs-stable.vimPlugins.neorg;
+      # package = pkgs-stable.vimPlugins.neorg;
+      package = pkgs.vimPlugins.neorg;
      modules = {
        "core.defaults" = { }; # -- Loads default behaviour
        "core.summary" = { };
--- a/config/plugins/telescope.nix
+++ b/config/plugins/telescope.nix
@ -17,22 +17,22 @@
      # };
      undo = {
        enable = true;
-          mappings = {
+        settings.mappings = {
          i = {
-              "<cr>" = "yank_additions";
-              "<s-cr>" = "yank_deletions";
-              "<c-cr>" = "restore";
+            "<cr>" = "require('telescope-undo.actions').yank_additions";
+            "<s-cr>" = "require('telescope-undo.actions').yank_deletions";
+            "<c-cr>" = "require('telescope-undo.actions').restore";
          };
          n = {
-              "y" = "yank_additions";
-              "Y" = "yank_deletions";
-              "u" = "restore";
+            "y" = "require('telescope-undo.actions').yank_additions";
+            "Y" = "require('telescope-undo.actions').yank_deletions";
+            "u" = "require('telescope-undo.actions').restore";
          };
        };
      };
    };
    # If you'd prefer Telescope not to enter a normal-like mode when hitting escape (and instead exiting), you can map <Esc> to do so via:
-      defaults = {
+    settings.defaults = {
      mappings = {
        i = {
          "<esc>" = {
@ -47,95 +47,95 @@
    keymaps = {
      "<leader><space>" = {
        action = "find_files, {}";
-          desc = "Find project files";
+        options.desc = "Find project files";
      };
      "<leader>/" = {
        action = "live_grep";
-          desc = "Grep (root dir)";
+        options.desc = "Grep (root dir)";
      };
      "<leader>:" = {
        action = "command_history, {}";
-          desc = "Command History";
+        options.desc = "Command History";
      };
      "<leader>b" = {
        action = "buffers, {}";
-          desc = "+buffer";
+        options.desc = "+buffer";
      };
      "<leader>ff" = {
        action = "find_files, {}";
-          desc = "Find project files";
+        options.desc = "Find project files";
      };
      "<leader>fr" = {
        action = "oldfiles, {}";
-          desc = "Recent";
+        options.desc = "Recent";
      };
      "<leader>fb" = {
        action = "buffers, {}";
-          desc = "Buffers";
+        options.desc = "Buffers";
      };
      "<C-p>" = {
        action = "git_files, {}";
-          desc = "Search git files";
+        options.desc = "Search git files";
      };
      "<leader>gc" = {
        action = "git_commits, {}";
-          desc = "Commits";
+        options.desc = "Commits";
      };
      "<leader>gs" = {
        action = "git_status, {}";
-          desc = "Status";
+        options.desc = "Status";
      };
      "<leader>sa" = {
        action = "autocommands, {}";
-          desc = "Auto Commands";
+        options.desc = "Auto Commands";
      };
      "<leader>sb" = {
        action = "current_buffer_fuzzy_find, {}";
-          desc = "Buffer";
+        options.desc = "Buffer";
      };
      "<leader>sc" = {
        action = "command_history, {}";
-          desc = "Command History";
+        options.desc = "Command History";
      };
      "<leader>sC" = {
        action = "commands, {}";
-          desc = "Commands";
+        options.desc = "Commands";
      };
      "<leader>sD" = {
        action = "diagnostics, {}";
-          desc = "Workspace diagnostics";
+        options.desc = "Workspace diagnostics";
      };
      "<leader>sh" = {
        action = "help_tags, {}";
-          desc = "Help pages";
+        options.desc = "Help pages";
      };
      "<leader>sH" = {
        action = "highlights, {}";
-          desc = "Search Highlight Groups";
+        options.desc = "Search Highlight Groups";
      };
      "<leader>sk" = {
        action = "keymaps, {}";
-          desc = "Keymaps";
+        options.desc = "Keymaps";
      };
      "<leader>sM" = {
        action = "man_pages, {}";
-          desc = "Man pages";
+        options.desc = "Man pages";
      };
      "<leader>sm" = {
        action = "marks, {}";
-          desc = "Jump to Mark";
+        options.desc = "Jump to Mark";
      };
      "<leader>so" = {
        action = "vim_options, {}";
-          desc = "Options";
+        options.desc = "Options";
      };
      "<leader>sR" = {
        action = "resume, {}";
-          desc = "Resume";
+        options.desc = "Resume";
      };
      "<leader>uC" = {
        action = "colorscheme, {}";
-          desc = "Colorscheme preview";
+        options.desc = "Colorscheme preview";
      };
    };
  };
--- a/config/sets.nix
+++ b/config/sets.nix
@ -1,12 +1,10 @@
-# The line beneath this is called `modeline`. See `:help modeline`
-# vim: ts=4:sts=0:sw=0:noet
 {
  config = {
    globals = {
      mapleader = " ";
      maplocalleader = " ";
    };
-		options = {
+    opts = {
      relativenumber = true;
      splitbelow = true;
      redrawtime = 5000;
--- a/flake.lock
+++ b/flake.lock
@ -2,18 +2,17 @@
  "nodes": {
    "devshell": {
      "inputs": {
-        "flake-utils": "flake-utils_2",
        "nixpkgs": [
          "nixvim",
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1711099426,
-        "narHash": "sha256-HzpgM/wc3aqpnHJJ2oDqPBkNsqWbW0WfWUO8lKu8nGk=",
+        "lastModified": 1722113426,
+        "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
        "owner": "numtide",
        "repo": "devshell",
-        "rev": "2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8",
+        "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
        "type": "github"
      },
      "original": {
@ -23,6 +22,38 @@
      }
    },
    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1641205782,
+        "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1641205782,
+        "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_3": {
      "locked": {
        "lastModified": 1696426674,
        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
@ -36,7 +67,7 @@
        "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
      }
    },
-    "flake-compat_2": {
+    "flake-compat_4": {
      "flake": false,
      "locked": {
        "lastModified": 1696426674,
@ -60,11 +91,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1709336216,
-        "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
+        "lastModified": 1722555600,
+        "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
+        "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
        "type": "github"
      },
      "original": {
@ -95,24 +126,6 @@
      "inputs": {
        "systems": "systems_2"
      },
-      "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_3": {
-      "inputs": {
-        "systems": "systems_3"
-      },
      "locked": {
        "lastModified": 1710146030,
        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
@ -127,11 +140,68 @@
        "type": "github"
      }
    },
+    "flake-utils_3": {
+      "locked": {
+        "lastModified": 1644229661,
+        "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_4": {
+      "locked": {
+        "lastModified": 1644229661,
+        "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "git-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat_4",
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1722857853,
+        "narHash": "sha256-3Zx53oz/MSIyevuWO/SumxABkrIvojnB7g9cimxkhiE=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "06939f6b7ec4d4f465bf3132a05367cccbbf64da",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
    "gitignore": {
      "inputs": {
        "nixpkgs": [
          "nixvim",
-          "pre-commit-hooks",
+          "git-hooks",
          "nixpkgs"
        ]
      },
@ -157,19 +227,75 @@
        ]
      },
      "locked": {
-        "lastModified": 1711133180,
-        "narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=",
+        "lastModified": 1720042825,
+        "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb",
+        "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
+        "ref": "release-24.05",
        "repo": "home-manager",
        "type": "github"
      }
    },
+    "neorg": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1722198397,
+        "narHash": "sha256-oaZi6UP8gC0uy1QYrXrewfYoJpds16GP+Rnef8CAaRA=",
+        "owner": "nvim-neorg",
+        "repo": "neorg",
+        "rev": "e5e797e6eddcb6efb1d2c3fc2612b31ad9a76cef",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nvim-neorg",
+        "repo": "neorg",
+        "type": "github"
+      }
+    },
+    "neorg-overlay": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "neorg": "neorg",
+        "neorg-telescope": "neorg-telescope",
+        "nixpkgs": "nixpkgs",
+        "norg": "norg",
+        "norg-meta": "norg-meta"
+      },
+      "locked": {
+        "lastModified": 1722975193,
+        "narHash": "sha256-SMvVuYKD4T9wQZhHs6oFUGMF9M4t2tg1bYE5c/6SJYA=",
+        "owner": "nvim-neorg",
+        "repo": "nixpkgs-neorg-overlay",
+        "rev": "e8193159b8cceb991d91acc3762fa3a749a9beab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nvim-neorg",
+        "repo": "nixpkgs-neorg-overlay",
+        "type": "github"
+      }
+    },
+    "neorg-telescope": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1722358034,
+        "narHash": "sha256-ei4uUqpIQjGKzu5ryu0Hlmis9TS9FJsYnjt4J4QdWlw=",
+        "owner": "nvim-neorg",
+        "repo": "neorg-telescope",
+        "rev": "ddb2556644cae922699a239bbb0fe16e25b084b7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nvim-neorg",
+        "repo": "neorg-telescope",
+        "type": "github"
+      }
+    },
    "nix-darwin": {
      "inputs": {
        "nixpkgs": [
@ -178,11 +304,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1710717205,
-        "narHash": "sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A=",
+        "lastModified": 1722924007,
+        "narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "bcc8afd06e237df060c85bad6af7128e05fd61a3",
+        "rev": "91010a5613ffd7ee23ee9263213157a1c422b705",
        "type": "github"
      },
      "original": {
@ -193,46 +319,76 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1711401922,
-        "narHash": "sha256-QoQqXoj8ClGo0sqD/qWKFWezgEwUL0SUh37/vY2jNhc=",
+        "lastModified": 1722957468,
+        "narHash": "sha256-SQ0TCC4aklOhN/OzcztrKqDLY8SjpIZcyvTulzhDXs0=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "07262b18b97000d16a4bdb003418bd2fb067a932",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs-stable": {
-      "locked": {
-        "lastModified": 1712437997,
-        "narHash": "sha256-g0whLLwRvgO2FsyhY8fNk+TWenS3jg5UdlWL4uqgFeo=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e38d7cb66ea4f7a0eb6681920615dfcc30fc2920",
+        "rev": "2a13929e1f191b3690dd2f2db13098b04adb9043",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixos-23.11",
+        "ref": "nixpkgs-unstable",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1711333969,
-        "narHash": "sha256-5PiWGn10DQjMZee5NXzeA6ccsv60iLu+Xtw+mfvkUAs=",
+        "lastModified": 1644486793,
+        "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "57e6b3a9e4ebec5aa121188301f04a6b8c354c9b",
+        "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1644486793,
+        "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 0,
+        "narHash": "sha256-7ojM1KSk3mzutD7SkrdSflHXEujPvW1u7QuqWoTLXQU=",
+        "path": "/nix/store/79j6vc975md1w3f2fgli3xw657zyxxyc-source",
+        "type": "path"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1722869614,
+        "narHash": "sha256-7ojM1KSk3mzutD7SkrdSflHXEujPvW1u7QuqWoTLXQU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "883180e6550c1723395a3a342f830bfc5c371f6b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.05",
        "repo": "nixpkgs",
        "type": "github"
      }
@ -240,60 +396,75 @@
    "nixvim": {
      "inputs": {
        "devshell": "devshell",
-        "flake-compat": "flake-compat",
+        "flake-compat": "flake-compat_3",
        "flake-parts": "flake-parts",
+        "git-hooks": "git-hooks",
        "home-manager": "home-manager",
        "nix-darwin": "nix-darwin",
-        "nixpkgs": "nixpkgs_2",
-        "pre-commit-hooks": "pre-commit-hooks"
+        "nixpkgs": "nixpkgs_5",
+        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1711545203,
-        "narHash": "sha256-PPXcH/pIbxr8awgC+q+rrIgRRH8uYeWoK5Af3kFhjEc=",
+        "lastModified": 1722925293,
+        "narHash": "sha256-saXm5dd/e3PMsYTEcp1Qbzifm3KsZtNFkrWjmLhXHGE=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "d248bf587cdb86b661ca54f16fe2f3263018b985",
+        "rev": "170df9814c3e41d5a4d6e3339e611801b1f02ce2",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
+        "ref": "nixos-24.05",
        "repo": "nixvim",
        "type": "github"
      }
    },
-    "pre-commit-hooks": {
+    "norg": {
      "inputs": {
-        "flake-compat": "flake-compat_2",
+        "flake-compat": "flake-compat",
        "flake-utils": "flake-utils_3",
-        "gitignore": "gitignore",
-        "nixpkgs": [
-          "nixvim",
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": [
-          "nixvim",
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
-        "lastModified": 1711409088,
-        "narHash": "sha256-+rTCra8TY4vuSNTtQ0tcex1syCRPoKyb8vyHmoxkga4=",
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "rev": "db656fc3e34907000df26e8bc5cc3c94fb27f353",
+        "lastModified": 1672582520,
+        "narHash": "sha256-kv3UiJUqMSF1qd3r4OCWomVTHTYjwX/EBRWm8mOSdwg=",
+        "owner": "nvim-neorg",
+        "repo": "tree-sitter-norg",
+        "rev": "d7a466e182a532065a559dbfc7a847271d5e9c29",
        "type": "github"
      },
      "original": {
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
+        "owner": "nvim-neorg",
+        "ref": "dev",
+        "repo": "tree-sitter-norg",
+        "type": "github"
+      }
+    },
+    "norg-meta": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "flake-utils": "flake-utils_4",
+        "nixpkgs": "nixpkgs_3"
+      },
+      "locked": {
+        "lastModified": 1713028366,
+        "narHash": "sha256-8qSdwHlfnjFuQF4zNdLtU2/tzDRhDZbo9K54Xxgn5+8=",
+        "owner": "nvim-neorg",
+        "repo": "tree-sitter-norg-meta",
+        "rev": "6f0510cc516a3af3396a682fbd6655486c2c9d2d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nvim-neorg",
+        "repo": "tree-sitter-norg-meta",
        "type": "github"
      }
    },
    "root": {
      "inputs": {
        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs",
-        "nixpkgs-stable": "nixpkgs-stable",
+        "neorg-overlay": "neorg-overlay",
+        "nixpkgs": "nixpkgs_4",
        "nixvim": "nixvim"
      }
    },
@ -327,18 +498,24 @@
        "type": "github"
      }
    },
-    "systems_3": {
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "lastModified": 1722330636,
+        "narHash": "sha256-uru7JzOa33YlSRwf9sfXpJG+UAV+bnBEYMjrzKrQZFw=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "768acdb06968e53aa1ee8de207fd955335c754b7",
        "type": "github"
      },
      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
        "type": "github"
      }
    }
--- a/flake.nix
+++ b/flake.nix
@ -1,26 +1,41 @@
 {
-  description = "my_nixvim flake";
+  # https://github.com/redyf/Neve/blob/main/flake.nix
+  description = "my_nixvim flake, Neve mod (only flake.nix)";

  inputs = {
-    nixvim.url = "github:nix-community/nixvim";
-		nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.11";
+    # https://github.com/nix-community/nixvim/issues/1859
+    # use nixos-24.05 branch to get rid of "error: attribute 'cmp-ai' missing"
+    nixvim.url = "github:nix-community/nixvim/nixos-24.05";
+    # nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    # nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.05";
    flake-utils.url = "github:numtide/flake-utils";
+
+    # https://github.com/nvim-neorg/nixpkgs-neorg-overlay
+    # https://github.com/nix-community/nixvim/issues/1395
+    neorg-overlay.url = "github:nvim-neorg/nixpkgs-neorg-overlay";
  };

  outputs = {
-    self,
-    nixpkgs,
-    nixpkgs-stable,
-    nixvim,
-    flake-utils,
-    ...
+    self
+    , nixpkgs
+    # , nixpkgs-stable
+    , nixvim
+    , flake-utils
+    , neorg-overlay
+    , ...
  } @ inputs: let
    config = import ./config; # import the module directly
  in
    flake-utils.lib.eachDefaultSystem (system: let
      nixvimLib = nixvim.lib.${system};
-      pkgs = import nixpkgs {inherit system;};
-      pkgs-stable = import nixpkgs-stable {inherit system;};
+      pkgs = import nixpkgs {
+        inherit system;
+        nixpkgs.overlays = [ neorg-overlay.overlays.default ];
+      };
+      # pkgs-stable = import nixpkgs-stable {
+      #  inherit system;
+      #   nixpkgs.overlays = [ neorg-overlay.overlays.default ];
+      # };
      nixvim' = nixvim.legacyPackages.${system};
      nvim = nixvim'.makeNixvimWithModule {
        inherit pkgs;
@ -28,7 +43,8 @@
        # You can use `extraSpecialArgs` to pass additional arguments to your module files
        extraSpecialArgs = {
          inherit self;
-          inherit pkgs-stable;
+          # inherit pkgs-stable;
+          inherit pkgs;
        };
      };
    in {
Author	SHA1	Message	Date
megit	d43a0d24dd	update flake.lock	2024-08-07 16:41:18 +08:00
megit	beea26ee85	fix nix syntax change in update	2024-08-07 16:41:03 +08:00
megit	5dae59a42b	fix neorg dependencies and nix syntax change in update	2024-08-07 16:40:14 +08:00
megit	47aa7eb7c5	use nixos-24.05 branch to get rid of "error: attribute 'cmp-ai' missing"	2024-08-07 16:39:09 +08:00
megit	400a94b54e	change description	2024-08-07 12:53:02 +08:00
megit	9c77d8a217	format with nixfmt	2024-08-07 09:08:11 +08:00
megit	89382ce25e	update description	2024-08-06 20:24:00 +08:00
megit	a5a5ad0804	test official nixpkgs-neorg-overlay	2024-06-02 16:28:03 +08:00
megit	9d04c6a199	nixos-stable switch to 24.05	2024-06-02 16:09:19 +08:00
megit	7c8dada4e1	format update	2024-04-09 13:13:01 +08:00