From 21b9440ec0b9b1cfe6baa1625a0ba46d5f231328 Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Tue, 11 Apr 2023 14:07:49 +0200 Subject: [PATCH] treesitter partially fixed itself --- flake.lock | 114 ++++++++++++++---------- pkgs/x32edit/default.nix | 13 ++- users/rouven/modules/neovim/default.nix | 9 +- 3 files changed, 82 insertions(+), 54 deletions(-) diff --git a/flake.lock b/flake.lock index ffcda94..09fc6f1 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "base16-schemes": { "flake": false, "locked": { - "lastModified": 1665690101, - "narHash": "sha256-J2ZvNaVFkqaTXzYO5L+jyRORfIOavFPKvWItP6UTMKs=", + "lastModified": 1680729003, + "narHash": "sha256-M9LHTL24/W4oqgbYRkz0B2qpNrkefTs98pfj3MxIXnU=", "owner": "tinted-theming", "repo": "base16-schemes", - "rev": "a3dc916cf90471a422c0bfe1bb4b1bdd12185ced", + "rev": "dc048afa066287a719ddbab62b3e19e4b5110cf0", "type": "github" }, "original": { @@ -56,12 +56,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1680776469, - "narHash": "sha256-3CXUDK/3q/kieWtdsYpDOBJw3Gw4Af6x+2EiSnIkNQw=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "411e8764155aa9354dbcd6d5faaeb97e9e3dce24", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -117,11 +120,11 @@ ] }, "locked": { - "lastModified": 1680597706, - "narHash": "sha256-ZqJ3T+BxzjPH9TnmeUwS4Uu9ZQPeBXAFC9sUWlharT4=", + "lastModified": 1681162249, + "narHash": "sha256-jh5fLaTxR5XowXA0CN/1Gs2qbvVdmdPCSeO424XWZLI=", "owner": "nix-community", "repo": "home-manager", - "rev": "ec06f419af79207b33d797064dfb3fc9dbe1df4a", + "rev": "4e79c6a414ce59fd1a53ab77899c77ab87774e6b", "type": "github" }, "original": { @@ -140,11 +143,11 @@ ] }, "locked": { - "lastModified": 1680811741, - "narHash": "sha256-5xwGfqYaefn2JnPWqFsS9cda4ItFb26UR8pqKuGV+JU=", + "lastModified": 1681162925, + "narHash": "sha256-UbJLCD5/SxKQ9WQeX/LYltKKaFsx1TDRTsSguZCNUGI=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "801a17194c426abe406c2ced47874855e64031e1", + "rev": "16a034a34a8e97aaeed6e3f46d04c87497313c20", "type": "github" }, "original": { @@ -161,11 +164,11 @@ ] }, "locked": { - "lastModified": 1671839510, - "narHash": "sha256-+PY1qqJfmZzzROgcIY4I7AkCwpnC+qBIYk2eFoA9RWc=", + "lastModified": 1681065697, + "narHash": "sha256-QPzwwlGKX95tl6ZEshboZbEwwAXww6lNLdVYd6T9Mrc=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "b8f55e02a328c47ed373133c52483bbfa20a1b75", + "rev": "4d29e48433270a2af06b8bc711ca1fe5109746cd", "type": "github" }, "original": { @@ -182,11 +185,11 @@ ] }, "locked": { - "lastModified": 1671839510, - "narHash": "sha256-+PY1qqJfmZzzROgcIY4I7AkCwpnC+qBIYk2eFoA9RWc=", + "lastModified": 1681065697, + "narHash": "sha256-QPzwwlGKX95tl6ZEshboZbEwwAXww6lNLdVYd6T9Mrc=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "b8f55e02a328c47ed373133c52483bbfa20a1b75", + "rev": "4d29e48433270a2af06b8bc711ca1fe5109746cd", "type": "github" }, "original": { @@ -202,11 +205,11 @@ ] }, "locked": { - "lastModified": 1680695861, - "narHash": "sha256-LqvhYx1Gu+rlkF4pA1NYZzwRQwz3FeWBqXqmQq86m8o=", + "lastModified": 1681080114, + "narHash": "sha256-rAKfgQJQRsw4QMOXdxfHIh/d5LPY6HHKBX1KtaPs2No=", "owner": "hyprwm", "repo": "hyprpaper", - "rev": "9182de9ffc8c76fbf24d16dec0ea7a9430597a06", + "rev": "4bcedde1dc1a06107ec32c93a937de30f40aa1fc", "type": "github" }, "original": { @@ -221,11 +224,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1672236234, - "narHash": "sha256-dpBIuxcDEvJbLD8fTipE0A0JbQD1lZB94zYFPoh01PI=", + "lastModified": 1680875144, + "narHash": "sha256-Ub/Y+/zoAoji+E7WCLbTykcTmfRiyzLJ5QEyR3NbHgY=", "owner": "Misterio77", "repo": "nix-colors", - "rev": "7e459f1d88ac54fc2f4b308adb5064863006e4b1", + "rev": "41cc6c1086a4d26509f9fc80a538131d03a11234", "type": "github" }, "original": { @@ -256,11 +259,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1680780295, - "narHash": "sha256-lpPh5EXqnAFyioHfiDxnyIH/gETjjp29p/YJ17MHNUE=", + "lastModified": 1680876084, + "narHash": "sha256-eP9yxP0wc7XuVaODugh+ajgbFGaile2O1ihxiLxOuvU=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "148fee317058fad8159619e9d6ccc8c0aa6d0fce", + "rev": "3006d2860a6ed5e01b0c3e7ffb730e9b293116e2", "type": "github" }, "original": { @@ -287,11 +290,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1655599917, - "narHash": "sha256-kjZbt5WdTrnjMxL79okg9TCoRUdADG50x/TWozbyTsE=", + "lastModified": 1680397293, + "narHash": "sha256-wBpJ73+tJ8fZSWb4tzNbAVahC4HSo2QG3nICDy4ExBQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "5fb55578aa2f1a502d636a8ac71aece57cb730bb", + "rev": "b18d328214ca3c627d3cc3f51fd9d1397fdbcd7a", "type": "github" }, "original": { @@ -318,11 +321,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1680390120, - "narHash": "sha256-RyDJcG/7mfimadlo8vO0QjW22mvYH1+cCqMuigUntr8=", + "lastModified": 1681005198, + "narHash": "sha256-5LrnBeXR7Hv8OXh6eany7br4qBW+ZNl4LKf1CJu9zbg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c1e2efaca8d8a3db6a36f652765d6c6ba7bb8fae", + "rev": "e45cc0138829ad86e7ff17a76acf2d05e781e30a", "type": "github" }, "original": { @@ -334,11 +337,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1680669251, - "narHash": "sha256-AVNE+0u4HlI3v96KCXE9risH7NKqj0QDLLfSckYXIbA=", + "lastModified": 1681126633, + "narHash": "sha256-evQ3Ct/yJDSHej16Hiq+JfxRjgm9FXu/2LBxsyorGdE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9c8ff8b426a8b07b9e0a131ac3218740dc85ba1e", + "rev": "db24d86dd8a4769c50d6b7295e81aa280cd93f35", "type": "github" }, "original": { @@ -350,11 +353,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1669969257, - "narHash": "sha256-mOS13sK3v+kfgP+1Mh56ohiG8uVhLHAo7m/q9kqAehc=", + "lastModified": 1680945546, + "narHash": "sha256-8FuaH5t/aVi/pR1XxnF0qi4WwMYC+YxlfdsA0V+TEuQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b72b8b94cf0c012b0252a9100a636cad69696666", + "rev": "d9f759f2ea8d265d974a6e1259bd510ac5844c5d", "type": "github" }, "original": { @@ -376,11 +379,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1680789869, - "narHash": "sha256-jaBMVG7lVrddtQhKSib/QxoTOGLud7u63GJq7Z+HAoI=", + "lastModified": 1680988170, + "narHash": "sha256-QCl2A80m3p/lkRCO9C/PipdkV9I1mbqhnFftjoY4dQ8=", "owner": "pta2002", "repo": "nixvim", - "rev": "f79dccdc2ea114ac2b5b2bd4d96d1a8311f442f8", + "rev": "b6706fa0ec59f37b35bd4c6f3f3be0011bf14964", "type": "github" }, "original": { @@ -464,11 +467,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1680404136, - "narHash": "sha256-06D8HJmRv4DdpEQGblMhx2Vm81SBWM61XBBIx7QQfo0=", + "lastModified": 1681209176, + "narHash": "sha256-wyQokPpkNZnsl/bVf8m1428tfA0hJ0w/qexq4EizhTc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "b93eb910f768f9788737bfed596a598557e5625d", + "rev": "00d5fd73756d424de5263b92235563bc06f2c6e1", "type": "github" }, "original": { @@ -477,6 +480,21 @@ "type": "github" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1678901627, @@ -516,11 +534,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1680729839, - "narHash": "sha256-+AagxTHrzKgngG+guIWAIV5hX1HkkvMbDxbUq2IVwAM=", + "lastModified": 1681127512, + "narHash": "sha256-vklOOhBj5W8fii6yN4L2WY5ZeifBmsq3+mJ2wC1Pk9U=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "803c00db1191604d50766358dbc5be2de4fcb4e7", + "rev": "04f579377a32781ce57c9cf4ba2a5bcb7f53fa97", "type": "github" }, "original": { diff --git a/pkgs/x32edit/default.nix b/pkgs/x32edit/default.nix index 526c24b..6f2bd9e 100644 --- a/pkgs/x32edit/default.nix +++ b/pkgs/x32edit/default.nix @@ -22,7 +22,18 @@ stdenv.mkDerivation rec { let # we prepare our library path in the let clause to avoid it become part of the input of mkDerivation libPath = lib.makeLibraryPath [ - #curlWithGnuTls # libcurl-gnutls.so.4 + #(curlWithGnuTls.overrideAttrs (oldAttrs: rec { + #version = "7.81.0"; + #src = fetchurl { + #urls = [ + #"https://curl.haxx.se/download/curl-${version}.tar.bz2" + #"https://github.com/curl/curl/releases/download/curl-${version}/curl-${version}.tar.bz2" + #]; + #hash = "sha256-Hno41wGOwGDx8W34OYVPCInpThIsTPpdOjfC3Fbx4lg="; + ##hash = "sha256-m2selrdI0EuWh4a2vfQHqlx1q1Oj03wcjIHNtzZVXM8="; + #}; + #})) # libcurl-gnutls.so.4 + #curlWithGnuTls libX11 # libX11.so.6 libXext # libXext.so.6 alsa-lib # libasound.so.2 diff --git a/users/rouven/modules/neovim/default.nix b/users/rouven/modules/neovim/default.nix index c467064..7702ef6 100644 --- a/users/rouven/modules/neovim/default.nix +++ b/users/rouven/modules/neovim/default.nix @@ -6,8 +6,7 @@ options = { shiftwidth = 4; - expandtab = true; - preserveindent = true; + expandtab = true; preserveindent = true; number = true; relativenumber = true; tabstop = 4; @@ -136,12 +135,12 @@ grammarPackages = with pkgs.tree-sitter-grammars; [ tree-sitter-bash tree-sitter-c - #tree-sitter-cpp # broken too. ffs + tree-sitter-cpp tree-sitter-css tree-sitter-go tree-sitter-haskell tree-sitter-html - #tree-sitter-java # this is broken too lmao + #tree-sitter-java tree-sitter-javascript tree-sitter-json tree-sitter-latex @@ -149,7 +148,7 @@ tree-sitter-markdown tree-sitter-nix tree-sitter-perl - #tree-sitter-python # broken atm + tree-sitter-python tree-sitter-regex tree-sitter-rst tree-sitter-rust