qbit/xin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

europa: disable most of the nixos-hardware changes prevously added

Browse Source
This commit is contained in:
Aaron Bieber 2022-08-28 07:58:48 -06:00
parent 0322c77554
commit d96dd309b7
No known key found for this signature in database
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
flake.nix
View File

@ -45,8 +45,9 @@
}; };
}; };
outputs = { self, unstable, unstableSmall, stable, nixos-hardware, sshKnownHosts, microca outputs = { self, unstable, unstableSmall, stable, nixos-hardware
, mcchunkie, gqrss, darwin, xin-secrets, ... }@flakes: , sshKnownHosts, microca, mcchunkie, gqrss, darwin, xin-secrets, ...
}@flakes:
let let
hostBase = { hostBase = {
overlays = [ flakes.emacs-overlay.overlay ]; overlays = [ flakes.emacs-overlay.overlay ];
@ -112,11 +113,7 @@
devShells.aarch64-darwin.default = buildShell darwinPkgs; devShells.aarch64-darwin.default = buildShell darwinPkgs;
nixosConfigurations = { nixosConfigurations = {
europa = buildSys "x86_64-linux" unstable [ europa = buildSys "x86_64-linux" unstable [ ] "europa";
"${nixos-hardware}/common/cpu/intel"
"${nixos-hardware}/common/pc/laptop"
"${nixos-hardware}/common/pc/laptop/ssd"
] "europa";
box = buildSys "x86_64-linux" stable [ ] "box"; box = buildSys "x86_64-linux" stable [ ] "box";
h = buildSys "x86_64-linux" unstableSmall [ ] "h"; h = buildSys "x86_64-linux" unstableSmall [ ] "h";
faf = buildSys "x86_64-linux" stable [ ] "faf"; faf = buildSys "x86_64-linux" stable [ ] "faf";

8
hosts/europa/default.nix
View File

@ -44,11 +44,8 @@ in {
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;
}; };
kernelPackages = pkgs.linuxPackages; kernelPackages = pkgs.linuxPackages;
kernelParams = [ "boot.shell_on_fail" "nvme.noacpi=1" ]; kernelParams = [ "boot.shell_on_fail" ];
kernelModules = [ "kvm-intel" ]; kernelModules = [ "kvm-intel" ];
extraModprobeConfig = ''
options snd-hda-intel model=dell-headset-multi
'';
}; };
programs.zsh.shellAliases = { programs.zsh.shellAliases = {
@ -132,7 +129,6 @@ in {
enable = true; enable = true;
client.enable = true; client.enable = true;
}; };
#blueman.enable = true;
cron = { cron = {
enable = true; enable = true;
systemCronJobs = [ systemCronJobs = [
@ -145,6 +141,7 @@ in {
# lidSwitch = "suspend-then-hibernate"; # lidSwitch = "suspend-then-hibernate";
# lidSwitchExternalPower = "lock"; # lidSwitchExternalPower = "lock";
#}; #};
fstrim.enable = true;
tlp = { tlp = {
enable = false; enable = false;
settings = { settings = {
@ -162,7 +159,6 @@ in {
udev.extraRules = '' udev.extraRules = ''
SUBSYSTEM=="usb", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="5bf0", GROUP="users", TAG+="uaccess" SUBSYSTEM=="usb", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="5bf0", GROUP="users", TAG+="uaccess"
SUBSYSTEM=="pci", ATTR{vendor}=="0x8086", ATTR{device}=="0xa0e0", ATTR{power/control}="on"
''; '';
}; };

1
hosts/europa/hardware-configuration.nix
View File

@ -58,6 +58,7 @@
}; };
swapDevices = [ ]; swapDevices = [ ];
# needed for hibernate
#swapDevices = #swapDevices =
# [{ device = "/dev/disk/by-uuid/6e56876e-bd04-4fbb-9ff7-5202cbf5eaa4"; }]; # [{ device = "/dev/disk/by-uuid/6e56876e-bd04-4fbb-9ff7-5202cbf5eaa4"; }];