diff --git a/nixos/modules/desktop-default.nix b/nixos/modules/desktop-default.nix
new file mode 100644
index 0000000..1f66a46
--- /dev/null
+++ b/nixos/modules/desktop-default.nix
@@ -0,0 +1,96 @@
+{ config, lib, pkgs, ... }:
+{
+  imports = [
+    ./fonts.nix
+    ./nautilus.nix
+  ];
+
+  programs.gnome-disks.enable = true;
+  services.udisks2.enable = true;
+
+  xdg.mime.enable = true;
+
+  # make gnome settings persistent
+  programs.dconf.enable = true;
+
+  # gnome services
+  services.dbus.packages = [ pkgs.dconf ];
+  services.udev.packages = [ pkgs.gnome.gnome-settings-daemon ];
+  services.gnome.gnome-keyring.enable = true;
+
+  environment.systemPackages = with pkgs; [
+    adwaita-qt
+    arc-icon-theme
+    arc-kde-theme
+    arc-theme
+    evince
+    firefox-wayland
+    #geary
+    ghostwriter
+    (gimp-with-plugins.override {
+      plugins = with gimpPlugins; [
+        resynthesizer
+      ];
+    })
+    glib
+    gnome.adwaita-icon-theme
+    gnome.dconf-editor
+    gnome.eog
+    gnome.file-roller
+    gnome.gnome-calendar
+    gnome.gnome-system-monitor
+    gnome.simple-scan
+    keepassxc
+    keychain
+    konsole
+    libnotify
+    libreoffice
+    lollypop
+    unstable.newsflash
+    numix-cursor-theme
+    numix-icon-theme
+    numix-icon-theme-circle
+    polkit_gnome
+    qgnomeplatform
+    rhythmbox
+    simple-scan
+    socat
+    sshuttle
+    tdesktop
+    thunderbird
+    virtmanager
+    vlc
+    (mpv-with-scripts.override {
+      scripts = with mpvScripts; [
+        convert
+        mpris
+        simple-mpv-webui
+        sponsorblock
+        thumbnail
+      ];
+    })
+    wayvnc
+    xdg-utils
+    zathura
+    zeal
+
+    # TODO sort them in different files
+    pdfgrep
+    physlock
+    #symlinks
+  ];
+
+  # Enable firmware update daemon
+  services.fwupd.enable = true;
+
+  programs.wireshark.enable = true;
+  programs.wireshark.package = pkgs.wireshark;
+
+  services.accounts-daemon.enable = true;
+
+  environment.interactiveShellInit = ''
+    if test `tty` = /dev/tty1; then
+      exec sway
+    fi
+  '';
+}
diff --git a/nixos/thinkman/configuration.nix b/nixos/thinkman/configuration.nix
index 0c75b12..ed90e7e 100644
--- a/nixos/thinkman/configuration.nix
+++ b/nixos/thinkman/configuration.nix
@@ -12,6 +12,7 @@
     ../modules/clean.nix
     ../modules/compression.nix
     ../modules/desktop-development.nix
+    ../modules/desktop-default.nix
     ../modules/development.nix
     ../modules/docker.nix
     ../modules/filesystem.nix