diff --git a/modules/desktop-software.nix b/modules/desktop-software.nix
index c6eba58..9bf944f 100644
--- a/modules/desktop-software.nix
+++ b/modules/desktop-software.nix
@@ -13,5 +13,9 @@
     tor-browser-bundle-bin
     wl-clipboard
     yt-dlp
+    element-desktop
+    discord
+    spotify
   ];
+  programs.steam.enable = true;
 }
diff --git a/modules/emacs.nix b/modules/emacs.nix
deleted file mode 100644
index 74113dd..0000000
--- a/modules/emacs.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ pkgs, inputs, lib, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    direnv
-  ];
-
-  nixpkgs.overlays = [
-    inputs.emacs-overlay.overlay
-  ];
-
-  services.emacs = {
-    install = true;
-    enable = false;
-    package = with pkgs; ((emacsPackagesFor (emacs-pgtk.overrideAttrs (old: {
-      passthru = old.passthru // {
-        treeSitter = true;
-      };
-    }))).emacsWithPackages (epkgs: with epkgs; [
-      # treesitter bits
-      treesit-grammars.with-all-grammars
-
-      vterm
-      pdf-tools
-    ]));
-    defaultEditor = lib.mkDefault true;
-  };
-
-}
diff --git a/modules/hw-accel-intel.nix b/modules/hw-accel-intel.nix
deleted file mode 100644
index a48a93e..0000000
--- a/modules/hw-accel-intel.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# overrides to enable [sometimes] wonky intel acceleration
-{ config, pkgs, ... }:
-
-{
-  nixpkgs.config.packageOverrides = pkgs: {
-    vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
-  };
-
-  hardware.opengl = {
-    enable = true;
-    extraPackages = with pkgs; [
-      vaapiVdpau
-      vaapiIntel
-      libvdpau-va-gl
-      intel-media-driver
-    ];
-  };
-
-  boot.initrd.kernelModules = [ "i915" ];
-
-}
diff --git a/modules/kernel-latest.nix b/modules/kernel-latest.nix
deleted file mode 100644
index 26b0dd7..0000000
--- a/modules/kernel-latest.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-}
diff --git a/modules/sway.nix b/modules/sway.nix
deleted file mode 100644
index f894dcb..0000000
--- a/modules/sway.nix
+++ /dev/null
@@ -1,166 +0,0 @@
-# General Desktop-related config
-{ pkgs, ... }:
-{
-  imports = [
-    ./desktop-software.nix
-  ];
-  environment.systemPackages = with pkgs; [
-    screen-message
-    qbittorrent
-    gajim
-    imv
-    swayimg
-    mpv
-    evince
-    brightnessctl
-    pulsemixer
-    cmus
-    termusic
-    gsettings-desktop-schemas
-    xdg-utils
-    nextcloud-client
-    foot
-    qt5.qtwayland
-    bashmount
-    (xfce.thunar.override { thunarPlugins = with xfce; [ thunar-volman thunar-archive-plugin ]; })
-    audacity
-  ];
-
-  #on the desktop, we need nice fonts ^^
-  fonts.fonts = with pkgs; [
-    monoid
-    font-awesome
-    dejavu_fonts
-    julia-mono
-    uw-ttyp0
-    gohufont
-    spleen
-    terminus_font
-    creep
-    corefonts
-    dina-font
-    fira
-    fira-mono
-    hack-font
-    liberation_ttf
-    noto-fonts
-    noto-fonts-cjk
-    noto-fonts-emoji
-    noto-fonts-extra
-    proggyfonts
-    symbola
-    open-sans
-    twemoji-color-font
-    twitter-color-emoji
-    iosevka
-  ];
-
-  fonts.enableDefaultFonts = true;
-  fonts.fontconfig = {
-    enable = true;
-    allowBitmaps = true;
-    useEmbeddedBitmaps = true;
-    defaultFonts.emoji = [
-      "Noto Color Emoji"
-      "Twitter Color Emoji"
-    ];
-  };
-
-  # Enable sound.
-  security.rtkit.enable = true;
-
-  services.avahi = {
-    enable = true;
-    nssmdns = true;
-  };
-
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    pulse.enable = true;
-  };
-  hardware.pulseaudio.zeroconf.discovery.enable = true;
-
-  hardware.bluetooth = {
-    enable = true;
-    package = pkgs.bluez;
-  };
-
-  programs.zsh.vteIntegration = true;
-  programs.bash.vteIntegration = true;
-  services.upower.enable = true;
-
-  services.acpid.enable = true;
-  programs.light.enable = true;
-
-  services.blueman.enable = true;
-
-  programs.xwayland.enable = true;
-  programs.sway = {
-    enable = true;
-    wrapperFeatures.gtk = true;
-    extraSessionCommands = ''
-      export SDL_VIDEODRIVER=wayland
-      export QT_QPA_PLATFORM=wayland-egl
-      export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
-      export QT_QPA_PLATFORMTHEME="gnome"
-      export QT_STYLE_OVERRIDE="adwaita-dark"
-    '';
-    extraPackages = with pkgs; [
-      alacritty
-      pamixer
-      swaylock
-      graphicsmagick
-      swayidle
-      wl-clipboard
-      mako
-      foot
-      rofi-wayland
-      grim
-      slurp
-      gnome.adwaita-icon-theme
-      i3status-rust
-      kanshi
-      wl-mirror
-      gammastep
-    ];
-  };
-  environment.sessionVariables = { GTK_THEME = "Adwaita:dark"; };
-  xdg.portal = {
-    enable = true;
-    wlr.enable = true;
-    extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
-  };
-
-  services.udisks2.enable = true;
-  environment.shellAliases = {
-    # mounting shit
-    mnt = "udisksctl mount -b";
-    umnt = "udisksctl unmount -b";
-    unlock = "udisksctl unlock -b";
-    lock = "udisksctl lock -b";
-    # easier navigation
-    pwc = "pwd|wl-copy";
-    cdp = "cd $(wl-paste)";
-  };
-
-  qt = {
-    enable = true;
-    platformTheme = "gnome";
-    style = "adwaita-dark";
-  };
-
-  services.gnome.gnome-keyring.enable = true;
-  security.pam.services.greetd.enableGnomeKeyring = true;
-
-  services.greetd = {
-    enable = true;
-    settings = {
-      default_session = {
-        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --greeting \"$(${pkgs.fortune}/bin/fortune -s)\" --cmd ${pkgs.sway}/bin/sway";
-      };
-    };
-  };
-
-  programs.gnupg.agent.pinentryFlavor = "curses";
-}