feat: Update to latest nixvim and nixpkgs

This commit is contained in:
uttarayan21
2024-09-17 19:21:46 +05:30
parent 8e1bc492a4
commit 33c7d05ba7
6 changed files with 302 additions and 285 deletions

View File

@@ -27,9 +27,9 @@ lib.attrsets.optionalAttrs device.hasGui {
[ [
_1password _1password
neovide neovide
(mpv-unwrapped.wrapper {mpv = mpv-unwrapped.override {sixelSupport = true;};})
] ]
++ lib.optionals device.isLinux [ ++ lib.optionals pkgs.stdenv.isLinux [
(mpv-unwrapped.wrapper {mpv = mpv-unwrapped.override {sixelSupport = true;};})
slack slack
via via
webcord-vencord webcord-vencord
@@ -58,5 +58,7 @@ lib.attrsets.optionalAttrs device.hasGui {
webcord-vencord webcord-vencord
spotify spotify
wl-clipboard wl-clipboard
]
++ lib.optionals pkgs.stdenv.isDarwin [
]; ];
} }

View File

@@ -206,9 +206,12 @@ in {
# t = "zellij a -c --index 0"; # t = "zellij a -c --index 0";
t = "tmux"; t = "tmux";
}; };
shellAliases = { shellAliases =
{
g = "git"; g = "git";
aichat = "op plugin run -- aichat"; aichat = "op plugin run -- aichat";
}
// lib.optionalAttrs pkgs.stdenv.isLinux {
kmpv = "mpv --vo-kitty-use-shm=yes --vo=kitty --really-quiet"; kmpv = "mpv --vo-kitty-use-shm=yes --vo=kitty --really-quiet";
smpv = "mpv --vo-sixel-buffered=yes --vo=sixel --profile=sw-fast"; smpv = "mpv --vo-sixel-buffered=yes --vo=sixel --profile=sw-fast";
}; };

274
flake.lock generated
View File

