Merge branch 'main' into desktop

flake.nix

@@ -70,6 +70,7 @@
             "steam"
             "steam-unwrapped"
             "cheatsheet.nvim"
+            "zoom-us" "zoom"
           ];
           mkUnfreePredicate = pkg:
             builtins.elem (inputs.nixpkgs.lib.getName pkg) unfreePkgs;

modules/hardware/battery.nix

@@ -36,8 +36,7 @@
     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 = {
+    /*services.tlp = {
       enable = true; # Enable TLP (better than gnomes internal power manager)
       settings = {
         CPU_BOOST_ON_AC = 1;
@@ -52,9 +51,7 @@
         PLATFORM_PROFILE_ON_BAT = "powersave";
         STOP_CHARGE_THRESH_BAT1 = 80;
       };
-    <<<<<<< HEAD
-        };
-    */
+    };*/
     environment.systemPackages = [
       self.packages.${pkgs.system}.custom-performance
     ];

modules/hosts/laptop.nix

@@ -18,7 +18,7 @@
       audioAndMedia
       autoCleanup-laptop
       autoUpdate-laptop
-      #battery-laptop
+      battery-laptop
       bluetooth
       bootloader
       browsers

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, ...}: {