builders: use pkgs overlay
This commit is contained in:
parent
2d2909e22e
commit
89e5cb8679
10 changed files with 32 additions and 15 deletions
|
@ -79,5 +79,7 @@
|
||||||
system = "aarch64-darwin";
|
system = "aarch64-darwin";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
|
overlays.default = import ./pkgs;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, ... }:
|
{ lib, self, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
getModules = path:
|
getModules = path:
|
||||||
|
@ -16,6 +16,7 @@ in
|
||||||
imports = getModules ./.;
|
imports = getModules ./.;
|
||||||
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
nixpkgs.overlays = [ self.overlays.default ];
|
||||||
|
|
||||||
snowhawk.user.enable = lib.mkDefault true;
|
snowhawk.user.enable = lib.mkDefault true;
|
||||||
snowhawk.tmux.enable = lib.mkDefault true;
|
snowhawk.tmux.enable = lib.mkDefault true;
|
||||||
|
|
|
@ -100,9 +100,6 @@
|
||||||
# backupFileExtension = "backup";
|
# backupFileExtension = "backup";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Allow unfree packages
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
|
||||||
|
|
||||||
# programs.hyprland.enable = true;
|
# programs.hyprland.enable = true;
|
||||||
# environment.sessionVariables.NIXOS_OZONE_WL = "1";
|
# environment.sessionVariables.NIXOS_OZONE_WL = "1";
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# your system. Help is available in the configuration.nix(5) man page
|
# your system. Help is available in the configuration.nix(5) man page
|
||||||
# and in the NixOS manual (accessible by running `nixos-help`).
|
# and in the NixOS manual (accessible by running `nixos-help`).
|
||||||
|
|
||||||
{ pkgs, inputs, lib, config, ... }:
|
{ pkgs, inputs, lib, config, self, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
@ -98,7 +98,7 @@
|
||||||
security.polkit.enable = true;
|
security.polkit.enable = true;
|
||||||
|
|
||||||
home-manager = {
|
home-manager = {
|
||||||
extraSpecialArgs = { inherit inputs; };
|
extraSpecialArgs = { inherit inputs self; };
|
||||||
users = { "ravenshade" = import ./home.nix; };
|
users = { "ravenshade" = import ./home.nix; };
|
||||||
# backupFileExtension = "backup";
|
# backupFileExtension = "backup";
|
||||||
};
|
};
|
||||||
|
|
|
@ -102,9 +102,6 @@
|
||||||
# backupFileExtension = "backup";
|
# backupFileExtension = "backup";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Allow unfree packages
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
|
||||||
|
|
||||||
# programs.hyprland.enable = true;
|
# programs.hyprland.enable = true;
|
||||||
# environment.sessionVariables.NIXOS_OZONE_WL = "1";
|
# environment.sessionVariables.NIXOS_OZONE_WL = "1";
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ nixpkgs, ... }@inputs:
|
{ nixpkgs, self, ... }@inputs:
|
||||||
|
|
||||||
let
|
let
|
||||||
lib = nixpkgs.lib.extend (import ../lib);
|
lib = nixpkgs.lib.extend (import ../lib);
|
||||||
|
@ -15,7 +15,7 @@ rec {
|
||||||
hostname
|
hostname
|
||||||
(nixosSystem {
|
(nixosSystem {
|
||||||
inherit system;
|
inherit system;
|
||||||
specialArgs = { inherit inputs lib; };
|
specialArgs = { inherit inputs lib self; };
|
||||||
modules = [
|
modules = [
|
||||||
../hosts/${hostname}/hardware-configuration.nix
|
../hosts/${hostname}/hardware-configuration.nix
|
||||||
../hosts/${hostname}/configuration.nix
|
../hosts/${hostname}/configuration.nix
|
||||||
|
@ -39,9 +39,9 @@ rec {
|
||||||
nameValuePair
|
nameValuePair
|
||||||
"${user}${hostStr}"
|
"${user}${hostStr}"
|
||||||
(homeManagerConfiguration {
|
(homeManagerConfiguration {
|
||||||
pkgs = nixpkgs.legacyPackages."${system}";
|
pkgs = nixpkgs.legacyPackages.${system}.extend self.overlays.default;
|
||||||
extraSpecialArgs = {
|
extraSpecialArgs = {
|
||||||
inherit inputs;
|
inherit inputs self;
|
||||||
lib = lib.extend inputs.home-manager.lib;
|
lib = lib.extend inputs.home-manager.lib;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -14,4 +14,5 @@ in
|
||||||
snowhawk.audio.enable = lib.mkDefault true;
|
snowhawk.audio.enable = lib.mkDefault true;
|
||||||
snowhawk.env.enable = lib.mkDefault true;
|
snowhawk.env.enable = lib.mkDefault true;
|
||||||
snowhawk.sops.enable = lib.mkDefault true;
|
snowhawk.sops.enable = lib.mkDefault true;
|
||||||
|
snowhawk.nixpkgs.enable = lib.mkDefault true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,7 +13,5 @@ in
|
||||||
experimental-features = [ "nix-command" "flakes" ];
|
experimental-features = [ "nix-command" "flakes" ];
|
||||||
auto-optimise-store = true;
|
auto-optimise-store = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
17
modules/nixpkgs.nix
Normal file
17
modules/nixpkgs.nix
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
{ lib, config, self, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
cfg = config.snowhawk.nixpkgs;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
options.snowhawk.nixpkgs = {
|
||||||
|
enable = lib.mkEnableOption "nixpkgs settings";
|
||||||
|
};
|
||||||
|
|
||||||
|
config = lib.mkIf cfg.enable {
|
||||||
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
|
||||||
|
nixpkgs.overlays = [ self.overlays.default ];
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
4
pkgs/default.nix
Normal file
4
pkgs/default.nix
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
final: prev:
|
||||||
|
{
|
||||||
|
wrapWine = prev.lib.callPackage ./wrapWine.nix { };
|
||||||
|
}
|
Loading…
Reference in a new issue