@@ -168,18 +168,12 @@
} }
}, },
"crane": { "crane": {
"inputs": {
"nixpkgs": [
"ironbar",
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1722704454, "lastModified": 1725125250,
"narHash": "sha256-lcut8uZMSa80z+aWpxg+9nM8BKWtpU59rtcpMXtHd1Q=", "narHash": "sha256-CB20rDD5eHikF6mMTTJdwPP1qvyoiyyw1RDUzwIaIF8=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "852a59f9672c3413d75bca2b3e9cb4c661cacfc3", "rev": "96fd12c7100e9e05fa1a0a5bd108525600ce282f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -234,18 +228,12 @@
} }
}, },
"crane_4": { "crane_4": {
"inputs": {
"nixpkgs": [
"zjstatus",
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1724537630, "lastModified": 1725409566,
"narHash": "sha256-gpqINM71zp3kw5XYwUXa84ZtPnCmLLnByuFoYesT1bY=", "narHash": "sha256-PrtLmqhM6UtJP7v7IGyzjBFhbG4eOAHT6LPYOFmYfbk=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "3e08f4b1fc9aaede5dd511d8f5f4ef27501e49b0", "rev": "7e4586bad4e3f8f97a9271def747cf58c4b68f3c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -610,11 +598,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722555600, "lastModified": 1726153070,
"narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -632,11 +620,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725234343, "lastModified": 1726153070,
"narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -675,11 +663,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722555600, "lastModified": 1726153070,
"narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -801,11 +789,11 @@
"systems": "systems_3" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1726560853,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -872,11 +860,11 @@
"systems": "systems_9" "systems": "systems_9"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1726560853,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -935,11 +923,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724857454, "lastModified": 1725513492,
"narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=", "narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6", "rev": "7570de7b9b504cfe92025dd1be797bf546f66528",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -964,11 +952,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724857454, "lastModified": 1725513492,
"narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=", "narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6", "rev": "7570de7b9b504cfe92025dd1be797bf546f66528",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -994,11 +982,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724857454, "lastModified": 1725513492,
"narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=", "narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6", "rev": "7570de7b9b504cfe92025dd1be797bf546f66528",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1100,11 +1088,11 @@
"gp-nvim": { "gp-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1723453874, "lastModified": 1725969177,
"narHash": "sha256-2vjPoRiT26dftA0t4hdGedN6qZyIgQUjGMRF4IND/O4=", "narHash": "sha256-Tvcu8oRfbuc7JX+uYFmpMjzcrnUudJMEMxjd+yNfn5o=",
"owner": "Robitx", "owner": "Robitx",
"repo": "gp.nvim", "repo": "gp.nvim",
"rev": "861ed5240214dc76b00edeaec15e71370a7a5046", "rev": "f4cbbf489fb621ae8f4e512c38ae234ce1157fa7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1159,11 +1147,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725948275, "lastModified": 1726440980,
"narHash": "sha256-4QOPemDQ9VRLQaAdWuvdDBhh+lEUOAnSMHhdr4nS1mk=", "narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e5fa72bad0c6f533e8d558182529ee2acc9454fe", "rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1181,11 +1169,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724435763, "lastModified": 1726357542,
"narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "narHash": "sha256-p4OrJL2weh0TRtaeu1fmNYP6+TOp/W2qdaIJxxQay4c=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "rev": "e524c57b1fa55d6ca9d8354c6ce1e538d2a1f47f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1202,11 +1190,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724435763, "lastModified": 1726357542,
"narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "narHash": "sha256-p4OrJL2weh0TRtaeu1fmNYP6+TOp/W2qdaIJxxQay4c=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "rev": "e524c57b1fa55d6ca9d8354c6ce1e538d2a1f47f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1465,11 +1453,11 @@
"rust-overlay": "rust-overlay_3" "rust-overlay": "rust-overlay_3"
}, },
"locked": { "locked": {
"lastModified": 1724776819, "lastModified": 1726045862,
"narHash": "sha256-1kV7SEhm+NnI65MeH11yY5fCdh2CSlUq5SMdQxnckAw=", "narHash": "sha256-ZmwDGycmu7zRTiZDJr0fCT9+guszumMAe+TFLvSzBTY=",
"owner": "JakeStanger", "owner": "JakeStanger",
"repo": "ironbar", "repo": "ironbar",
"rev": "0daa6bf5c287d7531aa8287fbf1b4817eed1fad6", "rev": "8bae17a24a57edde752a3b3a9a8e8b53f7d9472b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1514,11 +1502,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725571635, "lastModified": 1726140642,
"narHash": "sha256-4cb6JzG081MeM4Lq4OaLbGKyummvhuipo5IFCoFYFE4=", "narHash": "sha256-JeKj2HrlGtIe98wcKSmecq4K62FC4kVoVTpaCDldQZw=",
"owner": "tsirysndr", "owner": "tsirysndr",
"repo": "music-player", "repo": "music-player",
"rev": "e6b50121808b5c738dea021144c6a3ab7c1e333a", "rev": "f8d6cd6e762675e47ed0749fea18e588ab942140",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1534,11 +1522,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725237485, "lastModified": 1726445087,
"narHash": "sha256-POpzmA7+ecCUEZsu2a5fgwYhJ60POzve+lMhxebmTz4=", "narHash": "sha256-QlwwAYno5975QCWzsJ7Ni+I1xvXciEGOl/OAQMCwEUQ=",
"owner": "musnix", "owner": "musnix",
"repo": "musnix", "repo": "musnix",
"rev": "b5f3a47fd74193cb98c85cfeb6a25358150bdd90", "rev": "088030af40070397ba775d5820f6b0f45856a369",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1568,11 +1556,11 @@
"navigator": { "navigator": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1724761847, "lastModified": 1725848935,
"narHash": "sha256-IhCfsuR/ZMvP52aseFFkPsOwbCWIVh0oqImQQeVjko4=", "narHash": "sha256-c6LjkRlR4g8lAqI7GqqtJ/tn48Gx2PxXYeeAM/YORbg=",
"owner": "ray-x", "owner": "ray-x",
"repo": "navigator.lua", "repo": "navigator.lua",
"rev": "53efe4b5cea5e99d2216449330f205d71251fdc7", "rev": "df3d3a09d5b4986558062425639ca8dd1e9a34c2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1601,16 +1589,16 @@
"neorg": { "neorg": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1703783667, "lastModified": 1721818770,
"narHash": "sha256-Q5V3ru+fgPYS3OxN5jDMh+4Vi9eJOuq5cC/kJ6neJ3I=", "narHash": "sha256-f6hJbZEcf9XGTLxUikTOu2Kq53hlAC08JJbz76gQk6I=",
"owner": "nvim-neorg", "owner": "nvim-neorg",
"repo": "neorg", "repo": "neorg",
"rev": "4cbedbbdd4ccb6f45a2045477f5658a1311dffa3", "rev": "81ee90cb2d72ac43bfadb7dd276646f34c8f85be",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nvim-neorg", "owner": "nvim-neorg",
"ref": "v7.0.0", "ref": "v9.1.1",
"repo": "neorg", "repo": "neorg",
"type": "github" "type": "github"
} }
@@ -1650,11 +1638,11 @@
"neorg_2": { "neorg_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1725315344, "lastModified": 1725804232,
"narHash": "sha256-DFC/qgPAsqEo/ngSx04npdwiRS3qW4bPc5W/0BD2jFY=", "narHash": "sha256-IOhb06MIC8LLPpa1XnZ7TRqKWUabHeBa3X2p9Y/bT4s=",
"owner": "nvim-neorg", "owner": "nvim-neorg",
"repo": "neorg", "repo": "neorg",
"rev": "d5965efe17e28a60cdbf14e97b87723a83f0c962", "rev": "ba35900b21921c439e676b063a79c8fad914eac9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1687,7 +1675,7 @@
}, },
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-y2L420fJ1KvjYjXXJWmPk5SBhE8S8y8ECjzKVlg8VFU=", "narHash": "sha256-1KRrOGbEiV6HdbR+qTY7XZQYYErPfh/4iHqC64s9OXI=",
"path": "./neovim", "path": "./neovim",
"type": "path" "type": "path"
}, },
@@ -1699,11 +1687,11 @@
"neovim-src": { "neovim-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1725446059, "lastModified": 1726482815,
"narHash": "sha256-N+XyobzJsFXVivL/uu8lHSc9vxlM3j5SSOc4G9B0SyA=", "narHash": "sha256-M2syKjdJH3uBCOAm9PZndNI46m6xGLXsOadUSen8wpY=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "b6e350a6b4df40fcc99931c460668c36fadc9989", "rev": "a0d8c2b86e788ce4273f0b8df258cd9e8e432d38",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1721,11 +1709,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724561770, "lastModified": 1726188813,
"narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=", "narHash": "sha256-Vop/VRi6uCiScg/Ic+YlwsdIrLabWUJc57dNczp0eBc=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e", "rev": "21fe31f26473c180390cfa81e3ea81aca0204c80",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1741,11 +1729,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725628909, "lastModified": 1726188813,
"narHash": "sha256-xI0OSqPHcs/c/utJsU0Zvcp1VhejMI9mgwr68uHHlPs=", "narHash": "sha256-Vop/VRi6uCiScg/Ic+YlwsdIrLabWUJc57dNczp0eBc=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "76559183801030451e200c90a1627c1d82bb4910", "rev": "21fe31f26473c180390cfa81e3ea81aca0204c80",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1762,11 +1750,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724561770, "lastModified": 1726188813,
"narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=", "narHash": "sha256-Vop/VRi6uCiScg/Ic+YlwsdIrLabWUJc57dNczp0eBc=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e", "rev": "21fe31f26473c180390cfa81e3ea81aca0204c80",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1780,11 +1768,11 @@
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1725765290, "lastModified": 1726449931,
"narHash": "sha256-hwX53i24KyWzp2nWpQsn8lfGQNCP0JoW/bvQmcR1DPY=", "narHash": "sha256-1AX7MyYzP7sNgZiGF8jwehCCI75y2kBGwACeryJs+yE=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "642275444c5a9defce57219c944b3179bf2adaa9", "rev": "c1b0fa0bec5478185eae2fd3f39b9e906fc83995",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1901,11 +1889,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1725955637, "lastModified": 1726572294,
"narHash": "sha256-M9zfmxgu8SlOFXWzNjiCTsHlLFDGBpRq7KN4CgsIKAI=", "narHash": "sha256-4FkCht+17IhYXFvKxshd0hX2UjhMV752W2n8v1UbszI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1166bb68ce1427d232df5bce79da63449f44b105", "rev": "0dc933aa07e970865c16fe0e1b614af8069cc60d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1962,11 +1950,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1722640603, "lastModified": 1725099143,
"narHash": "sha256-TcXjLVNd3VeH1qKPH335Tc4RbFDbZQX+d7rqnDUoRaY=", "narHash": "sha256-CHgumPZaC7z+WYx72WgaLt2XF0yUVzJS60rO4GZ7ytY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "81610abc161d4021b29199aa464d6a1a521e0cc9", "rev": "5629520edecb69630a3f4d17d3d33fc96c13f6fe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -2008,11 +1996,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1725634671, "lastModified": 1726062873,
"narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", "narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", "rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -2024,11 +2012,11 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1725634671, "lastModified": 1726463316,
"narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -2054,11 +2042,11 @@
"treefmt-nix": "treefmt-nix_2" "treefmt-nix": "treefmt-nix_2"
}, },
"locked": { "locked": {
"lastModified": 1725563454, "lastModified": 1726502324,
"narHash": "sha256-RQ9aKwXmqNHMBFOlHEUVrAFo7YHJSVn4nBgi2rcaCY4=", "narHash": "sha256-I/WFSIBeIjlY3CgSJ6IRYxP2aEJ6b42Y1HAeATlBh48=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "84249a9dabdf930d968d248024c4d6240ee14548", "rev": "2e3083e42509c399b224239f6d7fa17976b18536",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -2082,11 +2070,11 @@
"treefmt-nix": "treefmt-nix_3" "treefmt-nix": "treefmt-nix_3"
}, },
"locked": { "locked": {
"lastModified": 1725921389, "lastModified": 1726502324,
"narHash": "sha256-RBpN0ToD8O3qniBjqUiB1d2/LQJt5kH5P3Gt6dF91L0=", "narHash": "sha256-I/WFSIBeIjlY3CgSJ6IRYxP2aEJ6b42Y1HAeATlBh48=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "facf6b2d0c9e22d858956d1d458eac6baf155a08", "rev": "2e3083e42509c399b224239f6d7fa17976b18536",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -2108,11 +2096,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725515460, "lastModified": 1726550932,
"narHash": "sha256-ybr3YTmjhVOuCWdacABUPxfUlVNqy0ya3s2sZ8zgyTw=", "narHash": "sha256-3iDVHqGq8mhP46XqIpepiURz4RJXwGUO0cHtplHhbX0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "e8df4bbcb3a2d18a32d8a50bd72c3175227f7468", "rev": "90aaa1e9e6ff67b29840d357413f822056212c08",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -2134,11 +2122,11 @@
"norg-meta": "norg-meta" "norg-meta": "norg-meta"
}, },
"locked": { "locked": {
"lastModified": 1725590404, "lastModified": 1726561227,
"narHash": "sha256-fnbpWkfaenyF0qnw4OIJCRMYfdetxLwA9aHcEl4PyxM=", "narHash": "sha256-rrE6YH5jpEzwLcTk9BeNNBhMVg9j7y4X8/4DTysIKWY=",
"owner": "nvim-neorg", "owner": "nvim-neorg",
"repo": "nixpkgs-neorg-overlay", "repo": "nixpkgs-neorg-overlay",
"rev": "df2022d80ed50e7d2ff5a6739a78e1427bb3bdd1", "rev": "fd8139aca9b75b00eb5ad94923c39ea61e75dbb4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -2190,11 +2178,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1725949843, "lastModified": 1726569072,
"narHash": "sha256-vGv6dWlwW6R6QFmbLkW7kxEvGrvZKsWio1Ztj9Rot8w=", "narHash": "sha256-x33fIaVSJGc/kLiXh+a8x97GrMN1DtnRd8Ar50sDaNs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "4232cb810c157448c1283cda9de6f9551245f61a", "rev": "48b58426a0fb447bad367813e742247dc860bed6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -2213,11 +2201,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724584782, "lastModified": 1726392886,
"narHash": "sha256-7FfHv7b1jwMPSu9SPY9hdxStk8E6EeSwzqdvV69U4BM=", "narHash": "sha256-9RtOuG7V8KG8IU8nZje5EQ1WSM/inr7+zb3tAgTiHDM=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "5a08d691de30b6fc28d58ce71a5e420f2694e087", "rev": "97d34b70deed4878fcb2449ac89dab717d72efa1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -2235,11 +2223,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724584782, "lastModified": 1726392886,
"narHash": "sha256-7FfHv7b1jwMPSu9SPY9hdxStk8E6EeSwzqdvV69U4BM=", "narHash": "sha256-9RtOuG7V8KG8IU8nZje5EQ1WSM/inr7+zb3tAgTiHDM=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "5a08d691de30b6fc28d58ce71a5e420f2694e087", "rev": "97d34b70deed4878fcb2449ac89dab717d72efa1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -2347,11 +2335,11 @@
"rest-nvim": { "rest-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1725579296, "lastModified": 1726329214,
"narHash": "sha256-Bw5zxVX3a5s9mUfK8XWhE6tUn77q6I7O9iCOEkIEgUg=", "narHash": "sha256-Xg2rVQurH/7qnYoIDHeYjRg9rOImeGiWBd/XMI+MTg8=",
"owner": "rest-nvim", "owner": "rest-nvim",
"repo": "rest.nvim", "repo": "rest.nvim",
"rev": "9e00468da985082faa472e689ffda59e63154270", "rev": "9f6f9dd928d612e52e756f0a0c057ee3cf16c39b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -2435,11 +2423,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722738111, "lastModified": 1724984647,
"narHash": "sha256-cWD5pCs9AYb+512/yCx9D0Pl5KcmyuXHeJpsDw/D1vs=", "narHash": "sha256-BC6MUq0CTdmAu/cueVcdWTI+S95s0mJcn19SoEgd7gU=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "27ec296d93cb4b2d03e8cbd019b1b4cde8c34280", "rev": "87b6cffc276795b46ef544d7ed8d7fed6ad9c8e4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -2503,11 +2491,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725935143, "lastModified": 1726539203,
"narHash": "sha256-mVtTVQMlXkydSXVwFClE0ckxHrOQ9nb2DrCjNwW5pUE=", "narHash": "sha256-u1tAteb4qkH2gGjDY3mN/4Qxa6y798t4G0jNKDyTwv8=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "c3c175c74cd0e8c2c40a0e22bc6e3005c4d28d64", "rev": "20c8461785d8f5af32d8d4d5c128589e23d7f033",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -2524,11 +2512,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724811750, "lastModified": 1726453838,
"narHash": "sha256-PvhVgQ1rm3gfhK7ts4emprhh/KMkFwXogmgsQ3srR7g=", "narHash": "sha256-pupsow4L79SBfNwT6vh/5RAbVZuhngIA0RTCZksXmZY=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "6a1c4915dca7149e7258d8c7f3ac634d8c65f6c6", "rev": "ca2e79cd22625d214b8437c2c4080ce79bd9f7d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -2829,11 +2817,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724833132, "lastModified": 1725271838,
"narHash": "sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos=", "narHash": "sha256-VcqxWT0O/gMaeWTTjf1r4MOyG49NaNxW4GHTO3xuThE=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "3ffd842a5f50f435d3e603312eefa4790db46af5", "rev": "9fb342d14b69aefdf46187f6bb80a4a0d97007cd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -2850,11 +2838,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724833132, "lastModified": 1725271838,
"narHash": "sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos=", "narHash": "sha256-VcqxWT0O/gMaeWTTjf1r4MOyG49NaNxW4GHTO3xuThE=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "3ffd842a5f50f435d3e603312eefa4790db46af5", "rev": "9fb342d14b69aefdf46187f6bb80a4a0d97007cd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -2903,11 +2891,11 @@
"rust-overlay": "rust-overlay_7" "rust-overlay": "rust-overlay_7"
}, },
"locked": { "locked": {
"lastModified": 1724858904, "lastModified": 1726515093,
"narHash": "sha256-QGzfl4YHTl/HuYy6oe/OqAX8xViYht1BCCIpWq7uH5U=", "narHash": "sha256-Y2OHV3QfLPQj3Q4+TmrMeRXthwigU/YSBv2g8y8GWWU=",
"owner": "dj95", "owner": "dj95",
"repo": "zjstatus", "repo": "zjstatus",
"rev": "b2f15019bdfc04f65cac7cd073418ac6ad4dbddc", "rev": "d1c662c1052adec6f14f3ee8a51cecebe4a29ffa",
"type": "github" "type": "github"
}, },
"original": { "original": {

116
neovim/flake.lock generated
View File

@@ -123,11 +123,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722555600, "lastModified": 1726153070,
"narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -144,11 +144,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725234343, "lastModified": 1726153070,
"narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -201,11 +201,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1726560853,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -261,11 +261,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724857454, "lastModified": 1725513492,
"narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=", "narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6", "rev": "7570de7b9b504cfe92025dd1be797bf546f66528",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -288,11 +288,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724857454, "lastModified": 1725513492,
"narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=", "narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6", "rev": "7570de7b9b504cfe92025dd1be797bf546f66528",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -348,11 +348,11 @@
"gp-nvim": { "gp-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1723453874, "lastModified": 1725969177,
"narHash": "sha256-2vjPoRiT26dftA0t4hdGedN6qZyIgQUjGMRF4IND/O4=", "narHash": "sha256-Tvcu8oRfbuc7JX+uYFmpMjzcrnUudJMEMxjd+yNfn5o=",
"owner": "Robitx", "owner": "Robitx",
"repo": "gp.nvim", "repo": "gp.nvim",
"rev": "861ed5240214dc76b00edeaec15e71370a7a5046", "rev": "f4cbbf489fb621ae8f4e512c38ae234ce1157fa7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -407,11 +407,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724435763, "lastModified": 1726357542,
"narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "narHash": "sha256-p4OrJL2weh0TRtaeu1fmNYP6+TOp/W2qdaIJxxQay4c=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "rev": "e524c57b1fa55d6ca9d8354c6ce1e538d2a1f47f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -423,11 +423,11 @@
"navigator": { "navigator": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1724761847, "lastModified": 1725848935,
"narHash": "sha256-IhCfsuR/ZMvP52aseFFkPsOwbCWIVh0oqImQQeVjko4=", "narHash": "sha256-c6LjkRlR4g8lAqI7GqqtJ/tn48Gx2PxXYeeAM/YORbg=",
"owner": "ray-x", "owner": "ray-x",
"repo": "navigator.lua", "repo": "navigator.lua",
"rev": "53efe4b5cea5e99d2216449330f205d71251fdc7", "rev": "df3d3a09d5b4986558062425639ca8dd1e9a34c2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -456,16 +456,16 @@
"neorg": { "neorg": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1703783667, "lastModified": 1721818770,
"narHash": "sha256-Q5V3ru+fgPYS3OxN5jDMh+4Vi9eJOuq5cC/kJ6neJ3I=", "narHash": "sha256-f6hJbZEcf9XGTLxUikTOu2Kq53hlAC08JJbz76gQk6I=",
"owner": "nvim-neorg", "owner": "nvim-neorg",
"repo": "neorg", "repo": "neorg",
"rev": "4cbedbbdd4ccb6f45a2045477f5658a1311dffa3", "rev": "81ee90cb2d72ac43bfadb7dd276646f34c8f85be",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nvim-neorg", "owner": "nvim-neorg",
"ref": "v7.0.0", "ref": "v9.1.1",
"repo": "neorg", "repo": "neorg",
"type": "github" "type": "github"
} }
@@ -505,11 +505,11 @@
"neorg_2": { "neorg_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1725315344, "lastModified": 1725804232,
"narHash": "sha256-DFC/qgPAsqEo/ngSx04npdwiRS3qW4bPc5W/0BD2jFY=", "narHash": "sha256-IOhb06MIC8LLPpa1XnZ7TRqKWUabHeBa3X2p9Y/bT4s=",
"owner": "nvim-neorg", "owner": "nvim-neorg",
"repo": "neorg", "repo": "neorg",
"rev": "d5965efe17e28a60cdbf14e97b87723a83f0c962", "rev": "ba35900b21921c439e676b063a79c8fad914eac9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -521,11 +521,11 @@
"neovim-src": { "neovim-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1725446059, "lastModified": 1726482815,
"narHash": "sha256-N+XyobzJsFXVivL/uu8lHSc9vxlM3j5SSOc4G9B0SyA=", "narHash": "sha256-M2syKjdJH3uBCOAm9PZndNI46m6xGLXsOadUSen8wpY=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "b6e350a6b4df40fcc99931c460668c36fadc9989", "rev": "a0d8c2b86e788ce4273f0b8df258cd9e8e432d38",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -542,11 +542,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724561770, "lastModified": 1726188813,
"narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=", "narHash": "sha256-Vop/VRi6uCiScg/Ic+YlwsdIrLabWUJc57dNczp0eBc=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e", "rev": "21fe31f26473c180390cfa81e3ea81aca0204c80",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -557,11 +557,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1725432240, "lastModified": 1726463316,
"narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=", "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ad416d066ca1222956472ab7d0555a6946746a80", "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -618,11 +618,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1725563454, "lastModified": 1726502324,
"narHash": "sha256-RQ9aKwXmqNHMBFOlHEUVrAFo7YHJSVn4nBgi2rcaCY4=", "narHash": "sha256-I/WFSIBeIjlY3CgSJ6IRYxP2aEJ6b42Y1HAeATlBh48=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "84249a9dabdf930d968d248024c4d6240ee14548", "rev": "2e3083e42509c399b224239f6d7fa17976b18536",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -643,11 +643,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725515460, "lastModified": 1726550932,
"narHash": "sha256-ybr3YTmjhVOuCWdacABUPxfUlVNqy0ya3s2sZ8zgyTw=", "narHash": "sha256-3iDVHqGq8mhP46XqIpepiURz4RJXwGUO0cHtplHhbX0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "e8df4bbcb3a2d18a32d8a50bd72c3175227f7468", "rev": "90aaa1e9e6ff67b29840d357413f822056212c08",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -668,11 +668,11 @@
"norg-meta": "norg-meta" "norg-meta": "norg-meta"
}, },
"locked": { "locked": {
"lastModified": 1725590404, "lastModified": 1726561227,
"narHash": "sha256-fnbpWkfaenyF0qnw4OIJCRMYfdetxLwA9aHcEl4PyxM=", "narHash": "sha256-rrE6YH5jpEzwLcTk9BeNNBhMVg9j7y4X8/4DTysIKWY=",
"owner": "nvim-neorg", "owner": "nvim-neorg",
"repo": "nixpkgs-neorg-overlay", "repo": "nixpkgs-neorg-overlay",
"rev": "df2022d80ed50e7d2ff5a6739a78e1427bb3bdd1", "rev": "fd8139aca9b75b00eb5ad94923c39ea61e75dbb4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -731,11 +731,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724584782, "lastModified": 1726392886,
"narHash": "sha256-7FfHv7b1jwMPSu9SPY9hdxStk8E6EeSwzqdvV69U4BM=", "narHash": "sha256-9RtOuG7V8KG8IU8nZje5EQ1WSM/inr7+zb3tAgTiHDM=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "5a08d691de30b6fc28d58ce71a5e420f2694e087", "rev": "97d34b70deed4878fcb2449ac89dab717d72efa1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -779,11 +779,11 @@
"rest-nvim": { "rest-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1725579296, "lastModified": 1726329214,
"narHash": "sha256-Bw5zxVX3a5s9mUfK8XWhE6tUn77q6I7O9iCOEkIEgUg=", "narHash": "sha256-Xg2rVQurH/7qnYoIDHeYjRg9rOImeGiWBd/XMI+MTg8=",
"owner": "rest-nvim", "owner": "rest-nvim",
"repo": "rest.nvim", "repo": "rest.nvim",
"rev": "9e00468da985082faa472e689ffda59e63154270", "rev": "9f6f9dd928d612e52e756f0a0c057ee3cf16c39b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -898,11 +898,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724833132, "lastModified": 1725271838,
"narHash": "sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos=", "narHash": "sha256-VcqxWT0O/gMaeWTTjf1r4MOyG49NaNxW4GHTO3xuThE=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "3ffd842a5f50f435d3e603312eefa4790db46af5", "rev": "9fb342d14b69aefdf46187f6bb80a4a0d97007cd",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -19,7 +19,7 @@
flake = false; flake = false;
}; };
neorg = { neorg = {
url = "github:nvim-neorg/neorg/v7.0.0"; url = "github:nvim-neorg/neorg/v9.1.1";
flake = false; flake = false;
}; };
neorg-telescope = { neorg-telescope = {

View File

@@ -94,12 +94,50 @@ in rec {
enable = true; enable = true;
settings = { settings = {
adapters = [ adapters = [
''require('rustaceanvim.neotest')'' # ''require('rustaceanvim.neotest')''
]; ];
}; };
}; };
neorg = {
enable = true;
modules = {
"core.defaults" = {
__empty = null;
};
"core.completion" = {
config = {
engine = "nvim-cmp";
name = "[Norg]";
};
};
"core.concealer" = {
config = {
icon_preset = "diamond";
};
};
"core.keybinds" = {
config = {
default_keybinds = true;
neorg_leader = "<C-m>";
};
};
"core.integrations.treesitter" = {
config.install_parsers = false;
config.configure_parsers = false;
};
"core.dirman" = {
config = {
default_workspace = "Notes";
workspaces = {
Notes = "~/Nextcloud/Notes";
Work = "~/Nextcloud/Work";
};
};
};
};
};
rest.enable = true; # rest.enable = true;
comment = { comment = {
enable = true; enable = true;
@@ -144,14 +182,15 @@ in rec {
settings.indent.enable = true; settings.indent.enable = true;
folding = true; folding = true;
grammarPackages = grammarPackages =
pkgs.vimPlugins.nvim-treesitter.allGrammars (with pkgs.tree-sitter-grammars; [
++ (with pkgs.tree-sitter-grammars; [ tree-sitter-norg
tree-sitter-http tree-sitter-norg-meta
# tree-sitter-http
tree-sitter-just tree-sitter-just
tree-sitter-nu tree-sitter-nu
tree-sitter-d2 tree-sitter-d2
tree-sitter-norg-meta ])
]); ++ pkgs.vimPlugins.nvim-treesitter.allGrammars;
}; };
telescope = { telescope = {
@@ -205,24 +244,29 @@ in rec {
''; '';
}; };
rustaceanvim = { rustaceanvim = {
enable = true; enable = false;
settings = { settings = {
server = { server = {
# on_attach =
# /*
# lua
# */
# ''
# function(client, bufnr)
# if client.server_capabilities.inlayHintProvider then
# vim.lsp.inlay_hint.enable(true)
# end
# end
# '';
default_settings = { default_settings = {
rust-analyzer = { rust-analyzer = {
files = { files = {
excludeDirs = [".git" ".direnv"]; excludeDirs = [
".cargo"
".direnv"
".git"
"node_modules"
"target"
];
};
diagnostics = {
enable = true;
styleLints.enable = true;
};
checkOnSave = true;
check = {
command = "clippy";
features = "all";
}; };
}; };
}; };
@@ -256,7 +300,22 @@ in rec {
html.enable = true; html.enable = true;
ast-grep.enable = true; ast-grep.enable = true;
# pylyzer.enable = true; # pylyzer.enable = true;
# rust-analyzer.enable = false; rust-analyzer = {
enable = true;
installCargo = false;
installRustc = false;
settings = {
files = {
excludeDirs = [
".cargo"
".direnv"
".git"
"node_modules"
"target"
];
};
};
};
}; };
onAttach = onAttach =
/* /*
@@ -392,11 +451,11 @@ in rec {
}; };
autoCmd = [ autoCmd = [
{ # {
event = ["BufEnter" "BufWinEnter"]; # event = ["BufEnter" "BufWinEnter"];
pattern = "*.norg"; # pattern = "*.norg";
command = "set conceallevel=3"; # command = "set conceallevel=3";
} # }
{ {
event = ["BufWinLeave"]; event = ["BufWinLeave"];
pattern = "?*"; pattern = "?*";
@@ -431,13 +490,12 @@ in rec {
end end
end end
-- catcher(require('rest-nvim').setup)
-- catcher(require('lspconfig').ast_grep.setup) -- catcher(require('lspconfig').ast_grep.setup)
-- require('telescope').load_extension("dap") -- require('telescope').load_extension("dap")
-- require('telescope').load_extension("rest") -- require('telescope').load_extension("rest")
require('telescope').load_extension("neorg") -- require('telescope').load_extension("neorg")
require("copilot").setup({ require("copilot").setup({
suggestion = { suggestion = {
@@ -464,36 +522,6 @@ in rec {
blend = 10, blend = 10,
}) })
local load = {
["core.defaults"] = {},
["core.completion"] = { config = { engine = "nvim-cmp", name = "[Norg]" } },
["core.concealer"] = {
config = { icon_preset = "diamond" }
},
["core.export"] = {},
["core.keybinds"] = {
-- https://github.com/nvim-neorg/neorg/blob/main/lua/neorg/modules/core/keybinds/keybinds.lua
config = {
default_keybinds = true,
neorg_leader = "<C-m>",
},
},
["core.dirman"] = {
config = {
default_workspace = "Notes",
workspaces = {
Notes = "~/Nextcloud/Notes",
Work = "~/Nextcloud/Work",
}
}
}
}
require('neorg').setup({
load = load,
})
require('octo').setup({ require('octo').setup({
use_local_fs = false, use_local_fs = false,
enable_builtin = false, enable_builtin = false,
@@ -515,11 +543,11 @@ in rec {
if not vim.g.neovide then if not vim.g.neovide then
require('neoscroll').setup() require('neoscroll').setup()
require('image').setup({["backend"] = "kitty",["tmux_show_only_in_active_window"] = true}) require('image').setup({["backend"] = "kitty",["tmux_show_only_in_active_window"] = true})
load["core.integrations.image"] = { -- load["core.integrations.image"] = {
config = { -- config = {
tmux_show_only_in_active_window = true, -- tmux_show_only_in_active_window = true,
} -- }
} -- }
else else
vim.o.guifont = "Hasklug Nerd Font Mono:h13" vim.o.guifont = "Hasklug Nerd Font Mono:h13"
vim.g.neovide_cursor_vfx_mode = "railgun" vim.g.neovide_cursor_vfx_mode = "railgun"
@@ -611,11 +639,11 @@ in rec {
ignore_blank_lines = true, -- ignore blank lines when sending visual select lines ignore_blank_lines = true, -- ignore blank lines when sending visual select lines
}) })
vim.filetype.add({ -- vim.filetype.add({
extension = { -- extension = {
http = "http", -- http = "http",
}, -- },
}) -- })
vim.filetype.add({ vim.filetype.add({
filename = { filename = {
@@ -649,10 +677,6 @@ in rec {
foldlevelstart = 99; foldlevelstart = 99;
}; };
extraPlugins = with pkgs.vimPlugins; [ extraPlugins = with pkgs.vimPlugins; [
# neorg
neorg
neorg-telescope
# Wut # Wut
image-nvim image-nvim
@@ -672,9 +696,6 @@ in rec {
crates-nvim crates-nvim
luasnip luasnip
# No more postman
# rest-nvim
# UI # UI
nvim-web-devicons nvim-web-devicons
@@ -700,6 +721,9 @@ in rec {
pkgs.tree-sitter-grammars.tree-sitter-just pkgs.tree-sitter-grammars.tree-sitter-just
pkgs.tree-sitter-grammars.tree-sitter-nu pkgs.tree-sitter-grammars.tree-sitter-nu
pkgs.tree-sitter-grammars.tree-sitter-norg
pkgs.tree-sitter-grammars.tree-sitter-norg-meta
]; ];
extraLuaPackages = luaPkgs: with luaPkgs; [lua-utils-nvim nvim-nio pathlib-nvim];
}; };
} }