From fa8108f522ddfcd7ba029b02d73a0553833f2d1f Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Fri, 12 Jul 2024 07:59:21 +0800 Subject: [PATCH] flake: unbreak `nix flake check` --- flake.nix | 2 +- hosts/aristotle/graphical/home/default.nix | 38 ++++++++++------------ nixos/modules/services/pixivfe.nix | 2 +- 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/flake.nix b/flake.nix index d0d038d..fa35008 100644 --- a/flake.nix +++ b/flake.nix @@ -144,7 +144,7 @@ checks = {formatting = treefmtEval.config.build.check inputs.self;}; ### nix {run,shell,build} - packages = import ./pkgs pkgs; + legacyPackages = import ./pkgs pkgs; ### nix develop devShells.default = pkgs.mkShell { diff --git a/hosts/aristotle/graphical/home/default.nix b/hosts/aristotle/graphical/home/default.nix index 3c5a71d..798ac81 100644 --- a/hosts/aristotle/graphical/home/default.nix +++ b/hosts/aristotle/graphical/home/default.nix @@ -30,27 +30,25 @@ ''; home.packages = - ( - with pkgs; [ - amberol - dconf-editor - file-roller - fractal - gnome-calculator - hyperfine - loupe - mousai - seahorse + (with pkgs; [ + amberol + dconf-editor + file-roller + fractal + gnome-calculator + hyperfine + loupe + mousai + seahorse - (prismlauncher.override { - glfw = glfw-wayland-minecraft; - gamemodeSupport = false; - }) - mumble - osu-lazer-bin - ] - ) - ++ (with inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.scripts; [ + (prismlauncher.override { + glfw = glfw-wayland-minecraft; + gamemodeSupport = false; + }) + mumble + osu-lazer-bin + ]) + ++ (with inputs.self.legacyPackages.${pkgs.stdenv.hostPlatform.system}.scripts; [ lofi ]); diff --git a/nixos/modules/services/pixivfe.nix b/nixos/modules/services/pixivfe.nix index a86a621..8a7617b 100644 --- a/nixos/modules/services/pixivfe.nix +++ b/nixos/modules/services/pixivfe.nix @@ -10,7 +10,7 @@ in { options.services.pixivfe = { enable = lib.mkEnableOption "PixivFE, a privacy respecting frontend for Pixiv"; - package = lib.mkPackageOption inputs.self.packages.${pkgs.stdenv.hostPlatform.system} "pixivfe" {}; + package = lib.mkPackageOption inputs.self.legacyPackages.${pkgs.stdenv.hostPlatform.system} "pixivfe" {}; openFirewall = lib.mkEnableOption "open ports in the firewall needed for the daemon to function";