2023-09-30

6 files changed, 6 insertions, 17 deletions

diff --git a/modules/common/common/nix/default.nix b/modules/common/common/nix/default.nix
index dc99434..bbb06d0 100644
--- a/modules/common/common/nix/default.nix
+++ b/modules/common/common/nix/default.nix
@@ -115,8 +115,8 @@ with lib; {
           patches = final.patches ++ [./patches/alejandra-no-ads.patch];
         });
 
-        tdesktop = super.tdesktop.overrideAttrs (_: final: {
-          patches = final.patches ++ [./patches/tdesktop-no-ads.patch];
+        telegram-desktop = super.telegram-desktop.overrideAttrs (_: final: {
+          patches = final.patches ++ [./patches/telegram-desktop-no-ads.patch];
         });
 
         inherit (pkgsPr 245433 "sha256-FF1WW0+/pJ15+mPVjv0bkrh0dpHfQU08HNat2gu1PQk=") openmw;
diff --git a/modules/common/common/nix/patches/tdesktop-no-ads.patch b/modules/common/common/nix/patches/telegram-desktop-no-ads.patch
index d066066..d066066 100644
--- a/modules/common/common/nix/patches/tdesktop-no-ads.patch
+++ b/modules/common/common/nix/patches/telegram-desktop-no-ads.patch
diff --git a/modules/common/emacs/default.nix b/modules/common/emacs/default.nix
index 1d205b9..a21b5ab 100644
--- a/modules/common/emacs/default.nix
+++ b/modules/common/emacs/default.nix
@@ -149,7 +149,7 @@ in {
 
                 (appendq! auth-sources '("${config.secrets.authinfo.path}"))
 
-                ;; Font must be set to N+2 because otherwise it looks too small.
+                ;; The font must be set to n+2, otherwise it looks too small.
                 (setq doom-font (font-spec
                                   :family "${config.fontScheme.monospaceFont.family}"
                                   :size ${toString (config.fontScheme.monospaceFont.size + 2)})
diff --git a/modules/nixos/emacs.nix b/modules/nixos/emacs.nix
index 82c2f6e..5e263c9 100644
--- a/modules/nixos/emacs.nix
+++ b/modules/nixos/emacs.nix
@@ -12,6 +12,7 @@ in {
     hm.services.emacs = {
       enable = true;
       client.enable = true;
+      socketActivation.enable = true;
     };
   };
 }
diff --git a/modules/nixos/profiles/headful.nix b/modules/nixos/profiles/headful.nix
index f8df169..6658582 100644
--- a/modules/nixos/profiles/headful.nix
+++ b/modules/nixos/profiles/headful.nix
@@ -26,7 +26,7 @@ in {
         element-desktop
         imv
         mumble
-        tdesktop
+        telegram-desktop
         tor-browser-bundle-bin
       ];
 
diff --git a/modules/nixos/throttled.nix b/modules/nixos/throttled.nix
index f182ee1..a84fd27 100644
--- a/modules/nixos/throttled.nix
+++ b/modules/nixos/throttled.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }:
 with lib; let
@@ -10,8 +9,7 @@ in {
   options.nixfiles.modules.throttled.enable = mkEnableOption "Throttled";
 
   config = mkIf cfg.enable {
-    # Disable the module we are trying to "override".
-    services.throttled.enable = mkForce false;
+    services.throttled.enable = true;
 
     environment.etc."throttled.conf".text = ''
       [GENERAL]
@@ -105,15 +103,5 @@ in {
       # # CPU cache max current (A)
       # CACHE:
     '';
-
-    systemd.services.throttled = {
-      description = "Stop Intel throttling";
-      serviceConfig = {
-        Type = "simple";
-        ExecStart = "${pkgs.throttled}/opt/throttled/throttled.py";
-      };
-      environment.PYTHONUNBUFFERED = "1";
-      wantedBy = ["multi-user.target"];
-    };
   };
 }