Nix : Use different way to include applefont.
This commit is contained in:
parent
31b4ed7a7e
commit
c81dc44422
|
@ -1,13 +1,8 @@
|
|||
{
|
||||
description = "Apple fonts.";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs } @inputs:
|
||||
outputs = { nixpkgs, system } @inputs:
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
lib = nixpkgs.lib;
|
||||
in {
|
|
@ -6,7 +6,6 @@
|
|||
url = "git+https://git.voronind.com/voronind/linux.git";
|
||||
flake = false;
|
||||
};
|
||||
applefonts.url = "git+file:.?dir=./.config/linux/system/derivation/apple_font";
|
||||
|
||||
# Nvim plugins.
|
||||
nvimAlign = {
|
||||
|
@ -87,7 +86,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, dotfiles, applefonts, ... } @inputs: rec {
|
||||
outputs = { self, nixpkgs, dotfiles, ... } @inputs: rec {
|
||||
# Constant values.
|
||||
nixosModules.const = {
|
||||
hashedPassword = "$y$j9T$oqCB16i5E2t1t/HAWaFd5.$tTaHtAcifXaDVpTcRv.yH2/eWKxKE9xM8KcqXHfHrD7"; # Use `mkpasswd`.
|
||||
|
@ -121,6 +120,14 @@
|
|||
./module/common/Wallpaper.nix
|
||||
];
|
||||
|
||||
# Apple fonts flake.
|
||||
# applefont-flake = import ./derivation/applefont/flake.nix;
|
||||
# applefont-outputs = applefont-flake.outputs {
|
||||
# inherit nixpkgs;
|
||||
# inherit system;
|
||||
# };
|
||||
# applefont = applefont-outputs.packages.system.default;
|
||||
|
||||
# Function to create a host.
|
||||
mkHost = { system, hostname, modules }: nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
|
@ -135,6 +142,10 @@
|
|||
specialArgs.const = self.nixosModules.const;
|
||||
specialArgs.flake = self;
|
||||
specialArgs.inputs = inputs;
|
||||
specialArgs.applefont = ((import ./derivation/applefont/flake.nix).outputs {
|
||||
inherit nixpkgs;
|
||||
inherit system;
|
||||
}).packages.${system}.default;
|
||||
};
|
||||
|
||||
# List of all hosts bellow.
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ pkgs, inputs, ... }: {
|
||||
{ pkgs, specialArgs, ... }: rec {
|
||||
fonts.packages = with pkgs; [
|
||||
inputs.applefonts.packages.${pkgs.system}.default
|
||||
specialArgs.applefont
|
||||
(nerdfonts.override { fonts = [ "Terminus" ]; })
|
||||
];
|
||||
}
|
||||
|
|
Reference in a new issue