home/default.nix

@@ -122,8 +122,6 @@ in {
       xdg-utils
       vanilla-dmz
       (discord.override {withVencord = true;})
-      spotify
-      zed-editor-fhs
       bitwarden-desktop
       bitwarden-cli
 

home/emacs.nix

@@ -53,9 +53,6 @@ in {
     # jinx from emacsPackages
     emacsPackages.jinx
 
-    # LSP support
-    emacs-lsp-booster
-
 # language servers
 		pkgs.unstable.rust-analyzer
 		nixd];
@@ -65,10 +62,10 @@ in {
   #     source = emacs-config;
   #   };
   # };
-  # services.emacs = {
+  services.emacs = {
-  #   enable = true;
+    enable = true;
-  #   package = emacs;
+    package = emacs;
-  # };
+  };
   programs.emacs = {
     enable = true;
     package = emacs;

hosts/laptop/default.nix

@@ -6,7 +6,6 @@
   ];
 
   has_battery = true;
-  useThermald = true;
   desktop_scale = 1.3;
 
   boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ];

options.nix

@@ -35,23 +35,5 @@
       default = {};
       description = "Additional config for sway outputs";
     };
-
-    cpufreqConfig = lib.mkOption {
-      type = lib.types.attrsOf lib.types.anything;
-      default = {};
-      description = "Additional config for auto-cpufreq";
-    };
-
-    useThermald = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      description = "Use thermald for thermal management";
-    };
-
-    tlpConfig = lib.mkOption {
-      type = lib.types.attrsOf lib.types.anything;
-      default = {};
-      description = "Additional config for TLP";
-    };
   };
 }

system/default.nix

@@ -1,4 +1,4 @@
-{inputs, lib, pkgs, config, ...}: {
+{inputs, pkgs, config, ...}: {
   imports = [
     ../options.nix
   ];
@@ -151,35 +151,33 @@
       dnsovertls = "true";
     };
 
-    thermald.enable = config.useThermald;
+    # thermald.enable = true;
+    # tlp = {
+    #   enable = true;
+    #   settings = {
+    #     START_CHARGE_THRESH_BAT0 = 50;
+    #     STOP_CHARGE_THRESH_BAT0 = 85;
+    #   };
+    # };
+    # auto-cpufreq = {
+    #   enable = true;
+    #   settings = {
+    #     battery = {
+    #       governor = "powersave"; # Set the CPU governor to powersave.
+    #       energy_performance_preference = "powersave";
+    #       turbo = "never";
 
-    tlp = lib.mkIf (config.has_battery) {
+    #       # enable_thresholds = true;
-      enable = true;
+    #       # start_threshold = 50;
-      settings = {
+    #       # stop_threshold = 90;
-        START_CHARGE_THRESH_BAT0 = 50;
+    #     };
-        STOP_CHARGE_THRESH_BAT0 = 85;
-      };
-    } // config.tlpConfig or {};
 
-    auto-cpufreq = lib.mkIf (config.has_battery) {
+    #     charger = {
-      enable = true;
+    #       governor = "performance"; # Set the CPU governor to performance when charging.
-      settings = {
+    #       turbo = "auto";
-        battery = {
+    #     };
-          governor = "powersave"; # Set the CPU governor to powersave.
+    #   };
-          energy_performance_preference = "powersave";
+    # };
-          turbo = "never";
-
-          # enable_thresholds = true;
-          # start_threshold = 50;
-          # stop_threshold = 90;
-        };
-
-        charger = {
-          governor = "performance"; # Set the CPU governor to performance when charging.
-          turbo = "auto";
-        };
-      };
-    } // config.cpufreqConfig or {};
 
     pipewire = {
       enable = true;