Merge branch 'master' of github.com:IvanMalison/dotfiles

This commit is contained in:
Ivan Malison 2019-06-17 01:02:37 -07:00
commit ebd55fba34
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
3 changed files with 2 additions and 5 deletions

View File

@ -277,9 +277,6 @@ in
programs.gnupg.agent = { enable = true; enableSSHSupport = true; }; programs.gnupg.agent = { enable = true; enableSSHSupport = true; };
programs.adb.enable = true; programs.adb.enable = true;
services.tlp.enable = true;
services.acpid.enable = false;
services.openssh.enable = true; services.openssh.enable = true;
services.avahi = { services.avahi = {

View File

@ -4,9 +4,7 @@
imports = [ imports = [
<nixpkgs/nixos/modules/installer/scan/not-detected.nix> <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
../configuration.nix ../configuration.nix
../games.nix
../cachix.nix ../cachix.nix
../extra.nix
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ];

View File

@ -25,6 +25,8 @@
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
services.xserver.libinput.enable = true; services.xserver.libinput.enable = true;
services.tlp.enable = true;
services.acpid.enable = false;
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/58218a04-3ba1-4295-86bb-ada59f75e3b6"; device = "/dev/disk/by-uuid/58218a04-3ba1-4295-86bb-ada59f75e3b6";