From af0fd0f55e1d7b93f1d22c33dbd7903317f1b824 Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Wed, 9 Apr 2025 15:31:18 +0200 Subject: [PATCH 1/3] helix: use upstream version --- flake.lock | 113 ++++++++++++++++++++++++++++++++++---- flake.nix | 16 +++++- hosts/common.nix | 6 +- hosts/hermit/programs.nix | 1 - packages/default.nix | 9 ++- packages/helix.nix | 11 ++-- 6 files changed, 129 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 040c2a6..7710c37 100644 --- a/flake.lock +++ b/flake.lock @@ -171,6 +171,24 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "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" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -215,6 +233,26 @@ "type": "github" } }, + "helix": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1745302248, + "narHash": "sha256-MEEYZaOYmU2SlgzAKRFjF4vtODRx/AUG33nRJ+nKy78=", + "owner": "helix-editor", + "repo": "helix", + "rev": "0815b52e0959e21ec792ea41d508a050b552f850", + "type": "github" + }, + "original": { + "owner": "helix-editor", + "repo": "helix", + "type": "github" + } + }, "hercules-ci-effects": { "inputs": { "flake-parts": [ @@ -550,7 +588,7 @@ "nixpkgs" ], "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "rust-overlay": "rust-overlay" + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1741442524, @@ -594,15 +632,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744932701, - "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", - "owner": "NixOS", + "lastModified": 1740560979, + "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", + "rev": "5135c59491985879812717f4c9fea69604e7f26f", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -621,6 +659,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1744932701, + "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1736429638, "narHash": "sha256-dDWqQqSgMQXw5eFtcyoVijv7HbYJZOIo+jWQdJtsxn4=", @@ -687,15 +741,37 @@ }, "root": { "inputs": { + "helix": "helix", "hyprland": "hyprland", "impermanence": "impermanence", "lanzaboote": "lanzaboote", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "schizofox": "schizofox", - "systems": "systems_2" + "systems": "systems_3" } }, "rust-overlay": { + "inputs": { + "nixpkgs": [ + "helix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1740623427, + "narHash": "sha256-3SdPQrZoa4odlScFDUHd4CUPQ/R1gtH4Mq9u8CBiK8M=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "d342e8b5fd88421ff982f383c853f0fc78a847ab", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_2": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -722,9 +798,9 @@ "flake-parts": "flake-parts_2", "home-manager": "home-manager", "nixpak": "nixpak", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "searx-randomizer": "searx-randomizer", - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1744892989, @@ -764,6 +840,21 @@ } }, "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_2": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -778,7 +869,7 @@ "type": "github" } }, - "systems_2": { + "systems_3": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", diff --git a/flake.nix b/flake.nix index e9303de..2b6fa56 100644 --- a/flake.nix +++ b/flake.nix @@ -13,12 +13,20 @@ packages = eachSystem ( system: { - inherit (import ./packages pkgsFor.${system}) fish helix kakoune; + inherit + (import ./packages { + pkgs = pkgsFor.${system}; + helix = inputs.helix.packages.${pkgs.system}.default; + }) + fish + wrapped-helix + kakoune + ; } ); apps = eachSystem (system: let - inherit (inputs.self.packages.${system}) fish helix; + inherit (inputs.self.packages.${system}) fish wrapped-helix; in { default = { type = "app"; @@ -26,7 +34,7 @@ }; helix = { type = "app"; - program = "${helix}/bin/hx"; + program = "${wrapped-helix}/bin/hx"; }; }); }; @@ -51,5 +59,7 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.systems.follows = "systems"; }; + + helix.url = "github:helix-editor/helix"; }; } diff --git a/hosts/common.nix b/hosts/common.nix index d627e4a..5a9bef2 100644 --- a/hosts/common.nix +++ b/hosts/common.nix @@ -7,7 +7,7 @@ pkgs, ... }: let - inherit (self.packages.${pkgs.stdenv.system}) helix fish; + inherit (self.packages.${pkgs.stdenv.system}) wrapped-helix fish; in { environment.systemPackages = builtins.attrValues { inherit @@ -39,8 +39,8 @@ in { zip zoxide ; - inherit helix fish; + inherit wrapped-helix fish; }; # helix as the only editor, a reasonable choice. - environment.sessionVariables.EDITOR = pkgs.lib.getExe' helix "hx"; + environment.sessionVariables.EDITOR = pkgs.lib.getExe' wrapped-helix "hx"; } diff --git a/hosts/hermit/programs.nix b/hosts/hermit/programs.nix index 3896031..9210ebd 100644 --- a/hosts/hermit/programs.nix +++ b/hosts/hermit/programs.nix @@ -79,6 +79,5 @@ wordgrinder xournalpp ; - inherit (self.packages.${pkgs.stdenv.system}) helix; }; } diff --git a/packages/default.nix b/packages/default.nix index bd69889..4310e5f 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -1,7 +1,10 @@ -pkgs: let - helix = pkgs.callPackage ./helix.nix {}; +{ + pkgs, + helix, +}: let + wrapped-helix = pkgs.callPackage ./helix.nix {inherit helix;}; kakoune = pkgs.callPackage ./kakoune.nix {}; fish = pkgs.callPackage ./shell {}; in { - inherit helix kakoune fish; + inherit wrapped-helix kakoune fish; } diff --git a/packages/helix.nix b/packages/helix.nix index 763c8b0..c12db4c 100644 --- a/packages/helix.nix +++ b/packages/helix.nix @@ -4,7 +4,6 @@ alejandra, basedpyright, bash-language-server, - black, clang-tools, clippy, cmake-format, @@ -15,25 +14,23 @@ gdb, golangci-lint-langserver, gopls, - helix, lazygit, lib, lldb_19, marksman, nil, - pyright, + nixd, ruff, rust-analyzer, rustfmt, shellcheck, shfmt, - solargraph, - stdenv, superhtml, taplo, tinymist, typescript-language-server, vscode-langservers-extracted, + helix, ... }: let inherit (lib.meta) getExe; @@ -277,6 +274,8 @@ wrapped-helix = symlinkJoin { name = "helix-wrapped"; paths = [ + helix + # Bash bash-language-server # C/C++ @@ -284,12 +283,12 @@ clippy golangci-lint-langserver gopls - helix lldb_19 # Markdown marksman # Nix nil + nixd rust-analyzer rustfmt # Shell From 84c05eb00585671c4dbd796ca2e18268e9cefb63 Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Wed, 9 Apr 2025 15:31:18 +0200 Subject: [PATCH 2/3] hermit/programs.nix: add manix, remove python3 --- hosts/hermit/programs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/hermit/programs.nix b/hosts/hermit/programs.nix index 9210ebd..09e9dfc 100644 --- a/hosts/hermit/programs.nix +++ b/hosts/hermit/programs.nix @@ -52,6 +52,7 @@ nitch obsidian swww + manix microfetch nmap pamixer @@ -62,7 +63,6 @@ playerctl polkit pulsemixer - python3 ripgrep rmpc signal-desktop From c02522ffc48c1756b5edb58394e2b8c0096fcf33 Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Wed, 9 Apr 2025 15:31:18 +0200 Subject: [PATCH 3/3] flake.lock: bump inputs --- flake.lock | 66 +++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 7710c37..46f08ee 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1743265529, - "narHash": "sha256-QbjP15/2N+VJl0b5jxrrTc+VOt39aU4XrDvtP0Lz5ik=", + "lastModified": 1744289235, + "narHash": "sha256-ZFkHLdimtFzQACsVVyZkZlfYdj4iNy3PkzXfrwmlse8=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "1d2dbd72c2bbaceab031c592d4810f744741d203", + "rev": "c8282f4982b56dfa5e9b9f659809da93f8d37e7a", "type": "github" }, "original": { @@ -35,11 +35,11 @@ }, "crane": { "locked": { - "lastModified": 1741148495, - "narHash": "sha256-EV8KUaIZ2/CdBXlutXrHoZYbWPeB65p5kKZk71gvDRI=", + "lastModified": 1741481578, + "narHash": "sha256-JBTSyJFQdO3V8cgcL08VaBUByEU6P5kXbTJN6R0PFQo=", "owner": "ipetkov", "repo": "crane", - "rev": "75390a36cd0c2cdd5f1aafd8a9f827d7107f2e53", + "rev": "bb1c9567c43e4434f54e9481eb4b8e8e0d50f0b5", "type": "github" }, "original": { @@ -119,11 +119,11 @@ ] }, "locked": { - "lastModified": 1740872218, - "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=", + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3876f6b87db82f33775b1ef5ea343986105db764", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "type": "github" }, "original": { @@ -346,11 +346,11 @@ ] }, "locked": { - "lastModified": 1739049071, - "narHash": "sha256-3+7TpXMrbsUXSwgr5VAKAnmkzMb6JO+Rvc9XRb5NMg4=", + "lastModified": 1745015490, + "narHash": "sha256-apEJ9zoSzmslhJ2vOKFcXTMZLUFYzh1ghfB6Rbw3Low=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "175c6b29b6ff82100539e7c4363a35a02c74dd73", + "rev": "60754910946b4e2dc1377b967b7156cb989c5873", "type": "github" }, "original": { @@ -379,11 +379,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1744214922, - "narHash": "sha256-136gjyhECXU5t9uFCpWsC4t50lUJnI4PJ9KZsNIaydg=", + "lastModified": 1745593751, + "narHash": "sha256-TJ/Nijr83ydAi473NGeazYqcQ0t8lCPU7aaQv98oGg8=", "owner": "hyprwm", "repo": "hyprland", - "rev": "0dc531c4a7d6849f2db61084497b3007e92f470b", + "rev": "742bce016cb848d222fbfcfcf8d3894ea3fdaeff", "type": "github" }, "original": { @@ -501,11 +501,11 @@ ] }, "locked": { - "lastModified": 1741191527, - "narHash": "sha256-kM+11Nch47Xwfgtw2EpRitJuORy4miwoMuRi5tyMBDY=", + "lastModified": 1744468525, + "narHash": "sha256-9HySx+EtsbbKlZDlY+naqqOV679VdxP6x6fP3wxDXJk=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "72df3861f1197e41b078faa3e38eedd60e00018d", + "rev": "f1000c54d266e6e4e9d646df0774fac5b8a652df", "type": "github" }, "original": { @@ -591,11 +591,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1741442524, - "narHash": "sha256-tVcxLDLLho8dWcO81Xj/3/ANLdVs0bGyCPyKjp70JWk=", + "lastModified": 1745271491, + "narHash": "sha256-4GAHjus6JRpYHVROMIhFIz/sgLDF/klBM3UHulbSK9s=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "d8099586d9a84308ffedac07880e7f07a0180ff4", + "rev": "995637eb3ab78eac33f8ee6b45cc2ecd5ede12ba", "type": "github" }, "original": { @@ -660,11 +660,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1744932701, - "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", + "lastModified": 1745526057, + "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", + "rev": "f771eb401a46846c1aebd20552521b233dd7e18b", "type": "github" }, "original": { @@ -726,11 +726,11 @@ ] }, "locked": { - "lastModified": 1740915799, - "narHash": "sha256-JvQvtaphZNmeeV+IpHgNdiNePsIpHD5U/7QN5AeY44A=", + "lastModified": 1741379162, + "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "42b1ba089d2034d910566bf6b40830af6b8ec732", + "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", "type": "github" }, "original": { @@ -779,11 +779,11 @@ ] }, "locked": { - "lastModified": 1741228283, - "narHash": "sha256-VzqI+k/eoijLQ5am6rDFDAtFAbw8nltXfLBC6SIEJAE=", + "lastModified": 1741573199, + "narHash": "sha256-A2sln1GdCf+uZ8yrERSCZUCqZ3JUlOv1WE2VFqqfaLQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "38e9826bc4296c9daf18bc1e6aa299f3e932a403", + "rev": "c777dc8a1e35407b0e80ec89817fe69970f4e81a", "type": "github" }, "original": { @@ -912,11 +912,11 @@ ] }, "locked": { - "lastModified": 1741934139, - "narHash": "sha256-ZhTcTH9FoeAtbPfWGrhkH7RjLJZ7GeF18nygLAMR+WE=", + "lastModified": 1744644585, + "narHash": "sha256-p0D/e4J6Sv6GSb+9u8OQcVHSE2gPNYB5ygIfGDyEiXQ=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "150b0b6f52bb422a1b232a53698606fe0320dde0", + "rev": "be6771e754345f18244fb00aae5c9e5ab21ccc26", "type": "github" }, "original": {