about summary refs log tree commit diff
path: root/users
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2023-05-05T19·33+0200
committersterni <sternenseemann@systemli.org>2023-06-15T17·09+0000
commitd2fa4e7c8677e248ac51139bf0be68314384b441 (patch)
tree73d23b14b04e487cfbe1844063e0cb101a8e917c /users
parent8b637521c60219c0773604c452ecb7c98918d202 (diff)
chore(3p/sources): Bump channels & overlays r/6311
* //ops/modules/depot-inbox: Adapt to upstream option type declaration.
  See nixpkgs commit b6ed3b8f402893df91a8e21ce993520301c2f076.

* //ops/machines/sanduny, //users/tazjin/polyanka:
  Remove boot.loader.grub.version options (no longer has any effect).

* //users/sterni/emacs: reflect rename emacsPgtk -> emacs-pgtk

* //3p/overlays: update tdlib to match emacs-overlay

* //3p/overlays: give EXWM from depot a separate name

* //users/grfn/system/home: disable Slack support in ntfy

Change-Id: I03bde088bc70e05b23925f244899807210cb7b20
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8547
Autosubmit: sterni <sternenseemann@systemli.org>
Reviewed-by: sterni <sternenseemann@systemli.org>
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
Diffstat (limited to 'users')
-rw-r--r--users/grfn/system/home/modules/desktop.nix5
-rw-r--r--users/sterni/emacs/default.nix2
-rw-r--r--users/tazjin/nixos/polyanka/default.nix1
3 files changed, 5 insertions, 3 deletions
diff --git a/users/grfn/system/home/modules/desktop.nix b/users/grfn/system/home/modules/desktop.nix
index 08277e9c594c..fed3cb47a48f 100644
--- a/users/grfn/system/home/modules/desktop.nix
+++ b/users/grfn/system/home/modules/desktop.nix
@@ -10,7 +10,10 @@
   ];
 
   home.packages = with pkgs; [
-    ntfy
+    (ntfy.override {
+      # Slack support is broken as of 2023-06-15
+      withSlack = false;
+    })
   ];
 
   services.syncthing.tray.enable = true;
diff --git a/users/sterni/emacs/default.nix b/users/sterni/emacs/default.nix
index cd682fa2eec3..a66f9ca1529c 100644
--- a/users/sterni/emacs/default.nix
+++ b/users/sterni/emacs/default.nix
@@ -15,7 +15,7 @@ let
   '';
 
   # emacsPgtk is defined in emacs-overlay
-  emacs = (pkgs.emacsPackagesFor pkgs.emacsPgtk).withPackages (epkgs: [
+  emacs = (pkgs.emacsPackagesFor pkgs.emacs-pgtk).withPackages (epkgs: [
     epkgs.bqn-mode
     #epkgs.elpaPackages.ada-mode
     epkgs.elpaPackages.rainbow-mode
diff --git a/users/tazjin/nixos/polyanka/default.nix b/users/tazjin/nixos/polyanka/default.nix
index c7f41b95aa0c..807e20e1bb30 100644
--- a/users/tazjin/nixos/polyanka/default.nix
+++ b/users/tazjin/nixos/polyanka/default.nix
@@ -19,7 +19,6 @@ in
 
   # Use the GRUB 2 boot loader.
   boot.loader.grub.enable = true;
-  boot.loader.grub.version = 2;
   boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only
   boot.initrd.availableKernelModules = [ "ata_piix" "vmw_pvscsi" "sd_mod" "sr_mod" ];