更新hyprland配置; 更新flake配置的方式
This commit is contained in:
@@ -1,18 +1,6 @@
|
||||
args@{ self, inputs, outputs, lib, pkgs, home-manager, username, useremail, hostname, sysversion, ... }: {
|
||||
|
||||
args@{ self, pkgs, home-manager, username, sysversion, ... }: {
|
||||
# You can import other NixOS modules here
|
||||
imports = [
|
||||
# If you want to use modules your own flake exports (from modules/nixos):
|
||||
# outputs.nixosModules.example
|
||||
|
||||
# Or modules from other flakes (such as nixos-hardware):
|
||||
# inputs.hardware.nixosModules.common-cpu-amd
|
||||
# inputs.hardware.nixosModules.common-ssd
|
||||
|
||||
# You can also split up your configuration and import pieces of it here:
|
||||
# ./users.nix
|
||||
|
||||
# Import your generated (nixos-generate-config) hardware configuration
|
||||
./mount.nix
|
||||
./network.nix
|
||||
./hardware-configuration.nix
|
||||
@@ -21,6 +9,7 @@ args@{ self, inputs, outputs, lib, pkgs, home-manager, username, useremail, host
|
||||
"${self}/modules/nixos/fonts"
|
||||
"${self}/modules/nixos/user.nix"
|
||||
"${self}/modules/nixos/audio.nix"
|
||||
|
||||
"${self}/modules/nixos/samba.nix"
|
||||
"${self}/modules/nixos/virtualize/appimage.nix"
|
||||
"${self}/modules/nixos/virtualize/docker.nix"
|
||||
@@ -29,15 +18,17 @@ args@{ self, inputs, outputs, lib, pkgs, home-manager, username, useremail, host
|
||||
{
|
||||
# home-manager.useGlobalPkgs = true;
|
||||
# home-manager.useUserPackages = true;
|
||||
home-manager.extraSpecialArgs = {
|
||||
inherit self inputs outputs hostname username useremail sysversion;
|
||||
};
|
||||
home-manager.users."${username}" = { ... }: {
|
||||
imports = [
|
||||
./hm
|
||||
"${self}/home/desktop.nix"
|
||||
"${self}/modules/home/develop.nix"
|
||||
];
|
||||
home-manager = {
|
||||
extraSpecialArgs = {
|
||||
inherit (args) self inputs outputs libs hostname username useremail sysversion;
|
||||
};
|
||||
users."${username}" = { ... }: {
|
||||
imports = [
|
||||
./hm
|
||||
"${self}/home/desktop.nix"
|
||||
"${self}/modules/home/develop.nix"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
];
|
||||
|
||||
Reference in New Issue
Block a user