about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ci-builds.nix2
-rw-r--r--users/tazjin/emacs/.gitignore (renamed from tools/emacs/.gitignore)0
-rw-r--r--users/tazjin/emacs/README.md (renamed from tools/emacs/README.md)0
-rw-r--r--users/tazjin/emacs/config/bindings.el (renamed from tools/emacs/config/bindings.el)0
-rw-r--r--users/tazjin/emacs/config/custom.el (renamed from tools/emacs/config/custom.el)0
-rw-r--r--users/tazjin/emacs/config/desktop.el (renamed from tools/emacs/config/desktop.el)0
-rw-r--r--users/tazjin/emacs/config/eshell-setup.el (renamed from tools/emacs/config/eshell-setup.el)0
-rw-r--r--users/tazjin/emacs/config/functions.el (renamed from tools/emacs/config/functions.el)0
-rw-r--r--users/tazjin/emacs/config/init.el (renamed from tools/emacs/config/init.el)0
-rw-r--r--users/tazjin/emacs/config/look-and-feel.el (renamed from tools/emacs/config/look-and-feel.el)0
-rw-r--r--users/tazjin/emacs/config/mail-setup.el (renamed from tools/emacs/config/mail-setup.el)0
-rw-r--r--users/tazjin/emacs/config/modes.el (renamed from tools/emacs/config/modes.el)0
-rw-r--r--users/tazjin/emacs/config/settings.el (renamed from tools/emacs/config/settings.el)0
-rw-r--r--users/tazjin/emacs/default.nix (renamed from tools/emacs/default.nix)0
-rw-r--r--users/tazjin/nixos/frog/default.nix2
15 files changed, 2 insertions, 2 deletions
diff --git a/ci-builds.nix b/ci-builds.nix
index 01f014da49..1f4f967656 100644
--- a/ci-builds.nix
+++ b/ci-builds.nix
@@ -24,12 +24,12 @@ with (import ./default.nix {}); [
   third_party.lisp # will build all third-party libraries
   third_party.nix
   tools.cheddar
-  tools.emacs
   web.blog
   web.cgit-taz
   web.tvl
 
   # tazjin's personal things
+  users.tazjin.emacs
   users.tazjin.nixos.camdenSystem
   users.tazjin.nixos.frogSystem
 ]
diff --git a/tools/emacs/.gitignore b/users/tazjin/emacs/.gitignore
index 7b666905f8..7b666905f8 100644
--- a/tools/emacs/.gitignore
+++ b/users/tazjin/emacs/.gitignore
diff --git a/tools/emacs/README.md b/users/tazjin/emacs/README.md
index 5c66733396..5c66733396 100644
--- a/tools/emacs/README.md
+++ b/users/tazjin/emacs/README.md
diff --git a/tools/emacs/config/bindings.el b/users/tazjin/emacs/config/bindings.el
index f66a6ab551..f66a6ab551 100644
--- a/tools/emacs/config/bindings.el
+++ b/users/tazjin/emacs/config/bindings.el
diff --git a/tools/emacs/config/custom.el b/users/tazjin/emacs/config/custom.el
index a157c7a5fa..a157c7a5fa 100644
--- a/tools/emacs/config/custom.el
+++ b/users/tazjin/emacs/config/custom.el
diff --git a/tools/emacs/config/desktop.el b/users/tazjin/emacs/config/desktop.el
index b5915233cd..b5915233cd 100644
--- a/tools/emacs/config/desktop.el
+++ b/users/tazjin/emacs/config/desktop.el
diff --git a/tools/emacs/config/eshell-setup.el b/users/tazjin/emacs/config/eshell-setup.el
index 0b23c5a2d1..0b23c5a2d1 100644
--- a/tools/emacs/config/eshell-setup.el
+++ b/users/tazjin/emacs/config/eshell-setup.el
diff --git a/tools/emacs/config/functions.el b/users/tazjin/emacs/config/functions.el
index 907dbe5e11..907dbe5e11 100644
--- a/tools/emacs/config/functions.el
+++ b/users/tazjin/emacs/config/functions.el
diff --git a/tools/emacs/config/init.el b/users/tazjin/emacs/config/init.el
index b5d570df09..b5d570df09 100644
--- a/tools/emacs/config/init.el
+++ b/users/tazjin/emacs/config/init.el
diff --git a/tools/emacs/config/look-and-feel.el b/users/tazjin/emacs/config/look-and-feel.el
index 5a4d874f6f..5a4d874f6f 100644
--- a/tools/emacs/config/look-and-feel.el
+++ b/users/tazjin/emacs/config/look-and-feel.el
diff --git a/tools/emacs/config/mail-setup.el b/users/tazjin/emacs/config/mail-setup.el
index 1167bcadd3..1167bcadd3 100644
--- a/tools/emacs/config/mail-setup.el
+++ b/users/tazjin/emacs/config/mail-setup.el
diff --git a/tools/emacs/config/modes.el b/users/tazjin/emacs/config/modes.el
index 69fb523d0d..69fb523d0d 100644
--- a/tools/emacs/config/modes.el
+++ b/users/tazjin/emacs/config/modes.el
diff --git a/tools/emacs/config/settings.el b/users/tazjin/emacs/config/settings.el
index b895d5e406..b895d5e406 100644
--- a/tools/emacs/config/settings.el
+++ b/users/tazjin/emacs/config/settings.el
diff --git a/tools/emacs/default.nix b/users/tazjin/emacs/default.nix
index 5d492853cf..5d492853cf 100644
--- a/tools/emacs/default.nix
+++ b/users/tazjin/emacs/default.nix
diff --git a/users/tazjin/nixos/frog/default.nix b/users/tazjin/nixos/frog/default.nix
index 7da724d9cf..3b99f082f5 100644
--- a/users/tazjin/nixos/frog/default.nix
+++ b/users/tazjin/nixos/frog/default.nix
@@ -9,7 +9,7 @@ config: let
 
   # add google-c-style here because other machines get it from, eh,
   # elsewhere.
-  frogEmacs = (depot.tools.emacs.overrideEmacs(epkgs: epkgs ++ [
+  frogEmacs = (depot.users.tazjin.emacs.overrideEmacs(epkgs: epkgs ++ [
     depot.third_party.emacsPackages.google-c-style
   ]));
 in depot.lib.fix(self: {