From dd42891ab0ae7fbef3b6ed10f065321cef3fdb61 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Wed, 14 Apr 2021 12:36:05 +0200
Subject: refactor(tazjin/emacs): Install google-c-style by default

It is easier to do the inverse of this solution: Filter out the
package on the machines that get it from elsewhere.

Change-Id: I2abe112e4e38822d0fc7a47ea0bcedec1e0a96e3
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3010
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
---
 users/tazjin/emacs/default.nix          |  3 ++-
 users/tazjin/nixos/frog/default.nix     | 10 ++--------
 users/tazjin/nixos/tverskoy/default.nix | 12 +++---------
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/users/tazjin/emacs/default.nix b/users/tazjin/emacs/default.nix
index 609b98ba25..3ffe4cdd52 100644
--- a/users/tazjin/emacs/default.nix
+++ b/users/tazjin/emacs/default.nix
@@ -95,8 +95,9 @@ let
   # Other external packages:
   (with epkgs; [
     exwm
-    vterm
+    google-c-style
     telega
+    vterm
   ]) ++
 
   # Custom packages
diff --git a/users/tazjin/nixos/frog/default.nix b/users/tazjin/nixos/frog/default.nix
index 0b74d3e575..05df8caab5 100644
--- a/users/tazjin/nixos/frog/default.nix
+++ b/users/tazjin/nixos/frog/default.nix
@@ -3,12 +3,6 @@
 config: let
   inherit (depot.third_party) lieer;
 
-  # add google-c-style here because other machines get it from, eh,
-  # elsewhere.
-  frogEmacs = (depot.users.tazjin.emacs.overrideEmacs(epkgs: epkgs ++ [
-    pkgs.emacsPackages.google-c-style
-  ]));
-
   quasselClient = pkgs.quassel.override {
     client = true;
     enableDaemon = false;
@@ -182,7 +176,7 @@ in lib.fix(self: {
 
     windowManager.session = lib.singleton {
       name = "exwm";
-      start = "${frogEmacs}/bin/tazjins-emacs";
+      start = "${depot.users.tazjin.emacs}/bin/tazjins-emacs";
     };
   };
 
@@ -217,7 +211,6 @@ in lib.fix(self: {
   environment.systemPackages =
     # programs from the depot
     (with depot; [
-      frogEmacs
       fun.idual.script
       fun.uggc
       lieer
@@ -225,6 +218,7 @@ in lib.fix(self: {
       quasselClient
       third_party.git
       tools.nsfv-setup
+      users.tazjin.emacs
     ]) ++
 
     # programs from nixpkgs
diff --git a/users/tazjin/nixos/tverskoy/default.nix b/users/tazjin/nixos/tverskoy/default.nix
index c2694bf5eb..48bd615049 100644
--- a/users/tazjin/nixos/tverskoy/default.nix
+++ b/users/tazjin/nixos/tverskoy/default.nix
@@ -1,12 +1,6 @@
 { depot, lib, pkgs, ... }:
 
 config: let
-  # add google-c-style here because other machines get it from, eh,
-  # elsewhere.
-  emacs = (depot.users.tazjin.emacs.overrideEmacs(epkgs: epkgs ++ [
-    pkgs.emacsPackages.google-c-style
-  ]));
-
   nixpkgs = import pkgs.path {
     config.allowUnfree = true;
   };
@@ -185,7 +179,7 @@ in lib.fix(self: {
 
       windowManager.session = lib.singleton {
         name = "exwm";
-        start = "${emacs}/bin/tazjins-emacs";
+        start = "${depot.users.tazjin.emacs}/bin/tazjins-emacs";
       };
     };
   };
@@ -220,10 +214,10 @@ in lib.fix(self: {
   environment.systemPackages =
     # programs from the depot
     (with depot; [
-      emacs
+      screenLock
       third_party.lieer
       tools.nsfv-setup
-      screenLock
+      users.tazjin.emacs
     ]) ++
 
     # programs from nixpkgs
-- 
cgit 1.4.1