From bc375742bcaa13941d46df1c65395f16d51c0144 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 8 Dec 2024 14:50:47 +0100 Subject: [PATCH] nur: adjust eval to flakyfication of upstream --- common/guest.nix | 1 - flake.nix | 1 - home/modules/fonts.nix | 2 +- home/modules/packages.nix | 5 +++-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/common/guest.nix b/common/guest.nix index 7183bc1..2084b97 100644 --- a/common/guest.nix +++ b/common/guest.nix @@ -32,7 +32,6 @@ in # FIXME: possibly expose home modules through flake outputs instead of brittle path traversals users.gast = { imports = [ - inputs.nur.hmModules.nur ../home/modules/packages.nix ]; home = { diff --git a/flake.nix b/flake.nix index 0fac46e..8a5a03a 100644 --- a/flake.nix +++ b/flake.nix @@ -82,7 +82,6 @@ modules = [ { imports = [ - nur.hmModules.nur ./home/common.nix ./home/${confName}.nix ]; diff --git a/home/modules/fonts.nix b/home/modules/fonts.nix index 05aa897..6ce1185 100644 --- a/home/modules/fonts.nix +++ b/home/modules/fonts.nix @@ -15,7 +15,7 @@ twemoji-color-font open-sans (iosevka-bin.override { variant = "CurlySlab"; }) - config.nur.repos.schmittlauch.vollkorn + inputs.nur.legacyPackages.${system}.repos.schmittlauch.vollkorn # TODO: humor-sans # fcio corporate design, TODO module diff --git a/home/modules/packages.nix b/home/modules/packages.nix index a164d91..1d946fe 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -10,6 +10,7 @@ with pkgs; let cfg = config.schmittlauch.packages; unstable = inputs.nixos-unstable.legacyPackages.${system}; + nur = inputs.nur.legacyPackages.${system}; graphicsApps = [ @@ -41,7 +42,7 @@ let musescore tenacity soundkonverter - #config.nur.repos.fooker.studio-link + #nur.repos.fooker.studio-link ]; cliApps = @@ -86,7 +87,7 @@ let torsocks agrep reptyr # re-bind running program to other tty - config.nur.repos.schmittlauch.lolcommits + nur.repos.schmittlauch.lolcommits ]; nixHelpers = [