diff --git a/Droidnix/README.org b/Droidnix/README.org index 3ccef46ec..364537372 100644 --- a/Droidnix/README.org +++ b/Droidnix/README.org @@ -145,6 +145,10 @@ The Nix flake definition for Droidnix. description = "Droidnix: A dendritic NixOS + Home Manager configuration"; inputs = { + + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nerdfonts.url = "github:nix-community/nerdfonts"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; home-manager = { url = "github:nix-community/home-manager"; @@ -192,14 +196,11 @@ outputs = lib.nixosSystem { inherit system; modules = [ - #nerdfonts overlay - ({ config, pkgs, ... }: { - nixpkgs.overlays = [ - (final: prev: { - nerdfonts = prev.callPackage "${prev.path}/pkgs/data/fonts/nerdfonts" {}; - }) - ]; - }) + + nixpkgs.overlays = [ + inputs.nerdfonts.overlays.default + ]; + # Import machine-specific configurations ./assets/flake/machines/traveldroid/top.nix diff --git a/Droidnix/flake.nix b/Droidnix/flake.nix index c3e5bcfbf..fffa02a92 100644 --- a/Droidnix/flake.nix +++ b/Droidnix/flake.nix @@ -2,6 +2,10 @@ description = "Droidnix: A dendritic NixOS + Home Manager configuration"; inputs = { + + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nerdfonts.url = "github:nix-community/nerdfonts"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; home-manager = { url = "github:nix-community/home-manager"; @@ -49,14 +53,11 @@ outputs = lib.nixosSystem { inherit system; modules = [ - #nerdfonts overlay - ({ config, pkgs, ... }: { - nixpkgs.overlays = [ - (final: prev: { - nerdfonts = prev.callPackage "${prev.path}/pkgs/data/fonts/nerdfonts" {}; - }) - ]; - }) + + nixpkgs.overlays = [ + inputs.nerdfonts.overlays.default + ]; + # Import machine-specific configurations ./assets/flake/machines/traveldroid/top.nix