diff --git a/system/configuration.nix b/system/configuration.nix
index ba88d1c..c59081c 100644
--- a/system/configuration.nix
+++ b/system/configuration.nix
@@ -22,6 +22,7 @@ in {
     ./nix.nix
     ./flatpak.nix
     ./zsh.nix
+    ./docker.nix
 
     nvidia
     ./${systemSettings.displayManager}.nix
diff --git a/system/docker.nix b/system/docker.nix
new file mode 100644
index 0000000..9998f01
--- /dev/null
+++ b/system/docker.nix
@@ -0,0 +1,4 @@
+{userSettings, ...}: {
+  virtualisation.docker.enable = true;
+  users.users.${userSettings.username}.extraGroups = [ "docker" ];
+}
diff --git a/system/fonts.nix b/system/fonts.nix
index be6bf5f..8c7d740 100644
--- a/system/fonts.nix
+++ b/system/fonts.nix
@@ -4,5 +4,9 @@
     nerd-fonts.jetbrains-mono
     corefonts
     vistafonts
+    ubuntu_font_family # why does this have underscores, everything else has hyphens!??!
+    nerd-fonts.ubuntu
+    nerd-fonts.ubuntu-mono
+    nerd-fonts.ubuntu-sans
   ];
 }
diff --git a/user/kitty.nix b/user/kitty.nix
index 7f80b22..2820707 100644
--- a/user/kitty.nix
+++ b/user/kitty.nix
@@ -3,8 +3,8 @@
     enable = true;
     themeFile = "Nord";
     font = {
-      name = "JetBrainsMono Nerd Font";
-      package = pkgs.nerd-fonts.jetbrains-mono;
+      name = "UbuntuSans Nerd Font";
+      package = pkgs.nerd-fonts.ubuntu-sans;
     };
     settings = {
       # TODO: Add on-click events
@@ -15,7 +15,7 @@
       cursor_shape = "block";
       cursor_blink_interval = "cubic-bezier(0.7, 0, 0.84, 0)";
       cursor_trail = 1;
-      background_opacity = 0.8; 
+      background_opacity = 0.8;
     };
     shellIntegration = {
       mode = "no-cursor";
diff --git a/user/waybar.css b/user/waybar.css
index 86f9738..55ebc26 100644
--- a/user/waybar.css
+++ b/user/waybar.css
@@ -1,5 +1,4 @@
 * {
-    font-family: "JetBrainsMono Nerd Font";
-    font-size: 14px;
+  font-family: "Ubuntu Nerd Font";
+  font-size: 14px;
 }
-