diff --git a/home/home.nix b/home/home.nix
index 8a6704ecc..42f155362 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -4,6 +4,8 @@ let machine = ./machines/chupacabra.nix; in
 {
   imports = [
     ./modules/alacritty.nix
+    ./modules/alsi.nix
+    ./modules/development.nix
     ./modules/emacs.nix
     ./modules/email.nix
     ./modules/firefox.nix
diff --git a/system/modules/common.nix b/system/modules/common.nix
index 8d2902eaa..d35298175 100644
--- a/system/modules/common.nix
+++ b/system/modules/common.nix
@@ -4,6 +4,7 @@
   imports =
     [
       ./xserver.nix
+      ./fonts.nix
       ./emacs.nix
       ./sound.nix
       ./urbint.nix
@@ -84,11 +85,6 @@
 
   nixpkgs.config.allowUnfree = true;
 
-  fonts.fonts = with pkgs; [
-    nerdfonts
-    noto-fonts-emoji
-  ];
-
   services.geoclue2.enable = true;
 
   powerManagement = {
diff --git a/system/modules/fonts.nix b/system/modules/fonts.nix
new file mode 100644
index 000000000..babe30d42
--- /dev/null
+++ b/system/modules/fonts.nix
@@ -0,0 +1,12 @@
+{ config, lib, pkgs, ... }:
+{
+  fonts = {
+    fonts = with pkgs; [
+      nerdfonts
+      noto-fonts-emoji
+      twitter-color-emoji
+    ];
+
+    fontconfig.defaultFonts.emoji = ["Twitter Color Emoji"];
+  };
+}