clean up ezpcusr and defaults

This commit is contained in:
notgne2 2021-09-28 13:16:34 -07:00
parent 591e2a3db0
commit e1fdc111b3
No known key found for this signature in database
GPG Key ID: BB661E172B42A7F8
3 changed files with 426 additions and 758 deletions

View File

@ -68,11 +68,6 @@ in
default = { }; default = { };
}; };
waybarCss = mkOption {
description = "Exported CSS for waybar";
default = "";
};
base16Rgb = mkOption { base16Rgb = mkOption {
readOnly = true; readOnly = true;
type = types.attrsOf (types.attrsOf types.int); type = types.attrsOf (types.attrsOf types.int);
@ -260,14 +255,6 @@ in
}; };
}; };
# Waybar
colors.waybarCss =
"\n" + (
(import ../data/waybar-base16.nix)
cfg.favColors.name
cfg.base16
);
# Dunst # Dunst
services.dunst = { services.dunst = {
settings = { settings = {

File diff suppressed because it is too large Load Diff

View File

@ -21,8 +21,8 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
services.avahi = { services.avahi = {
enable = true; enable = lib.mkDefault true;
nssmdns = true; nssmdns = lib.mkDefault true;
}; };
services.ezpw.enable = lib.mkDefault true; services.ezpw.enable = lib.mkDefault true;
@ -39,20 +39,20 @@ in
# Don't kill the battery # Don't kill the battery
services.upower = { services.upower = {
enable = true; enable = lib.mkDefault true;
percentageLow = 15; percentageLow = lib.mkDefault 15;
percentageCritical = 10; percentageCritical = lib.mkDefault 10;
percentageAction = 5; percentageAction = lib.mkDefault 5;
}; };
# Make battery usage sane # Make battery usage sane
services.tlp = { services.tlp = {
enable = lib.mkDefault cfg.battery; enable = lib.mkDefault cfg.battery;
settings = { settings = {
DISK_IOSCHED = "bfq bfq"; DISK_IOSCHED = lib.mkDefault "mq-deadline deadline";
PCIE_ASPM_ON_BAT = "powersupersave"; PCIE_ASPM_ON_BAT = lib.mkDefault "powersupersave";
PCIE_ASPM_ON_AC = "default"; PCIE_ASPM_ON_AC = lib.mkDefault "default";
PLATFORM_PROFILE_ON_BAT = lib.mkDefault "low-power"; PLATFORM_PROFILE_ON_BAT = lib.mkDefault "low-power";
PLATFORM_PROFILE_ON_AC = lib.mkDefault "performance"; PLATFORM_PROFILE_ON_AC = lib.mkDefault "performance";
@ -81,9 +81,9 @@ in
# Video support # Video support
hardware.opengl = { hardware.opengl = {
enable = true; enable = lib.mkDefault true;
# Fix steam # Fix steam
driSupport32Bit = true; driSupport32Bit = lib.mkDefault true;
# Other drivers # Other drivers
extraPackages = with pkgs; [ extraPackages = with pkgs; [
intel-media-driver intel-media-driver
@ -144,7 +144,7 @@ in
# this helps with some compatibility # this helps with some compatibility
hardware.pulseaudio.daemon.config = { hardware.pulseaudio.daemon.config = {
"default-sample-rate" = "48000"; "default-sample-rate" = lib.mkDefault "48000";
}; };
# networking.networkmanager.ethernet.macAddress = "random"; # networking.networkmanager.ethernet.macAddress = "random";
@ -179,7 +179,7 @@ in
# Pulseaudio is off by defaultm but if you want it, make it work right # Pulseaudio is off by defaultm but if you want it, make it work right
hardware.pulseaudio.support32Bit = lib.mkDefault true; hardware.pulseaudio.support32Bit = lib.mkDefault true;
hardware.pulseaudio.zeroconf.discovery.enable = lib.mkDefault true; hardware.pulseaudio.zeroconf.discovery.enable = lib.mkDefault true;
hardware.pulseaudio.package = pkgs.pulseaudioFull; hardware.pulseaudio.package = lib.mkDefault pkgs.pulseaudioFull;
hardware.pulseaudio.extraModules = [ pkgs.pulseaudio-modules-bt ]; hardware.pulseaudio.extraModules = [ pkgs.pulseaudio-modules-bt ];
hardware.pulseaudio.extraConfig = '' hardware.pulseaudio.extraConfig = ''
load-module module-dbus-protocol load-module module-dbus-protocol
@ -188,6 +188,6 @@ in
# bluetooth # bluetooth
services.blueman.enable = lib.mkDefault true; services.blueman.enable = lib.mkDefault true;
hardware.bluetooth.enable = lib.mkDefault true; hardware.bluetooth.enable = lib.mkDefault true;
hardware.bluetooth.settings.General.Enable = "Source,Sink,Media,Socket"; hardware.bluetooth.settings.General.Enable = lib.mkDefault "Source,Sink,Media,Socket";
}; };
} }