diff --git a/flake.nix b/flake.nix index 96e28ad..c5f4cb0 100644 --- a/flake.nix +++ b/flake.nix @@ -70,6 +70,7 @@ "steam" "steam-unwrapped" "cheatsheet.nvim" + "zoom-us" "zoom" ]; mkUnfreePredicate = pkg: builtins.elem (inputs.nixpkgs.lib.getName pkg) unfreePkgs; diff --git a/modules/hardware/battery.nix b/modules/hardware/battery.nix index b40bdce..096d37d 100644 --- a/modules/hardware/battery.nix +++ b/modules/hardware/battery.nix @@ -36,25 +36,22 @@ services.system76-scheduler.settings.cfsProfiles.enable = true; # Better scheduling for CPU cycles - thanks System76!!! services.thermald.enable = false; # Enable thermald, the temperature management daemon. (only necessary if on Intel CPUs) services.power-profiles-daemon.enable = true; # ppd is recommended over tlp for framework 16 - /* - services.tlp = { - enable = true; # Enable TLP (better than gnomes internal power manager) - settings = { - CPU_BOOST_ON_AC = 1; - CPU_BOOST_ON_BAT = 1; - CPU_HWP_DYN_BOOST_ON_AC = 1; - CPU_HWP_DYN_BOOST_ON_BAT = 1; - CPU_SCALING_GOVERNOR_ON_AC = "balanced"; - CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; - CPU_ENERGY_PERF_POLICY_ON_AC = "balanced"; - CPU_ENERGY_PERF_POLICY_ON_BAT = "powersave"; - PLATFORM_PROFILE_ON_AC = "balanced"; - PLATFORM_PROFILE_ON_BAT = "powersave"; - STOP_CHARGE_THRESH_BAT1 = 80; - }; - <<<<<<< HEAD - }; - */ + /*services.tlp = { + enable = true; # Enable TLP (better than gnomes internal power manager) + settings = { + CPU_BOOST_ON_AC = 1; + CPU_BOOST_ON_BAT = 1; + CPU_HWP_DYN_BOOST_ON_AC = 1; + CPU_HWP_DYN_BOOST_ON_BAT = 1; + CPU_SCALING_GOVERNOR_ON_AC = "balanced"; + CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; + CPU_ENERGY_PERF_POLICY_ON_AC = "balanced"; + CPU_ENERGY_PERF_POLICY_ON_BAT = "powersave"; + PLATFORM_PROFILE_ON_AC = "balanced"; + PLATFORM_PROFILE_ON_BAT = "powersave"; + STOP_CHARGE_THRESH_BAT1 = 80; + }; + };*/ environment.systemPackages = [ self.packages.${pkgs.system}.custom-performance ]; diff --git a/modules/hosts/laptop.nix b/modules/hosts/laptop.nix index 7ea7ced..76ed58d 100644 --- a/modules/hosts/laptop.nix +++ b/modules/hosts/laptop.nix @@ -18,7 +18,7 @@ audioAndMedia autoCleanup-laptop autoUpdate-laptop - #battery-laptop + battery-laptop bluetooth bootloader browsers diff --git a/modules/utilities/communicationAndNotification.nix b/modules/utilities/communicationAndNotification.nix index a9b845e..21506e4 100644 --- a/modules/utilities/communicationAndNotification.nix +++ b/modules/utilities/communicationAndNotification.nix @@ -11,6 +11,7 @@ self.packages.${pkgs.system}.custom-checkMatrix self.packages.${pkgs.system}.custom-gitnotify # checks if git is set up self.packages.${pkgs.system}.custom-checkKdrive # check if kdrive is set up with rclone + zoom-us ]; }; perSystem = {pkgs, ...}: {