some fixes

This commit is contained in:
Dmitriy Kholkin 2021-02-07 05:18:04 +03:00
parent 3bc9bb904c
commit c03110f321
5 changed files with 36 additions and 21 deletions

View File

@ -25,4 +25,21 @@
deviceSpecific.isShared = false; deviceSpecific.isShared = false;
deviceSpecific.isGaming = true; deviceSpecific.isGaming = true;
deviceSpecific.enableVirtualisation = false; deviceSpecific.enableVirtualisation = false;
boot.blacklistedKernelModules = [
"psmouse"
];
services.fwupd.enable = true;
# systemd.services.unbind-usb2 = {
# script = ''
# echo 'usb2' | tee /sys/bus/usb/drivers/usb/unbind
# '';
# wantedBy = [ "multi-user.target" ];
# };
# boot.kernelParams = lib.mkIf (device == "Dell-Laptop") [
# "mem_sleep_default=deep"
# ];
} }

View File

@ -12,15 +12,10 @@
supportedFilesystems = [ "ntfs" ]; supportedFilesystems = [ "ntfs" ];
blacklistedKernelModules = lib.mkIf (config.device == "Dell-Laptop") [ initrd.kernelModules = if config.deviceSpecific.devInfo.gpu.vendor == "intel" then
"psmouse" [ "i915" ]
]; else
[ ];
initrd.kernelModules = if config.deviceSpecific.devInfo.gpu.vendor == "intel" then [ "iHD" ] else [ ];
# kernelParams = lib.mkIf (device == "Dell-Laptop") [
# "mem_sleep_default=deep"
# ];
extraModprobeConfig = lib.mkIf (config.device == "AMD-Workstation") '' extraModprobeConfig = lib.mkIf (config.device == "AMD-Workstation") ''
options snd slots=snd_virtuoso,snd_usb_audio options snd slots=snd_virtuoso,snd_usb_audio

View File

@ -22,12 +22,15 @@ in
bpytop = pkgs.callPackage ./packages/bpytop.nix { }; bpytop = pkgs.callPackage ./packages/bpytop.nix { };
ibm-plex-powerline = pkgs.callPackage ./packages/ibm-plex-powerline.nix { }; ibm-plex-powerline = pkgs.callPackage ./packages/ibm-plex-powerline.nix { };
bibata-cursors = pkgs.callPackage ./packages/bibata-cursors.nix { }; bibata-cursors = pkgs.callPackage ./packages/bibata-cursors.nix { };
# nix-prefetch-github = old.nix-prefetch-github; # UPDATE
# utillinux = old.utillinux; vivaldi = super.vivaldi.overrideAttrs (old: rec {
# cifs-utils = old.cifs-utils; version = "3.6.2165.36-1";
# mount = old.mount; src = super.fetchurl {
url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}_amd64.deb";
sha256 = "1wgxzggy5sg98k4lzd34k4hyw2jgc14db41z7s7j3c5whlnifh08";
};
});
# vivaldi = old.vivaldi;
# material-icons = pkgs.callPackage ./packages/material-icons-inline.nix { }; # material-icons = pkgs.callPackage ./packages/material-icons-inline.nix { };
# rust-stable = pkgs.latest.rustChannels.stable.rust.override { # rust-stable = pkgs.latest.rustChannels.stable.rust.override {
# extensions = [ # extensions = [

View File

@ -22,9 +22,11 @@ with config.deviceSpecific; {
}; };
}; };
services.undervolt = lib.mkIf (config.device == "Dell-Laptop") { # services.undervolt = lib.mkIf (config.device == "Dell-Laptop") {
enable = true; # enable = true;
coreOffset = -120; # coreOffset = -120;
gpuOffset = -54; # gpuOffset = -54;
}; # };
services.thermald.enable = isLaptop;
} }

View File

@ -37,8 +37,6 @@ with config.deviceSpecific; {
interval = "weekly"; interval = "weekly";
}; };
services.fwupd.enable = (config.device == "Dell-Laptop");
services.udev.packages = [ pkgs.stlink ]; services.udev.packages = [ pkgs.stlink ];
services.avahi = { services.avahi = {