diff --git a/configs/common.nix b/configs/common.nix index 92296b0..510bb75 100644 --- a/configs/common.nix +++ b/configs/common.nix @@ -235,33 +235,32 @@ paths = [ pkgs.neovim ]; buildInputs = [ pkgs.makeWrapper ]; postBuild = '' - wrapProgram $out/bin/nvim \ - --prefix PATH : ${ - pkgs.lib.makeBinPath [ - # lsps - pkgs.lua-language-server - pkgs.vscode-langservers-extracted - pkgs.emmet-ls - pkgs.prettier - pkgs.black - pkgs.nixfmt - pkgs.nil - pkgs.typescript-language-server - pkgs.tailwindcss-language-server - pkgs.stylua - pkgs.nixd + export TREE_SITTER_LIB_PATH="/run/current-system/sw/lib" + wrapProgram $out/bin/nvim \ + --prefix PATH : ${ + pkgs.lib.makeBinPath [ + # lsps + pkgs.lua-language-server + pkgs.vscode-langservers-extracted + pkgs.emmet-ls + pkgs.prettier + pkgs.black + pkgs.nixfmt + pkgs.nil + pkgs.typescript-language-server + pkgs.tailwindcss-language-server + pkgs.stylua + pkgs.nixd - # other shit - pkgs.vimPlugins.nvim-treesitter - pkgs.lua5_1 - inputs.tree-sitter.packages.${stdenv.hostPlatform.system}.default - inputs.norg-sitter.packages.${stdenv.hostPlatform.system}.default - pkgs.ripgrep - pkgs.gcc - pkgs.gnumake - ] - } - ''; + # other shit + pkgs.lua5_1 + inputs.tree-sitter.packages.${stdenv.hostPlatform.system}.default + pkgs.ripgrep + pkgs.gcc + pkgs.gnumake + ] + } + ''; }) vim unzip diff --git a/flake.lock b/flake.lock index 5199316..911e265 100644 --- a/flake.lock +++ b/flake.lock @@ -70,85 +70,6 @@ "type": "github" } }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "hyprfloat", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1762296971, - "narHash": "sha256-Jyv3L5rrUYpecON+9zyFz2VqgTSTsIG35fXuCyuCQv0=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "34fe48801d2a5301b814eaa1efb496499d06cebc", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "hyprfloat": { - "inputs": { - "flake-utils": "flake-utils", - "home-manager": "home-manager", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1765567261, - "narHash": "sha256-OmrVyrlhyBh1WMmWwVJOQOha/tmsoliMuWQtfG7lxKc=", - "owner": "nevimmu", - "repo": "hyprfloat", - "rev": "6306d4f68133744e0b03ffcd7cb887ed44799397", - "type": "github" - }, - "original": { - "owner": "nevimmu", - "repo": "hyprfloat", - "type": "github" - } - }, "mesa-davinci": { "locked": { "lastModified": 1754501210, @@ -181,18 +102,6 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1722555339, - "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1767379071, @@ -242,21 +151,6 @@ } }, "nixpkgs_5": { - "locked": { - "lastModified": 1723737611, - "narHash": "sha256-PFWdNM5D2qKeDl9H/5ImPnBjEuleHkWwCc3Pm91zT58=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fd61e577354dcc704bfcdc82d26608196fad6043", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { "locked": { "lastModified": 1756787288, "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", @@ -272,7 +166,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1768564909, "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", @@ -288,7 +182,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1761597516, "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=", @@ -304,25 +198,6 @@ "type": "github" } }, - "norg-sitter": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_5" - }, - "locked": { - "lastModified": 1725461847, - "narHash": "sha256-z3h5qMuNKnpQgV62xZ02F5vWEq4VEnm5lxwEnIFu+Rw=", - "owner": "nvim-neorg", - "repo": "tree-sitter-norg", - "rev": "d89d95af13d409f30a6c7676387bde311ec4a2c8", - "type": "github" - }, - "original": { - "owner": "nvim-neorg", - "repo": "tree-sitter-norg", - "type": "github" - } - }, "pinned-nixpkgs": { "flake": false, "locked": { @@ -345,10 +220,8 @@ "chataigne": "chataigne", "doot": "doot", "elephant": "elephant", - "hyprfloat": "hyprfloat", "mesa-davinci": "mesa-davinci", "nixpkgs": "nixpkgs_4", - "norg-sitter": "norg-sitter", "tree-sitter": "tree-sitter", "walker": "walker", "way-edges": "way-edges" @@ -406,21 +279,6 @@ } }, "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_4": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -437,7 +295,7 @@ }, "tree-sitter": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1765318765, @@ -477,8 +335,8 @@ "elephant": [ "elephant" ], - "nixpkgs": "nixpkgs_7", - "systems": "systems_4" + "nixpkgs": "nixpkgs_6", + "systems": "systems_3" }, "locked": { "lastModified": 1769093508, @@ -496,7 +354,7 @@ }, "way-edges": { "inputs": { - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "rust-overlay": "rust-overlay" }, "locked": { diff --git a/flake.nix b/flake.nix index a49cd8f..7a25b19 100644 --- a/flake.nix +++ b/flake.nix @@ -3,24 +3,20 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; + elephant.url = "github:abenz1267/elephant"; - chataigne.url = "./modules/chataigne"; - - tree-sitter.url = "github:tree-sitter/tree-sitter?ref=8b8199775f96ca8642cf7860da46100875b38453"; - norg-sitter.url = "github:nvim-neorg/tree-sitter-norg"; - - doot.url = "github:voidarclabs/nixos.doot"; - way-edges.url = "github:way-edges/way-edges"; - hyprfloat = { - url = "github:nevimmu/hyprfloat"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - walker = { url = "github:abenz1267/walker"; inputs.elephant.follows = "elephant"; }; + chataigne.url = "./modules/chataigne"; + + tree-sitter.url = "github:tree-sitter/tree-sitter?ref=8b8199775f96ca8642cf7860da46100875b38453"; + + doot.url = "github:voidarclabs/nixos.doot"; + way-edges.url = "github:way-edges/way-edges"; + mesa-davinci.url = "github:nixos/nixpkgs?ref=599ddd2b79331c1e6153e1659bdaab65d62c4c82"; };