feat: adjust overlays

This commit is contained in:
ryan4yin
2023-05-21 11:44:45 +08:00
parent a2daad2719
commit 58d4005e4f
24 changed files with 64 additions and 77 deletions

View File

@@ -6,35 +6,26 @@
{ config, pkgs, home-manager, nur, ... } @ args:
{
imports =
[
({pkgs, config, ... }: {
config = {
# use it as an overlay
nixpkgs.overlays = [
args.nixpkgs-wayland.overlay
];
};
})
imports = [
# This adds a nur configuration option.
# Use `config.nur.repos.<user>.<package-name>` in NixOS Module for packages from the NUR.
nur.nixosModules.nur
# This adds a nur configuration option.
# Use `config.nur.repos.<user>.<package-name>` in NixOS Module for packages from the NUR.
nur.nixosModules.nur
./cifs-mount.nix
# Include the results of the hardware scan.
./hardware-configuration.nix
./cifs-mount.nix
# Include the results of the hardware scan.
./hardware-configuration.nix
../../modules/fhs-fonts.nix
../../modules/hyprland.nix
#../../modules/i3.nix
../../modules/nur-packages.nix
../../modules/system.nix
../../modules/user_group.nix
../../modules/fcitx5
../../modules/fhs-fonts.nix
../../modules/hyprland.nix
#../../modules/i3.nix
../../modules/nur-packages.nix
../../modules/system.nix
../../modules/user_group.nix
../../secrets
];
../../secrets
];
nixpkgs.overlays = import ../../overlays args;
# Bootloader.
boot.loader = {

View File

@@ -5,34 +5,25 @@
{ config, pkgs, home-manager, nur, ... } @args:
{
imports =
[
({pkgs, config, ... }: {
config = {
# use it as an overlay
nixpkgs.overlays = [
args.nixpkgs-wayland.overlay
];
};
})
imports = [
# This adds a nur configuration option.
# Use `config.nur.repos.<user>.<package-name>` in NixOS Module for packages from the NUR.
nur.nixosModules.nur
# This adds a nur configuration option.
# Use `config.nur.repos.<user>.<package-name>` in NixOS Module for packages from the NUR.
nur.nixosModules.nur
# Include the results of the hardware scan.
./hardware-configuration.nix
# Include the results of the hardware scan.
./hardware-configuration.nix
../../modules/fhs-fonts.nix
../../modules/hyprland.nix
#../../modules/i3.nix
../../modules/nur-packages.nix
../../modules/system.nix
../../modules/user_group.nix
../../modules/fcitx5
../../modules/fhs-fonts.nix
../../modules/hyprland.nix
#../../modules/i3.nix
../../modules/nur-packages.nix
../../modules/system.nix
../../modules/user_group.nix
../../secrets
];
../../secrets
];
nixpkgs.overlays = import ../../overlays args;
# Bootloader.
boot.loader = {