colonelpanic/dotfiles
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[NixOS] Move home-manager to desktop.nix

Browse Source
This commit is contained in:
Ivan Malison 2023-06-29 00:49:50 -06:00
parent 7ff7e8b5a2
commit 4d182e2e74
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
5 changed files with 24 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/base.nix
View File

@ -2,7 +2,6 @@
{ {
imports = [ imports = [
./users.nix ./users.nix
./fonts.nix
./essential.nix ./essential.nix
./environment.nix ./environment.nix
]; ];

5
nixos/desktop.nix
View File

@ -2,6 +2,7 @@
{ {
imports = [ imports = [
./fonts.nix ./fonts.nix
inputs.home-manager.nixosModule
]; ];
nixpkgs.overlays = with inputs; [ nixpkgs.overlays = with inputs; [
xmonad.overlay xmonad.overlay
@ -116,4 +117,8 @@
# Audio # Audio
playerctl playerctl
]; ];
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.imalison = (import ./home-manager.nix) inputs;
} }

8
nixos/machines/nixquick.nix
View File

@ -39,14 +39,8 @@
[ { device = "/dev/disk/by-uuid/c0dcff59-8072-48fb-b242-a7a1797e4b48"; } [ { 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"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

24
nixos/machines/ryzen-shine.nix
View File

@ -3,11 +3,10 @@
{ {
imports = [ imports = [
../full.nix ../full.nix
../games.nix
../essential.nix
../desktop.nix
]; ];
networking.hostName = "ryzen-shine";
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
linuxPackages_latest.perf linuxPackages_latest.perf
]; ];
@ -38,27 +37,26 @@
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/356173ab-d076-43e0-aeb6-6a6829c4402b"; device = "/dev/disk/by-uuid/356173ab-d076-43e0-aeb6-6a6829c4402b";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/B270-C7E6"; device = "/dev/disk/by-uuid/B270-C7E6";
fsType = "vfat"; fsType = "vfat";
}; };
fileSystems."/shared" = fileSystems."/shared" = {
{ device = "/dev/disk/by-uuid/D4009CE8009CD33A"; device = "/dev/disk/by-uuid/D4009CE8009CD33A";
fsType = "ntfs"; fsType = "ntfs";
options = [ "nofail" ];
}; };
swapDevices = swapDevices =[
[ { device = "/dev/disk/by-uuid/f719b44e-295a-4909-9a60-84f87acb7f77"; } { device = "/dev/disk/by-uuid/f719b44e-295a-4909-9a60-84f87acb7f77"; }
]; ];
networking.hostName = "ryzen-shine";
# nix.settings.maxJobs = lib.mkDefault 16; # nix.settings.maxJobs = lib.mkDefault 16;
# High-DPI console # High-DPI console
console.font = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz"; console.font = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";

8
nixos/users.nix
View File

@ -42,12 +42,4 @@
}; };
nix.settings.trusted-users = [ "root" "imalison" "kat" ]; 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;
} }