htop and stuff

modules/home-manager/common.nix

@@ -19,6 +19,7 @@
     zellij
     broot
     nnn
+    htop
     cargo
     senpai
     tmux

modules/home-manager/default.nix

@@ -29,6 +29,7 @@
   ewwbar = import ./ewwbar.nix;
   sway-laptop = import ./sway-laptop.nix;
   tmux = import ./tmux.nix;
+  htop = import ./htop.nix;
   senpai = import ./senpai.nix;
 
   dragon = import ./dragon.nix;

modules/home-manager/foxtrot.nix

@@ -4,7 +4,7 @@ in {
   imports = with outputs.homeManagerModules; [
     sway
     sway-laptop
-    hyprland
+    # hyprland
   ];
 
   wayland.windowManager.hyprland = {

modules/home-manager/htop.nix

@@ -0,0 +1,14 @@
+{
+  programs.htop = {
+    enable = true;
+    settings = {
+      hide_kernel_threads = 1;
+      hide_userland_threads = 1;
+      show_program_path = 0;
+      header_margin = 0;
+      show_cpu_frequency = 1;
+      highlight_base_name = 1;
+      tree_view = 0;
+    };
+  };
+}

modules/home-manager/sway.nix

@@ -77,6 +77,7 @@
       enable = true;
     };
 
+    # TODO: stuff is opening on workspace 10 (0?)
     extraConfig = ''
       exec --no-startup-id {
         swaymsg "workspace 1"
@@ -155,7 +156,7 @@
             "before-sleep 'swaylock'"
           ];
         }
-        {command = "firefox";}
+        # {command = "firefox";}
         # {command = "wezterm";}
         {command = "kitty --single-instance";}
       ];

modules/nixos/common.nix

@@ -43,7 +43,6 @@
         gnumake
         gron
         hexyl
-        htop
         iputils
         jq
         killall

modules/nixos/desktop-usage.nix

@@ -7,7 +7,7 @@
 }: {
   imports = [
     ./sway.nix
-    ./hyprland.nix
+    # ./hyprland.nix
     # ./plasma.nix
     # ./gnome.nix
     ./user-installed-applications.nix

nixos/foxtrot/default.nix

@@ -43,7 +43,7 @@
       IdleActionSec=10m
     '';
   };
-  systemd.sleep.extraConfig = "HibernateDelaySec=30m";
+  systemd.sleep.extraConfig = "HibernateDelaySec=90m";
 
   services.fwupd.enable = true;
   services.fwupd.extraRemotes = ["lvfs-testing"];
@@ -59,22 +59,24 @@
   hardware.wirelessRegulatoryDatabase = true;
 
   boot = {
+    kernelPackages = pkgs.linuxPackages_latest; # seeing if using the stable kernel makes wow work
+
     loader = {
       efi.canTouchEfiVariables = true;
       systemd-boot.enable = true;
     };
-    kernelPackages = pkgs.linuxPackages_latest;
+
     # sudo filefrag -v /swap/swapfile | awk '$1=="0:" {print substr($4, 1, length($4)-2)}'
     # the above won't work for btrfs, instead you need
     # btrfs inspect-internal map-swapfile -r /swap/swapfile
     # https://wiki.archlinux.org/title/Power_management/Suspend_and_hibernate#Hibernation_into_swap_file
     # many of these come from https://wiki.archlinux.org/title/Framework_Laptop_13#Suspend
     kernelParams = [
-      # "amdgpu.sg_display=0"
+      "amdgpu.sg_display=0"
       "acpi_osi=\"!Windows 2020\""
       "resume_offset=39331072"
       # "nvme.noacpi=1" # maybe causing crashes upon waking?
-      # "rtc_cmos.use_acpi_alarm=1" # maybe causing excessive battery drain while sleeping -- perhaps due to waking?
+      "rtc_cmos.use_acpi_alarm=1"
     ];
     initrd.availableKernelModules = ["xhci_pci" "nvme" "thunderbolt"];
     kernelModules = ["kvm-amd"];
@@ -82,8 +84,11 @@
       options cfg80211 ieee80211_regdom="US"
     '';
   };
-  hardware.bluetooth.enable = true;
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+  hardware.bluetooth = {
+    enable = true;
+    powerOnBoot = false;
+  };
+  powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
   services.printing.enable = true;
   services.fprintd = {
     enable = false;
@@ -91,13 +96,13 @@
     # tod.driver = pkgs.libfprint-2-tod1-goodix;
   };
   services.power-profiles-daemon = {
-    enable = true;
+    enable = false;
   };
   services.tlp = {
-    enable = false;
+    enable = true;
     settings = {
       CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
-      CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
+      CPU_SCALING_GOVERNOR_ON_BAT = "ondemand";
       CPU_MIN_PERF_ON_BAT = 0;
       CPU_MAX_PERF_ON_BAT = 60;