diff --git a/config/hosts/beltane/nixos.nix b/config/hosts/beltane/nixos.nix
index 6618c78b..605f4ead 100644
--- a/config/hosts/beltane/nixos.nix
+++ b/config/hosts/beltane/nixos.nix
@@ -94,9 +94,7 @@ with lib;
   };
 
   network = {
-    extraCerts = {
-      "private_root" = "altar.kittywit.ch";
-    };
+    dns.dynamic = true;
     addresses = {
       private = {
         ipv4.address = "192.168.1.2";
diff --git a/config/hosts/samhain/nixos.nix b/config/hosts/samhain/nixos.nix
index 31265460..cf492b78 100644
--- a/config/hosts/samhain/nixos.nix
+++ b/config/hosts/samhain/nixos.nix
@@ -132,7 +132,6 @@ in
         ipv4.address = "192.168.1.1";
       };
     };
-    dns.dynamic = true;
     yggdrasil = {
       enable = true;
       pubkey = "a7110d0a1dc9ec963d6eb37bb6922838b8088b53932eae727a9136482ce45d47";
diff --git a/config/profiles/base/nix.nix b/config/profiles/base/nix.nix
index 6d522bb7..44a0758c 100644
--- a/config/profiles/base/nix.nix
+++ b/config/profiles/base/nix.nix
@@ -20,9 +20,9 @@
     sandboxPaths = [
       "/var/run/nscd/socket"
     ];
-    binaryCaches = [ "https://arc.cachix.org" "https://kittywitch.cachix.org" ];
+    binaryCaches = [ "https://arc.cachix.org" "https://kittywitch.cachix.org" "https://nix-community.cachix.org" ];
     binaryCachePublicKeys =
-      [ "arc.cachix.org-1:DZmhclLkB6UO0rc0rBzNpwFbbaeLfyn+fYccuAy7YVY=" "kittywitch.cachix.org-1:KIzX/G5cuPw5WgrXad6UnrRZ8UDr7jhXzRTK/lmqyK0=" ];
+      [ "arc.cachix.org-1:DZmhclLkB6UO0rc0rBzNpwFbbaeLfyn+fYccuAy7YVY=" "kittywitch.cachix.org-1:KIzX/G5cuPw5WgrXad6UnrRZ8UDr7jhXzRTK/lmqyK0=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" ];
     autoOptimiseStore = true;
     gc.automatic = lib.mkDefault true;
     gc.options = lib.mkDefault "--delete-older-than 1w";
diff --git a/config/profiles/gui/fonts.nix b/config/profiles/gui/fonts.nix
index bc45b3b3..1cf68be9 100644
--- a/config/profiles/gui/fonts.nix
+++ b/config/profiles/gui/fonts.nix
@@ -16,6 +16,7 @@
   };
 
   fonts.fonts = with pkgs; [
+    emacs-all-the-icons-fonts
     cozette
     twitter-color-emoji
   ];
diff --git a/config/users/kat/dev/default.nix b/config/users/kat/dev/default.nix
index 708b355c..326b1ebd 100644
--- a/config/users/kat/dev/default.nix
+++ b/config/users/kat/dev/default.nix
@@ -1,5 +1,9 @@
 { config, lib, pkgs, ... }:
 
 {
-  imports = [ ./packages.nix ./cookiecutter.nix ];
+  imports = [
+    ./packages.nix
+    ./cookiecutter.nix
+    ./emacs.nix
+  ];
 }
diff --git a/config/users/kat/dev/doom.d/config.el b/config/users/kat/dev/doom.d/config.el
new file mode 100644
index 00000000..0c38c20e
--- /dev/null
+++ b/config/users/kat/dev/doom.d/config.el
@@ -0,0 +1,58 @@
+;;; $DOOMDIR/config.el -*- lexical-binding: t; -*-
+
+;; Place your private configuration here! Remember, you do not need to run 'doom
+;; sync' after modifying this file!
+
+
+;; Some functionality uses this to identify you, e.g. GPG configuration, email
+;; clients, file templates and snippets.
+(setq user-full-name "kat"
+      user-mail-address "kat@kittywit.ch")
+
+
+;; Doom exposes five (optional) variables for controlling fonts in Doom. Here
+;; are the three important ones:
+;;
+;; + `doom-font'
+;; + `doom-variable-pitch-font'
+;; + `doom-big-font' -- used for `doom-big-font-mode'; use this for
+;;   presentations or streaming.
+;;
+;; They all accept either a font-spec, font string ("Input Mono-12"), or xlfd
+;; font string. You generally only need these two:
+(setq doom-font (font-spec :family "Cozette" :size 13))
+;;       doom-variable-pitch-font (font-spec :family "sans" :size 13))
+
+;; There are two ways to load a theme. Both assume the theme is installed and
+;; available. You can either set `doom-theme' or manually load a theme with the
+;; `load-theme' function. This is the default:
+;;(setq doom-theme '${lib.elemAt (lib.splitString "." base16.alias.default) 1})
+
+;; If you use `org' and don't want your org files in the default location below,
+;; change `org-directory'. It must be set before org loads!
+(setq org-directory "~/.org/")
+
+;; This determines the style of line numbers in effect. If set to `nil', line
+;; numbers are disabled. For relative line numbers, set this to `relative'.
+(setq display-line-numbers-type t)
+
+(use-package! protobuf-mode
+  :mode "\\.proto\\'")
+
+
+;; Here are some additional functions/macros that could help you configure Doom:
+;;
+;; - `load!' for loading external *.el files relative to this one
+;; - `use-package!' for configuring packages
+;; - `after!' for running code after a package has loaded
+;; - `add-load-path!' for adding directories to the `load-path', relative to
+;;   this file. Emacs searches the `load-path' when you load packages with
+;;   `require' or `use-package'.
+;; - `map!' for binding new keys
+;;
+;; To get information about any of these functions/macros, move the cursor over
+;; the highlighted symbol at press 'K' (non-evil users must press 'C-c c k').
+;; This will open documentation for it, including demos of how they are used.
+;;
+;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how
+;; they are implemented.
diff --git a/config/users/kat/dev/doom.d/init.el b/config/users/kat/dev/doom.d/init.el
new file mode 100644
index 00000000..c2936a80
--- /dev/null
+++ b/config/users/kat/dev/doom.d/init.el
@@ -0,0 +1,186 @@
+;;; init.el -*- lexical-binding: t; -*-
+
+;; This file controls what Doom modules are enabled and what order they load
+;; in. Remember to run 'doom sync' after modifying it!
+
+;; NOTE Press 'SPC h d h' (or 'C-h d h' for non-vim users) to access Doom's
+;;      documentation. There you'll find a "Module Index" link where you'll find
+;;      a comprehensive list of Doom's modules and what flags they support.
+
+;; NOTE Move your cursor over a module's name (or its flags) and press 'K' (or
+;;      'C-c c k' for non-vim users) to view its documentation. This works on
+;;      flags as well (those symbols that start with a plus).
+;;
+;;      Alternatively, press 'gd' (or 'C-c c d') on a module to browse its
+;;      directory (for easy access to its source code).
+
+
+(doom! :input
+       ;;chinese
+       ;;japanese
+
+       :completion
+       company           ; the ultimate code completion backend
+       ;;helm              ; the *other* search engine for love and life
+       ;;ido               ; the other *other* search engine...
+       ivy               ; a search engine for love and life
+
+       :ui
+       ;;deft              ; notational velocity for Emacs
+       doom              ; what makes DOOM look the way it does
+       doom-dashboard    ; a nifty splash screen for Emacs
+       doom-quit         ; DOOM quit-message prompts when you quit Emacs
+       ;;fill-column       ; a `fill-column' indicator
+       hl-todo           ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
+       ;;hydra
+       indent-guides     ; highlighted indent columns
+       ;;(ligatures +iosevka)
+       minimap           ; show a map of the code on the side
+       modeline          ; snazzy, Atom-inspired modeline, plus API
+       ;;nav-flash         ; blink cursor line after big motions
+       ;;neotree           ; a project drawer, like NERDTree for vim
+       ophints           ; highlight the region an operation acts on
+       (popup +defaults)   ; tame sudden yet inevitable temporary windows
+       ;;pretty-code       ; ligatures or substitute text with pretty symbols
+       ;;tabs              ; a tab bar for Emacs
+       treemacs          ; a project drawer, like neotree but cooler
+       ;;unicode           ; extended unicode support for various languages
+       vc-gutter         ; vcs diff in the fringe
+       vi-tilde-fringe   ; fringe tildes to mark beyond EOB
+       ;;window-select     ; visually switch windows
+       workspaces        ; tab emulation, persistence & separate workspaces
+       ;;zen               ; distraction-free coding or writing
+
+       :editor
+       (evil +everywhere); come to the dark side, we have cookies
+       file-templates    ; auto-snippets for empty files
+       fold              ; (nigh) universal code folding
+       ;;(format +onsave)  ; automated prettiness
+       ;;god               ; run Emacs commands without modifier keys
+       ;;lispy             ; vim for lisp, for people who don't like vim
+       ;;multiple-cursors  ; editing in many places at once
+       ;;objed             ; text object editing for the innocent
+       ;;parinfer          ; turn lisp into python, sort of
+       ;;rotate-text       ; cycle region at point between text candidates
+       snippets          ; my elves. They type so I don't have to
+       ;;word-wrap         ; soft wrapping with language-aware indent
+
+       :emacs
+       dired             ; making dired pretty [functional]
+       electric          ; smarter, keyword-based electric-indent
+       ;;ibuffer         ; interactive buffer management
+       (undo +tree)              ; persistent, smarter undo for your inevitable mistakes
+       vc                ; version-control and Emacs, sitting in a tree
+
+       :term
+       ;;eshell            ; the elisp shell that works everywhere
+       ;;shell             ; simple shell REPL for Emacs
+       ;;term              ; basic terminal emulator for Emacs
+       vterm             ; the best terminal emulation in Emacs
+
+       :checkers
+       syntax              ; tasing you for every semicolon you forget
+       ;;spell             ; tasing you for misspelling mispelling
+       ;;grammar           ; tasing grammar mistake every you make
+
+       :tools
+       ;;ansible
+       ;;debugger          ; FIXME stepping through code, to help you add bugs
+       ;;direnv
+       docker
+       ;;editorconfig      ; let someone else argue about tabs vs spaces
+       ;;ein               ; tame Jupyter notebooks with emacs
+       (eval +overlay)     ; run code, run (also, repls)
+       ;;gist              ; interacting with github gists
+       lookup              ; navigate your code and its documentation
+       (lsp +peek)
+       ;;macos             ; MacOS-specific commands
+       magit             ; a git porcelain for Emacs
+       ;;make              ; run make tasks from Emacs
+       pass              ; password manager for nerds
+       pdf               ; pdf enhancements
+       ;;prodigy           ; FIXME managing external services & code builders
+       ;;rgb               ; creating color strings
+       ;;taskrunner        ; taskrunner for all your projects
+       ;;terraform         ; infrastructure as code
+       ;;tmux              ; an API for interacting with tmux
+       ;;upload            ; map local to remote projects via ssh/ftp
+
+       :lang
+       ;;agda              ; types of types of types of types...
+       ;;cc                ; C/C++/Obj-C madness
+       ;;clojure           ; java with a lisp
+       ;;common-lisp       ; if you've seen one lisp, you've seen them all
+       ;;coq               ; proofs-as-programs
+       crystal           ; ruby at the speed of c
+       ;;csharp            ; unity, .NET, and mono shenanigans
+       data              ; config/data formats
+       ;;(dart +flutter)   ; paint ui and not much else
+       (elixir +lsp)            ; erlang done right
+       ;;elm               ; care for a cup of TEA?
+       emacs-lisp        ; drown in parentheses
+       erlang            ; an elegant language for a more civilized age
+       ;;ess               ; emacs speaks statistics
+       ;;faust             ; dsp, but you get to keep your soul
+       ;;fsharp            ; ML stands for Microsoft's Language
+       ;;fstar             ; (dependent) types and (monadic) effects and Z3
+       ;;gdscript          ; the language you waited for
+       ;;(go +lsp)         ; the hipster dialect
+       ;;(haskell +dante)  ; a language that's lazier than I am
+       ;;hy                ; readability of scheme w/ speed of python
+       ;;idris             ;
+       json              ; At least it ain't XML
+       ;;(java +meghanada) ; the poster child for carpal tunnel syndrome
+       javascript        ; all(hope(abandon(ye(who(enter(here))))))
+       ;;julia             ; a better, faster MATLAB
+       ;;kotlin            ; a better, slicker Java(Script)
+       ;;latex             ; writing papers in Emacs has never been so fun
+       ;;lean
+       ;;factor
+       ;;ledger            ; an accounting system in Emacs
+       ;;lua               ; one-based indices? one-based indices
+       markdown          ; writing docs for people to ignore
+       ;;nim               ; python + lisp at the speed of c
+       nix               ; I hereby declare "nix geht mehr!"
+       ;;ocaml             ; an objective camel
+       (org
+        +present
+        +pretty)               ; organize your plain life in plain text
+       ;;php               ; perl's insecure younger brother
+       ;;plantuml          ; diagrams for confusing people more
+       ;;purescript        ; javascript, but functional
+       python            ; beautiful is better than ugly
+       ;;qt                ; the 'cutest' gui framework ever
+       ;;racket            ; a DSL for DSLs
+       ;;raku              ; the artist formerly known as perl6
+       ;;rest              ; Emacs as a REST client
+       ;;rst               ; ReST in peace
+       ;;(ruby +rails)     ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
+       (rust +lsp)              ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
+       ;;scala             ; java, but good
+       ;;scheme            ; a fully conniving family of lisps
+       sh                ; she sells {ba,z,fi}sh shells on the C xor
+       ;;sml
+       ;;solidity          ; do you need a blockchain? No.
+       ;;swift             ; who asked for emoji variables?
+       ;;terra             ; Earth and Moon in alignment for performance.
+       ;;web               ; the tubes
+       yaml              ; JSON, but readable
+
+       :email
+       ;;(mu4e +gmail)
+       notmuch
+       ;;(wanderlust +gmail)
+
+       :app
+       ;;calendar
+       ;;irc               ; how neckbeards socialize
+       ;;(rss +org)        ; emacs as an RSS reader
+       ;;twitter           ; twitter client https://twitter.com/vnought
+
+       :os
+       (tty +osc)
+
+       :config
+       ;;literate
+       (default +bindings +smartparens))
diff --git a/config/users/kat/dev/doom.d/packages.el b/config/users/kat/dev/doom.d/packages.el
new file mode 100644
index 00000000..ee573a50
--- /dev/null
+++ b/config/users/kat/dev/doom.d/packages.el
@@ -0,0 +1,53 @@
+;; -*- no-byte-compile: t; -*-
+;;; $DOOMDIR/packages.el
+
+;; To install a package with Doom you must declare them here and run 'doom sync'
+;; on the command line, then restart Emacs for the changes to take effect -- or
+;; use 'M-x doom/reload'.
+
+
+;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror:
+;(package! some-package)
+
+;; To install a package directly from a remote git repo, you must specify a
+;; `:recipe'. You'll find documentation on what `:recipe' accepts here:
+;; https://github.com/raxod502/straight.el#the-recipe-format
+;(package! another-package
+;  :recipe (:host github :repo "username/repo"))
+
+;; If the package you are trying to install does not contain a PACKAGENAME.el
+;; file, or is located in a subdirectory of the repo, you'll need to specify
+;; `:files' in the `:recipe':
+;(package! this-package
+;  :recipe (:host github :repo "username/repo"
+;           :files ("some-file.el" "src/lisp/*.el")))
+
+;; If you'd like to disable a package included with Doom, you can do so here
+;; with the `:disable' property:
+;(package! builtin-package :disable t)
+
+;; You can override the recipe of a built in package without having to specify
+;; all the properties for `:recipe'. These will inherit the rest of its recipe
+;; from Doom or MELPA/ELPA/Emacsmirror:
+;(package! builtin-package :recipe (:nonrecursive t))
+;(package! builtin-package-2 :recipe (:repo "myfork/package"))
+
+;; Specify a `:branch' to install a package from a particular branch or tag.
+;; This is required for some packages whose default branch isn't 'master' (which
+;; our package manager can't deal with; see raxod502/straight.el#279)
+;(package! builtin-package :recipe (:branch "develop"))
+
+;; Use `:pin' to specify a particular commit to install.
+;(package! builtin-package :pin "1a2b3c4d5e")
+
+
+;; Doom's packages are pinned to a specific commit and updated from release to
+;; release. The `unpin!' macro allows you to unpin single packages...
+;(unpin! pinned-package)
+;; ...or multiple packages
+;(unpin! pinned-package another-pinned-package)
+;; ...Or *all* packages (NOT RECOMMENDED; will likely break things)
+;(unpin! t)
+(package! base16-theme)
+(package! evil-easymotion)
+(package! protobuf-mode :recipe (:host github :repo "emacsmirror/protobuf-mode" :files (:defaults "*")))
diff --git a/config/users/kat/dev/emacs.nix b/config/users/kat/dev/emacs.nix
new file mode 100644
index 00000000..7522f420
--- /dev/null
+++ b/config/users/kat/dev/emacs.nix
@@ -0,0 +1,37 @@
+{ config, lib, pkgs, sources, ... }:
+
+let
+  emacs = pkgs.callPackage sources.nix-doom-emacs {
+    doomPrivateDir = "${./doom.d}";
+    emacsPackages = pkgs.emacsPackagesFor pkgs.emacsPgtkGcc;
+    bundledPackages = false;
+    emacsPackagesOverlay = self: super: {
+      magit-delta = super.magit-delta.overrideAttrs (esuper: {
+        buildInputs = esuper.buildInputs ++ [ pkgs.git ];
+      });
+    };
+  };
+in {
+  home.packages = [ emacs pkgs.sqlite ];
+
+  home.file.".emacs.d/init.el".text = ''
+    (load "default.el")
+    (load-theme 'base16-${lib.elemAt (lib.splitString "." config.base16.alias.default) 1} t)
+  '';
+}
+
+/*{
+programs.doom-emacs = {
+enable = true;
+doomPrivateDir = ./doom.d;
+extraConfig = ''
+(load-theme 'base16-${lib.elemAt (lib.splitString "." config.base16.alias.default) 1} t)
+'';
+emacsPackage = pkgs.emacsPgtkGcc;
+emacsPackagesOverlay = self: super: {
+magit-delta = super.magit-delta.overrideAttrs (esuper: {
+buildInputs = esuper.buildInputs ++ [ pkgs.git ];
+});
+};
+};
+}*/
diff --git a/config/users/kat/sway/sway.nix b/config/users/kat/sway/sway.nix
index be6800cd..4af733ba 100644
--- a/config/users/kat/sway/sway.nix
+++ b/config/users/kat/sway/sway.nix
@@ -4,7 +4,7 @@ let
   footwrap = pkgs.writeShellScriptBin "footwrap" ''
     exec foot "$2"
   '';
-  lockCommand = "${pkgs.swaylock-fancy}/bin/swaylock-fancy -d -t ''";
+  lockCommand = ''${pkgs.swaylock-fancy}/bin/swaylock-fancy -d -t ""'';
 in
 {
   home.sessionVariables = {
@@ -28,7 +28,7 @@ in
       Type = "simple";
       ExecStart = ''
         ${pkgs.swayidle}/bin/swayidle -w \
-        timeout 300 '${lockCommand} \
+        timeout 300 '${lockCommand}' \
         timeout 600 'swaymsg "output * dpms off"' \
           resume 'swaymsg "output * dpms on"' \
         before-sleep '${lockCommand}'
diff --git a/overlay.nix b/overlay.nix
index 6ea9076a..0fefcef1 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -14,6 +14,7 @@ let
     overlays = [
       (import (sources.arcexprs + "/overlay.nix"))
       (import (sources.katexprs + "/overlay.nix"))
+      (import sources.emacs-overlay)
       overlay
     ];
     config = {