From 0105051718bcc70b335c7fd6e222e223760d5563 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Fri, 9 Jul 2021 06:08:41 +0200 Subject: [PATCH] default cpuFreqGovernor is ondemand now --- configs/mobi/hardware-configuration.nix | 2 -- configs/pepe/hardware-configuration.nix | 3 +-- configs/porani/hardware-configuration.nix | 1 - configs/sternchen/hardware-configuration.nix | 1 - configs/sterni/configuration.nix | 1 - configs/sterni/hardware-configuration.nix | 1 - modules/system/x11.nix | 8 ++++---- system/all/default.nix | 4 ++++ system/server/default.nix | 1 - .../plops/configs/nixserver-host/configuration.nix | 10 +++++----- .../plops/configs/nixserver-host/jitsi.nix | 3 +-- .../plops/configs/nixserver-host/netdata.nix | 3 +-- .../plops/configs/nixserver-host/options.nix | 3 +-- 13 files changed, 17 insertions(+), 24 deletions(-) diff --git a/configs/mobi/hardware-configuration.nix b/configs/mobi/hardware-configuration.nix index 3ad6850..fb0e6d5 100644 --- a/configs/mobi/hardware-configuration.nix +++ b/configs/mobi/hardware-configuration.nix @@ -27,8 +27,6 @@ fsType = "tmpfs"; }; - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; - # NTFS support # ------------ environment.systemPackages = [ pkgs.ntfs3g ]; diff --git a/configs/pepe/hardware-configuration.nix b/configs/pepe/hardware-configuration.nix index d5af445..ef1bfc4 100644 --- a/configs/pepe/hardware-configuration.nix +++ b/configs/pepe/hardware-configuration.nix @@ -52,8 +52,7 @@ fsType = "tmpfs"; }; - nix.maxJobs = lib.mkDefault 4; - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; + nix.maxJobs = lib.mkDefault 2; # lvm volume group # ---------------- diff --git a/configs/porani/hardware-configuration.nix b/configs/porani/hardware-configuration.nix index eb94e60..343190b 100644 --- a/configs/porani/hardware-configuration.nix +++ b/configs/porani/hardware-configuration.nix @@ -75,6 +75,5 @@ swapDevices = [ ]; nix.maxJobs = lib.mkDefault 4; - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; } diff --git a/configs/sternchen/hardware-configuration.nix b/configs/sternchen/hardware-configuration.nix index 0090a4a..e0ae399 100644 --- a/configs/sternchen/hardware-configuration.nix +++ b/configs/sternchen/hardware-configuration.nix @@ -38,7 +38,6 @@ #}; nix.maxJobs = lib.mkDefault 4; - powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; # lvm volume group # ---------------- diff --git a/configs/sterni/configuration.nix b/configs/sterni/configuration.nix index c1cc735..99d8acb 100644 --- a/configs/sterni/configuration.nix +++ b/configs/sterni/configuration.nix @@ -14,7 +14,6 @@ ]; - networking.hostName = "sterni"; system.custom.wifi.interfaces = [ "wlp3s0" ]; diff --git a/configs/sterni/hardware-configuration.nix b/configs/sterni/hardware-configuration.nix index f152758..881d299 100644 --- a/configs/sterni/hardware-configuration.nix +++ b/configs/sterni/hardware-configuration.nix @@ -39,7 +39,6 @@ }; nix.maxJobs = lib.mkDefault 4; - powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; # lvm volume group # ---------------- diff --git a/modules/system/x11.nix b/modules/system/x11.nix index a78def2..228ca3c 100644 --- a/modules/system/x11.nix +++ b/modules/system/x11.nix @@ -54,10 +54,10 @@ in { libinput = { enable = true; touchpad = { - disableWhileTyping = true; - tapping = true; - scrollMethod = "twofinger"; - accelSpeed = "2"; + disableWhileTyping = true; + tapping = true; + scrollMethod = "twofinger"; + accelSpeed = "2"; }; }; diff --git a/system/all/default.nix b/system/all/default.nix index 28aaa40..5150961 100644 --- a/system/all/default.nix +++ b/system/all/default.nix @@ -72,6 +72,10 @@ zsh.enable = true; }; + # Machines should be fast by default + # ---------------------------------- + powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; + # set vim to the default editor # ----------------------------- programs.vim.defaultEditor = true; diff --git a/system/server/default.nix b/system/server/default.nix index 9f5d543..6a55975 100644 --- a/system/server/default.nix +++ b/system/server/default.nix @@ -12,7 +12,6 @@ # make sure laptops stay awake when closing the montior services.logind.lidSwitch = "ignore"; powerManagement.enable = false; - powerManagement.cpuFreqGovernor = "ondemand"; powerManagement.scsiLinkPolicy = "min_power"; # config vim diff --git a/terranix/workadventure-jitsi-setup/plops/configs/nixserver-host/configuration.nix b/terranix/workadventure-jitsi-setup/plops/configs/nixserver-host/configuration.nix index 274d91d..88115b6 100644 --- a/terranix/workadventure-jitsi-setup/plops/configs/nixserver-host/configuration.nix +++ b/terranix/workadventure-jitsi-setup/plops/configs/nixserver-host/configuration.nix @@ -20,11 +20,11 @@ environment.systemPackages = [ pkgs.git pkgs.docker-compose pkgs.ag pkgs.htop ]; - # party.${hostName} - # api.party.${hostName} - # push.party.${hostName} - # play.party.${hostName} - # upload.party.${hostName} + # party.${hostName} + # api.party.${hostName} + # push.party.${hostName} + # play.party.${hostName} + # upload.party.${hostName} networking.hostName = "host"; workadventure.domain = "palovandalo.com"; diff --git a/terranix/workadventure-jitsi-setup/plops/configs/nixserver-host/jitsi.nix b/terranix/workadventure-jitsi-setup/plops/configs/nixserver-host/jitsi.nix index 76d0738..89849e4 100644 --- a/terranix/workadventure-jitsi-setup/plops/configs/nixserver-host/jitsi.nix +++ b/terranix/workadventure-jitsi-setup/plops/configs/nixserver-host/jitsi.nix @@ -1,5 +1,4 @@ -{config, ...}: -{ +{ config, ... }: { # + + # | | # | | diff --git a/terranix/workadventure-jitsi-setup/plops/configs/nixserver-host/netdata.nix b/terranix/workadventure-jitsi-setup/plops/configs/nixserver-host/netdata.nix index d4ee75b..667b550 100644 --- a/terranix/workadventure-jitsi-setup/plops/configs/nixserver-host/netdata.nix +++ b/terranix/workadventure-jitsi-setup/plops/configs/nixserver-host/netdata.nix @@ -1,5 +1,4 @@ -{config, ... }: -{ +{ config, ... }: { services.netdata = { enable = true; config = { diff --git a/terranix/workadventure-jitsi-setup/plops/configs/nixserver-host/options.nix b/terranix/workadventure-jitsi-setup/plops/configs/nixserver-host/options.nix index 508ba82..c246b82 100644 --- a/terranix/workadventure-jitsi-setup/plops/configs/nixserver-host/options.nix +++ b/terranix/workadventure-jitsi-setup/plops/configs/nixserver-host/options.nix @@ -1,7 +1,6 @@ { config, lib, pkgs, ... }: with lib; -let - cfg = config.workadventure; +let cfg = config.workadventure; in { options.workadventure = {