[NixOS] Move home-manager to desktop.nix
This commit is contained in:
parent
7ff7e8b5a2
commit
4d182e2e74
@ -2,7 +2,6 @@
|
||||
{
|
||||
imports = [
|
||||
./users.nix
|
||||
./fonts.nix
|
||||
./essential.nix
|
||||
./environment.nix
|
||||
];
|
||||
|
@ -2,6 +2,7 @@
|
||||
{
|
||||
imports = [
|
||||
./fonts.nix
|
||||
inputs.home-manager.nixosModule
|
||||
];
|
||||
nixpkgs.overlays = with inputs; [
|
||||
xmonad.overlay
|
||||
@ -116,4 +117,8 @@
|
||||
# Audio
|
||||
playerctl
|
||||
];
|
||||
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.users.imalison = (import ./home-manager.nix) inputs;
|
||||
}
|
||||
|
@ -39,14 +39,8 @@
|
||||
[ { device = "/dev/disk/by-uuid/c0dcff59-8072-48fb-b242-a7a1797e4b48"; }
|
||||
];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
# still possible to use this option, but it's recommended to use it in conjunction
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
|
||||
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
|
@ -3,11 +3,10 @@
|
||||
{
|
||||
imports = [
|
||||
../full.nix
|
||||
../games.nix
|
||||
../essential.nix
|
||||
../desktop.nix
|
||||
];
|
||||
|
||||
networking.hostName = "ryzen-shine";
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
linuxPackages_latest.perf
|
||||
];
|
||||
@ -38,26 +37,25 @@
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/356173ab-d076-43e0-aeb6-6a6829c4402b";
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/356173ab-d076-43e0-aeb6-6a6829c4402b";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/B270-C7E6";
|
||||
fsType = "vfat";
|
||||
};
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/B270-C7E6";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
fileSystems."/shared" =
|
||||
{ device = "/dev/disk/by-uuid/D4009CE8009CD33A";
|
||||
fsType = "ntfs";
|
||||
};
|
||||
fileSystems."/shared" = {
|
||||
device = "/dev/disk/by-uuid/D4009CE8009CD33A";
|
||||
fsType = "ntfs";
|
||||
options = [ "nofail" ];
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/f719b44e-295a-4909-9a60-84f87acb7f77"; }
|
||||
];
|
||||
|
||||
networking.hostName = "ryzen-shine";
|
||||
swapDevices =[
|
||||
{ device = "/dev/disk/by-uuid/f719b44e-295a-4909-9a60-84f87acb7f77"; }
|
||||
];
|
||||
|
||||
# nix.settings.maxJobs = lib.mkDefault 16;
|
||||
# High-DPI console
|
||||
|
@ -42,12 +42,4 @@
|
||||
};
|
||||
|
||||
nix.settings.trusted-users = [ "root" "imalison" "kat" ];
|
||||
|
||||
imports = [
|
||||
inputs.home-manager.nixosModule
|
||||
];
|
||||
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.users.imalison = (import ./home-manager.nix) inputs;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user