From c1d4aba9c3f5bd904a005d4db8202dcbe679eeae Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Wed, 3 Apr 2024 18:37:15 +0200 Subject: [PATCH] update helix to 24.3 --- flake.lock | 16 ++++++++++++++++ flake.nix | 9 ++++++--- modules/shell/helix.nix | 7 ++++++- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index af45058..645b9bc 100644 --- a/flake.lock +++ b/flake.lock @@ -358,6 +358,21 @@ "type": "indirect" } }, + "nixpkgs-unstable-small": { + "locked": { + "lastModified": 1712132741, + "narHash": "sha256-44ZLixE1FGUmz01/G/1ZMfJG8P+i8y2SkOVRia0xRkk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7781caa09d74b971a059a0240a03c5dd68acf3e5", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable-small", + "type": "indirect" + } + }, "nixpkgs_10": { "locked": { "lastModified": 1675614288, @@ -505,6 +520,7 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_8", "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs-unstable-small": "nixpkgs-unstable-small", "wordsofgod": "wordsofgod" } }, diff --git a/flake.nix b/flake.nix index 67768d8..ef869a2 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,7 @@ inputs = { nixpkgs.url = "nixpkgs/nixos-unstable"; nixpkgs-stable.url = "nixpkgs/nixos-23.11"; + nixpkgs-unstable-small.url = "nixpkgs/nixos-unstable-small"; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -26,12 +27,14 @@ self, nixpkgs, nixpkgs-stable, + nixpkgs-unstable-small, home-manager, nixos-hardware, mac-brcm-fw, ... } @ inputs: let pkgs = nixpkgs.legacyPackages."x86_64-linux"; + pkgs-unstable-small = nixpkgs-unstable-small.legacyPackages."x86_64-linux"; in { devShells."x86_64-linux".default = pkgs.mkShell { buildInputs = [ @@ -49,7 +52,7 @@ nixosConfigurations = { monosodium-glutamate-g = nixpkgs.lib.nixosSystem { specialArgs = { - inherit inputs; + inherit inputs pkgs-unstable-small; }; system = "x86_64-linux"; modules = [ @@ -71,7 +74,7 @@ }; catbook-j = nixpkgs.lib.nixosSystem { specialArgs = { - inherit inputs; + inherit inputs pkgs-unstable-small; }; system = "x86_64-linux"; modules = [ @@ -93,7 +96,7 @@ }; potatobook-g = nixpkgs.lib.nixosSystem { specialArgs = { - inherit inputs; + inherit inputs pkgs-unstable-small; }; system = "x86_64-linux"; modules = [ diff --git a/modules/shell/helix.nix b/modules/shell/helix.nix index 75e573b..c18bad5 100644 --- a/modules/shell/helix.nix +++ b/modules/shell/helix.nix @@ -1,4 +1,8 @@ -{config, ...}: { +{ + config, + pkgs-unstable-small, + ... +}: { home-manager.users.jade = {pkgs, ...}: let typstGrammar = pkgs.fetchFromGitHub { owner = "uben0"; @@ -24,6 +28,7 @@ }; programs.helix = { enable = true; + package = pkgs-unstable-small.helix; settings = { theme = "gruvbox"; editor = {