diff --git a/flake.lock b/flake.lock index 11eddef..bc99849 100644 --- a/flake.lock +++ b/flake.lock @@ -90,11 +90,11 @@ ] }, "locked": { - "lastModified": 1694810318, - "narHash": "sha256-LuvrVj2oj9TzdnnwtQUClqcXjpgwCP01FFVBM7azGV8=", + "lastModified": 1696043447, + "narHash": "sha256-VbJ1dY5pVH2fX1bS+cT2+4+BYEk4lMHRP0+udu9G6tk=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "80bb201f4925cdda5a7a3c7b1900fb26bb2af2e8", + "rev": "792c2e01347cb1b2e7ec84a1ef73453ca86537d8", "type": "github" }, "original": { @@ -111,11 +111,11 @@ ] }, "locked": { - "lastModified": 1694808292, - "narHash": "sha256-zSZ8IfZfv6nK0z+wNuM0Tqx6c9b4+Q5Xn9FIpunWBwA=", + "lastModified": 1695864092, + "narHash": "sha256-Hu1SkFPqO7ND95AOzBkZE2jGXSYhfZ965C03O72Kbu8=", "owner": "nix-community", "repo": "disko", - "rev": "0faae8adf6d790df2c3d00437ccad7cd5c531c70", + "rev": "19b62324663b6b9859caf7f335d232cf4f1f6a32", "type": "github" }, "original": { @@ -131,11 +131,11 @@ ] }, "locked": { - "lastModified": 1694651982, - "narHash": "sha256-oI8jrtIvLll+ADzm+qQqy58ybFeA1J1GlNgL3Q5hvGs=", + "lastModified": 1696034364, + "narHash": "sha256-7giewUYqKhhfhKRxe2EPHCpSM0oMLuByW4RTRZl6Jfc=", "owner": "bandithedoge", "repo": "nixpkgs-firefox-darwin", - "rev": "a376e3619b40947054e2c5e93fbcc00aa9e24477", + "rev": "b1e4d451a15c34d45bfefb05137a20469399a2df", "type": "github" }, "original": { @@ -201,11 +201,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1692799911, - "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -237,11 +237,11 @@ ] }, "locked": { - "lastModified": 1694643239, - "narHash": "sha256-pv2k/5FvyirDE8g4TNehzwZ0T4UOMMmqWSQnM/luRtE=", + "lastModified": 1696063111, + "narHash": "sha256-F2IJEbyH3xG0eqyAYn9JoV+niqNz+xb4HICYNkkviNI=", "owner": "nix-community", "repo": "home-manager", - "rev": "d9b88b43524db1591fb3d9410a21428198d75d49", + "rev": "ae896c810f501bf0c3a2fd7fc2de094dd0addf01", "type": "github" }, "original": { @@ -266,25 +266,25 @@ "nextcloud-external": { "flake": false, "locked": { - "narHash": "sha256-gY1nxqK/pHfoxW/9mE7DFtNawgdEV7a4OXpscWY14yk=", + "narHash": "sha256-X7eC8T8wSZGVwCQp6U/WxjMC7aIj39osgHotaUoRNSQ=", "type": "tarball", - "url": "https://github.com/nextcloud-releases/external/releases/download/v5.2.0/external-v5.2.0.tar.gz" + "url": "https://github.com/nextcloud-releases/external/releases/download/v5.2.1/external-v5.2.1.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/nextcloud-releases/external/releases/download/v5.2.0/external-v5.2.0.tar.gz" + "url": "https://github.com/nextcloud-releases/external/releases/download/v5.2.1/external-v5.2.1.tar.gz" } }, "nextcloud-news": { "flake": false, "locked": { - "narHash": "sha256-hhXPEITSbCiFs0o+TOsQnSasXBpjU9mA/OFsbzuaCPw=", + "narHash": "sha256-cfJkKRNSz15L4E3w1tnEb+t4MrVwVzb8lb6vCOA4cK4=", "type": "tarball", - "url": "https://github.com/nextcloud/news/releases/download/22.0.0/news.tar.gz" + "url": "https://github.com/nextcloud/news/releases/download/24.0.0/news.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/nextcloud/news/releases/download/22.0.0/news.tar.gz" + "url": "https://github.com/nextcloud/news/releases/download/24.0.0/news.tar.gz" } }, "nil": { @@ -354,11 +354,11 @@ ] }, "locked": { - "lastModified": 1693791338, - "narHash": "sha256-wHmtB5H8AJTUaeGHw+0hsQ6nU4VyvVrP2P4NeCocRzY=", + "lastModified": 1696058303, + "narHash": "sha256-eNqKWpF5zG0SrgbbtljFOrRgFgRzCc4++TMFADBMLnc=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "8ee78470029e641cddbd8721496da1316b47d3b4", + "rev": "150f38bd1e09e20987feacb1b0d5991357532fb5", "type": "github" }, "original": { @@ -369,11 +369,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1694767346, - "narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=", + "lastModified": 1695830400, + "narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ace5093e36ab1e95cb9463863491bee90d5a4183", + "rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2", "type": "github" }, "original": { @@ -385,11 +385,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1694048570, - "narHash": "sha256-PEQptwFCVaJ+jLFJgrZll2shQ9VI/7xVhrCYkJo8iIw=", + "lastModified": 1695825837, + "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4f77ea639305f1de0a14d9d41eef83313360638c", + "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e", "type": "github" }, "original": { @@ -417,11 +417,11 @@ }, "nur": { "locked": { - "lastModified": 1694814340, - "narHash": "sha256-eo9444JGI/G9jZF+X3xmS5TMRuIT4VYPKyZQ11iF65Q=", + "lastModified": 1696080597, + "narHash": "sha256-fhf7+NT/xMwPZ/sRT30lnI04AHgf7tLPU4ClMux1nWA=", "owner": "nix-community", "repo": "nur", - "rev": "9b70f21fd41d3b96580e7ca4a3d1c29e87bdab36", + "rev": "8783c360abc69f58d46a2929534ddd91eb41f3c6", "type": "github" }, "original": { @@ -450,11 +450,11 @@ "nvim-tree-lua-src": { "flake": false, "locked": { - "lastModified": 1694306329, - "narHash": "sha256-Rv3DdlqRppEum09N4cKRlj0xdPbf5QLYHzYDuxb55w8=", + "lastModified": 1695716495, + "narHash": "sha256-Fkchn7UuIHPmVFFrx1kzsE2lviJrAFAe9tHu73HnS/w=", "owner": "kyazdani42", "repo": "nvim-tree.lua", - "rev": "94c7c810af205c0f00c8f105dcf490c8eb17658a", + "rev": "934469b9b6df369e198fb3016969e56393b0dc07", "type": "github" }, "original": { @@ -466,16 +466,16 @@ "nvim-treesitter-src": { "flake": false, "locked": { - "lastModified": 1691831669, - "narHash": "sha256-1Iuvq0hVQ7LyBYOkJ5d07NkwbGcR1K61ZZmAAA7ABGs=", + "lastModified": 1696061053, + "narHash": "sha256-KR+VMYTVM2qsLPx412gySAKiGObhs+awbDJhWX72/wY=", "owner": "nvim-treesitter", "repo": "nvim-treesitter", - "rev": "63260da18bf273c76b8e2ea0db84eb901cab49ce", + "rev": "dd4e2dbc002dfce109d621e8bdcd9d89438b0a32", "type": "github" }, "original": { "owner": "nvim-treesitter", - "ref": "v0.9.1", + "ref": "master", "repo": "nvim-treesitter", "type": "github" } @@ -483,13 +483,13 @@ "proton-ge": { "flake": false, "locked": { - "narHash": "sha256-/68J3aVmHqrrcNk4DkYSBzfNyIQmbcUGg3yOlDq1ts8=", + "narHash": "sha256-75A0VCVdYkiMQ1duE9r2+DLBJzV02vUozoVLeo/TIWQ=", "type": "tarball", - "url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-14/GE-Proton8-14.tar.gz" + "url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-16/GE-Proton8-16.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-14/GE-Proton8-14.tar.gz" + "url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-16/GE-Proton8-16.tar.gz" } }, "root": { @@ -522,6 +522,7 @@ "toggleterm-nvim-src": "toggleterm-nvim-src", "tree-sitter-bash": "tree-sitter-bash", "tree-sitter-ini": "tree-sitter-ini", + "tree-sitter-lua": "tree-sitter-lua", "tree-sitter-puppet": "tree-sitter-puppet", "tree-sitter-python": "tree-sitter-python", "tree-sitter-rasi": "tree-sitter-rasi", @@ -654,16 +655,16 @@ "tree-sitter-bash": { "flake": false, "locked": { - "lastModified": 1692987612, - "narHash": "sha256-SP6s1bUvh1cXt3xQzdY9yVWq0BstfP1tjBedSQPPDC4=", + "lastModified": 1695263734, + "narHash": "sha256-dJUJGrpBWBLjcqiqxCnJ/MENwa2+uxAmQD71aYloxsw=", "owner": "tree-sitter", "repo": "tree-sitter-bash", - "rev": "cc65fbeb028e7892f59bf3a609212bb0afbaa2d0", + "rev": "fd4e40dab883d6456da4d847de8321aee9c80805", "type": "github" }, "original": { "owner": "tree-sitter", - "ref": "v0.20.3", + "ref": "master", "repo": "tree-sitter-bash", "type": "github" } @@ -684,6 +685,23 @@ "type": "github" } }, + "tree-sitter-lua": { + "flake": false, + "locked": { + "lastModified": 1694072484, + "narHash": "sha256-5t5w8KqbefInNbA12/jpNzmky/uOUhsLjKdEqpl1GEc=", + "owner": "MunifTanjim", + "repo": "tree-sitter-lua", + "rev": "9668709211b2e683f27f414454a8b51bf0a6bda1", + "type": "github" + }, + "original": { + "owner": "MunifTanjim", + "ref": "main", + "repo": "tree-sitter-lua", + "type": "github" + } + }, "tree-sitter-puppet": { "flake": false, "locked": { @@ -703,17 +721,17 @@ "tree-sitter-python": { "flake": false, "locked": { - "lastModified": 1690493803, - "narHash": "sha256-2btd/NRE6NuGNlx4cq535OrwtWXihiP3VMCJjPCiDOk=", + "lastModified": 1695282953, + "narHash": "sha256-gRhD3M1DkmwYQDDnyRq6QMTWUJUY0vbetGnN+pBTd84=", "owner": "tree-sitter", "repo": "tree-sitter-python", - "rev": "5af00f64af6bbf822f208243cce5cf75396fb6f5", + "rev": "a901729099257aac932d79c60adb5e8a53fa7e6c", "type": "github" }, "original": { "owner": "tree-sitter", + "ref": "master", "repo": "tree-sitter-python", - "rev": "5af00f64af6bbf822f208243cce5cf75396fb6f5", "type": "github" } }, @@ -772,11 +790,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1694522206, - "narHash": "sha256-mb34WlyHi/whE6gIMEtXKfGRALzvB6/U7CYdUnJKN+c=", + "lastModified": 1696053802, + "narHash": "sha256-8TTbJbtGDz1MstExrVQe56eXZpovvZv6G6L6q/4NOKg=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "e7d93d0f478b6fbb47c00d03449dc3d08b90abb7", + "rev": "cadde47d123d1a534c272b04a7582f1d11474c48", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 322d477..bb10c70 100644 --- a/flake.nix +++ b/flake.nix @@ -86,7 +86,7 @@ }; nvim-treesitter-src = { # https://github.com/nvim-treesitter/nvim-treesitter/tags - url = "github:nvim-treesitter/nvim-treesitter/v0.9.1"; + url = "github:nvim-treesitter/nvim-treesitter/master"; flake = false; }; telescope-nvim-src = { @@ -120,16 +120,15 @@ # Tree-Sitter Grammars tree-sitter-bash = { - # Fix: bash highlighting doesn't work as of this commit: - # https://github.com/NixOS/nixpkgs/commit/49cce41b7c5f6b88570a482355d9655ca19c1029 - url = "github:tree-sitter/tree-sitter-bash/v0.20.3"; + url = "github:tree-sitter/tree-sitter-bash/master"; flake = false; }; tree-sitter-python = { - # Fix: invalid node in position. Broken as of this commit (replaced with newer): - # https://github.com/NixOS/nixpkgs/commit/8ec3627796ecc899e6f47f5bf3c3220856ead9c5 - url = - "github:tree-sitter/tree-sitter-python/5af00f64af6bbf822f208243cce5cf75396fb6f5"; + url = "github:tree-sitter/tree-sitter-python/master"; + flake = false; + }; + tree-sitter-lua = { + url = "github:MunifTanjim/tree-sitter-lua/main"; flake = false; }; tree-sitter-ini = { @@ -160,23 +159,27 @@ # GE version of Proton for game compatibility # Alternatively, could consider using https://github.com/fufexan/nix-gaming proton-ge = { + # https://github.com/GloriousEggroll/proton-ge-custom/releases url = - "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-14/GE-Proton8-14.tar.gz"; + "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-16/GE-Proton8-16.tar.gz"; flake = false; }; # Nextcloud Apps nextcloud-news = { + # https://github.com/nextcloud/news/releases url = - "https://github.com/nextcloud/news/releases/download/22.0.0/news.tar.gz"; + "https://github.com/nextcloud/news/releases/download/24.0.0/news.tar.gz"; flake = false; }; nextcloud-external = { + # https://github.com/nextcloud-releases/external/releases url = - "https://github.com/nextcloud-releases/external/releases/download/v5.2.0/external-v5.2.0.tar.gz"; + "https://github.com/nextcloud-releases/external/releases/download/v5.2.1/external-v5.2.1.tar.gz"; flake = false; }; nextcloud-cookbook = { + # https://github.com/nextcloud/cookbook/releases url = "https://github.com/nextcloud/cookbook/releases/download/v0.10.2/Cookbook-0.10.2.tar.gz"; flake = false; diff --git a/overlays/tree-sitter.nix b/overlays/tree-sitter.nix index 28c2b19..7b597dd 100644 --- a/overlays/tree-sitter.nix +++ b/overlays/tree-sitter.nix @@ -12,6 +12,10 @@ inputs: _final: prev: { prev.tree-sitter-grammars.tree-sitter-python.overrideAttrs (old: { src = inputs.tree-sitter-python; }); + # Fix: invalid structure in position. + tree-sitter-lua = prev.tree-sitter-grammars.tree-sitter-lua.overrideAttrs + (old: { src = inputs.tree-sitter-lua; }); + # Add grammars not in nixpks tree-sitter-ini = prev.tree-sitter.buildGrammar { language = "ini";