diff --git a/flake.nix b/flake.nix index 892d901..1794af7 100644 --- a/flake.nix +++ b/flake.nix @@ -37,8 +37,22 @@ url = "github:nix-community/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs"; }; + rust-overlay = { + url = "github:oxalica/rust-overlay"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - outputs = inputs @ { self, nur, nixpkgs, home-manager, sops-nix, neovim-nightly-overlay, nix-index-database, ... }: + outputs = + inputs @ { self + , nur + , nixpkgs + , home-manager + , sops-nix + , neovim-nightly-overlay + , nix-index-database + , rust-overlay + , ... + }: let commonModules = [ nur.nixosModules.nur @@ -52,6 +66,7 @@ nixpkgs.overlays = [ neovim-nightly-overlay.overlays.default nur.overlay + rust-overlay.overlays.default ]; } { @@ -72,7 +87,6 @@ home-manager.sharedModules = [ nix-index-database.hmModules.nix-index inputs.sops-nix.homeManagerModules.sops - ]; } ]; diff --git a/home/modules/hyprland/wallust-build.nix b/home/modules/hyprland/wallust-build.nix index 9d1d8c5..66cd0a0 100644 --- a/home/modules/hyprland/wallust-build.nix +++ b/home/modules/hyprland/wallust-build.nix @@ -4,7 +4,7 @@ , nix-update-script , imagemagick , makeWrapper -, unstable +, pkgs }: let version = "3.0.0-beta"; @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-dkHS8EOzmn5VLiKP3SMT0ZGAsk2wzvQeioG7NuGGUzA="; - nativeBuildInputs = [ makeWrapper unstable.rustc ]; + nativeBuildInputs = [ makeWrapper pkgs.rust-bin.stable."1.77.2".default ]; postFixup = '' wrapProgram $out/bin/wallust \ diff --git a/home/modules/hyprland/wallust.nix b/home/modules/hyprland/wallust.nix index 400754c..e465d11 100644 --- a/home/modules/hyprland/wallust.nix +++ b/home/modules/hyprland/wallust.nix @@ -8,7 +8,7 @@ in home.packages = [ pkgs.imagemagick # unstable.wallust - (pkgs.callPackage ./wallust-build.nix { inherit unstable; }) + (pkgs.callPackage ./wallust-build.nix { }) ]; home. file.".config/wallust/templates" = {