diff --git a/flake.nix b/flake.nix
index 9203980..d8da3a9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -116,6 +116,10 @@
         hostname = "dingbox";
         headless = false;
       };
+      elderbug = hostSystem {
+        hostname = "elderbug";
+        headless = false;
+      };
       miniding = hostSystem {
         hostname = "miniding";
         headless = false;
diff --git a/hosts/elderbug/configuration.nix b/hosts/elderbug/configuration.nix
new file mode 100644
index 0000000..d888485
--- /dev/null
+++ b/hosts/elderbug/configuration.nix
@@ -0,0 +1,47 @@
+# Edit this configuration file to define what should be installed on
+# your system.  Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+{
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
+    # Include the results of the hardware scan.
+    ./hardware-configuration.nix
+    ../common
+    ../common/graphical
+
+    (import ../../modules).elderbug
+  ];
+
+  services.xserver = {
+    dpi = 144;
+    videoDrivers = ["nvidia"];
+    screenSection = ''
+      Option	"metamodes" "nvidia-auto-select +0+0 {ForceCompositionPipeline=On}"
+      Option	"AllowIndirectGLXProtocol" "off"
+      Option	"TripleBuffer" "on"
+    '';
+  };
+
+  environment.sessionVariables.NIXOS_OZONE_WL = "1";
+
+  security.pam.u2f = {
+    enable = true;
+  };
+
+  hardware.nvidia.modesetting.enable = true;
+
+  networking.hostName = "elderbug"; # Define your hostname.
+  networking.interfaces.enp5s0.useDHCP = true;
+  networking.interfaces.wlp6s0.useDHCP = true;
+
+  # This value determines the NixOS release from which the default
+  # settings for stateful data, like file locations and database versions
+  # on your system were taken. It‘s perfectly fine and recommended to leave
+  # this value at the release version of the first install of this system.
+  # Before changing this value read the documentation for this option
+  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+  system.stateVersion = "23.05"; # Did you read the comment?
+}
diff --git a/hosts/elderbug/hardware-configuration.nix b/hosts/elderbug/hardware-configuration.nix
new file mode 100644
index 0000000..f03fed2
--- /dev/null
+++ b/hosts/elderbug/hardware-configuration.nix
@@ -0,0 +1,38 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/1abab84b-47d7-45bb-b31d-e5668f545d7f";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/1F77-6B2D";
+      fsType = "vfat";
+    };
+
+  swapDevices = [ ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  # networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp6s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp7s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/modules/default.nix b/modules/default.nix
index ef33fdf..34ab565 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -19,6 +19,8 @@
     ];
   };
 
+  elderbug = {};
+
   pingbox = {
     imports = [
       ./postgres
diff --git a/result b/result
new file mode 120000
index 0000000..54a00c7
--- /dev/null
+++ b/result
@@ -0,0 +1 @@
+/nix/store/7rw36p4bin35jdxipswgzw4dafvjmfxv-nixos-system-elderbug-23.05.20230522.7084250
\ No newline at end of file
diff --git a/users/configs/desktop/default.nix b/users/configs/desktop/default.nix
index 51346f4..cef3114 100644
--- a/users/configs/desktop/default.nix
+++ b/users/configs/desktop/default.nix
@@ -5,5 +5,6 @@
     # ./polybar
     ./hyprland
     ./waybar
+    ./tofi
   ];
 }
diff --git a/users/configs/desktop/hyprland/default.nix b/users/configs/desktop/hyprland/default.nix
index 0d80ab2..57ed636 100644
--- a/users/configs/desktop/hyprland/default.nix
+++ b/users/configs/desktop/hyprland/default.nix
@@ -144,7 +144,7 @@ in {
         bind = $mainMod, return, exec, kitty
         # bind = $mainMod, Q, killactive,
         bind = $mainMod, Q, exec, ${closer}/bin/closer
-        bind = $mainMod, D, exec, wofi --show drun
+        bind = $mainMod, D, exec, tofi-drun --drun-launch=true
         bind = $mainMod SHIFT, S, exec, grim -g $(slurp)
 
         # Move focus with mainMod + vim keys
diff --git a/users/configs/desktop/hyprland/elderbug.conf b/users/configs/desktop/hyprland/elderbug.conf
new file mode 100644
index 0000000..1e26a0a
--- /dev/null
+++ b/users/configs/desktop/hyprland/elderbug.conf
@@ -0,0 +1,7 @@
+monitor=,preferred,auto,1.25
+
+$mainMod = CTRL + SHIFT + ALT
+
+bind = $mainMod + SUPER, Q, exit,
+bind = $mainMod, M, workspace, -1
+bind = $mainMod, comma, workspace, +1
diff --git a/users/configs/desktop/tofi/default.nix b/users/configs/desktop/tofi/default.nix
new file mode 100644
index 0000000..fd312f6
--- /dev/null
+++ b/users/configs/desktop/tofi/default.nix
@@ -0,0 +1,25 @@
+{pkgs, ...}:
+{
+  home.packages = with pkgs; [
+    tofi
+  ];
+
+  home.file.".config/tofi/config".text = ''
+    font = ${pkgs.iosevka}/share/fonts/truetype/iosevka-regular.ttf
+    font-size = 16
+    hint-font = false
+
+    text-color = #cad3f5
+    background-color = #24273a
+
+    selection-color = #24273a
+    selection-background = #a6da95
+
+    outline-width = 0
+    border-width = 3
+    border-color = #a6da95
+
+    corner-radius = 15
+
+  '';
+}
diff --git a/users/daniel/default.nix b/users/daniel/default.nix
index 22216e2..c2429eb 100644
--- a/users/daniel/default.nix
+++ b/users/daniel/default.nix
@@ -70,7 +70,6 @@
     swaylock
     udiskie
     wl-clipboard
-    wofi
     xclip
     zathura
   ];
diff --git a/users/daniel/host-specific/elderbug/default.nix b/users/daniel/host-specific/elderbug/default.nix
new file mode 100644
index 0000000..cf25723
--- /dev/null
+++ b/users/daniel/host-specific/elderbug/default.nix
@@ -0,0 +1,14 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
+  home.file = {
+    "wallpapers" = {
+      source = ./wallpapers;
+    };
+  };
+
+  programs.kitty.font.size = 14;
+}
diff --git a/users/daniel/host-specific/elderbug/wallpapers/lock.png b/users/daniel/host-specific/elderbug/wallpapers/lock.png
new file mode 100644
index 0000000..d7bb4cc
Binary files /dev/null and b/users/daniel/host-specific/elderbug/wallpapers/lock.png differ
diff --git a/users/daniel/host-specific/elderbug/wallpapers/wallpaper.jpg b/users/daniel/host-specific/elderbug/wallpapers/wallpaper.jpg
new file mode 100644
index 0000000..6222c31
Binary files /dev/null and b/users/daniel/host-specific/elderbug/wallpapers/wallpaper.jpg differ