diff --git a/backup/gui.nix b/backup/gui.nix
index 4f83721..e9283c3 100644
--- a/backup/gui.nix
+++ b/backup/gui.nix
@@ -3,18 +3,16 @@ let
   unstable = import <nixos-unstable> {
     config = {
       allowUnfree = true;
-      chromium.commandLineArgs = "--enable-features=WebUIDarkMode,NativeNotifications,VaapiVideoDecoder --ignore-gpu-blocklist --use-gl=desktop --force-dark-mode --disk-cache-dir=/tmp/cache";
+      chromium.commandLineArgs =
+        "--enable-features=WebUIDarkMode,NativeNotifications,VaapiVideoDecoder --ignore-gpu-blocklist --use-gl=desktop --force-dark-mode --disk-cache-dir=/tmp/cache";
     };
   };
-in
-{
+in {
   nixpkgs.config.allowUnfree = true;
 
   networking = {
     firewall.enable = false;
-    networkmanager = {
-      enable = true;
-    };
+    networkmanager = { enable = true; };
   };
 
   environment.systemPackages = with unstable.pkgs; [
@@ -32,9 +30,7 @@ in
   programs = {
     dconf.enable = true;
     adb.enable = true;
-    ssh = {
-      startAgent = true;
-    };
+    ssh = { startAgent = true; };
     gnupg.agent = {
       enable = true;
       pinentryFlavor = "curses";
@@ -69,10 +65,7 @@ in
         "AlternateErrorPagesEnabled" = false;
         "UrlKeyedAnonymizedDataCollectionEnabled" = false;
         "SpellcheckEnabled" = true;
-        "SpellcheckLanguage" = [
-          "de"
-          "en-US"
-        ];
+        "SpellcheckLanguage" = [ "de" "en-US" ];
         "CloudPrintSubmitEnabled" = false;
       };
     };
@@ -126,5 +119,4 @@ in
       apiUrl = "https://etesync.szczepan.ski/";
     };
   };
-
 }
diff --git a/backup/pantheon.nix b/configs/pantheon.nix
similarity index 92%
rename from backup/pantheon.nix
rename to configs/pantheon.nix
index 693c082..12a158d 100644
--- a/backup/pantheon.nix
+++ b/configs/pantheon.nix
@@ -2,6 +2,8 @@
 
 {
   programs.pantheon-tweaks.enable = true;
+  programs.evolution.enable = true;
+
   services = {
     xserver = {
       enable = true;
diff --git a/configs/user.nix b/configs/user.nix
index 9c16a0c..808fabf 100644
--- a/configs/user.nix
+++ b/configs/user.nix
@@ -47,7 +47,7 @@ in {
       stateVersion = "22.05";
       packages = with unstable.pkgs; [
         atop
-        bpytop
+        btop
         broot
         dfc
         exa
diff --git a/machine/nixos-vm.nix b/machine/nixos-vm.nix
index ba5fe22..b1e4abd 100644
--- a/machine/nixos-vm.nix
+++ b/machine/nixos-vm.nix
@@ -1,53 +1,74 @@
 { config, pkgs, lib, ... }:
 
-let
-  unstable = import <nixos-unstable> { config.allowUnfree = true; };
-in
-{
-  imports =
-    [
-      /etc/nixos/hardware-configuration.nix
-      ../configs/gui.nix
-      ../configs/common.nix
-      ../configs/user.nix
-      ../configs/user-gui.nix
-    ];
+let unstable = import <nixos-unstable> { config.allowUnfree = true; };
+in {
+  imports = [
+    /etc/nixos/hardware-configuration.nix
+    # ../configs/pantheon.nix
+    ../configs/common.nix
+    ../configs/user.nix
+    ../configs/docker.nix
+    #      ../configs/user-gui.nix
+  ];
 
-  # Use the GRUB 2 boot loader.
-  boot.loader.grub.enable = true;
-  boot.loader.grub.version = 2;
-  # Define on which hard drive you want to install Grub.
-  boot.loader.grub.device = "/dev/vda"; # or "nodev" for efi only
   networking.hostName = "nixos-vm"; # Define your hostname.
-  # Set your time zone.
   time.timeZone = "Europe/Berlin";
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
 
   # The global useDHCP flag is deprecated, therefore explicitly set to false here.
   # Per-interface useDHCP will be mandatory in the future, so this generated config
   # replicates the default behaviour.
   networking.useDHCP = false;
-  networking.interfaces.enp1s0.useDHCP = true;
+  networking.interfaces.enp0s1.useDHCP = true;
 
-  # Select internationalisation properties.
-  # i18n.defaultLocale = "en_US.UTF-8";
-  # console = {
-  #   font = "Lat2-Terminus16";
-  #   keyMap = "us";
-  # };
+  services = {
+    # k3s = {
+    #   enable = true;
+    #   role = "server";
+    # };
+#    qemuGuest.enable = true;
+#    spice-vdagentd.enable = true;
+    # etesync-dav = {
+    #   enable = true;
+    #   apiUrl = "https://etesync.szczepan.ski/";
+    # };
 
-  # environment.variables = {
-  #   XDG_CURRENT_DESKTOP = "MATE";
-  # };
+#    xserver = {
+#      enable = false;
+#      displayManager = {
+#        gdm = {
+#          enable = true;
+          # greeters.pantheon.enable = true;
+        };
+#      };
 
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-  services.xserver.enable = true;
-  services.xserver.desktopManager.pantheon.enable = true;
-  services.xserver.displayManager.lightdm.greeters.pantheon.enable = true;
-  services.xserver.displayManager.lightdm.enable = true;
+#      desktopManager.gnome.enable = true;
+#      layout = "us";
 
-  system.stateVersion = "21.05";
+      # Enable touchpad support.
+#      libinput.enable = true;
+#      updateDbusEnvironment = true;
+#    };
+#  };
+
+#  programs.evolution.enable = true;
+
+#  environment.gnome.excludePackages = (with pkgs; [ gnome-photos gnome-tour ])
+#    ++ (with pkgs.gnome; [
+#      cheese # webcam tool
+#      gnome-music
+#      gnome-terminal
+#      gedit # text editor
+#      epiphany # web browser
+#      geary # email reader
+#      evince # document viewer
+#      gnome-characters
+#      totem # video player
+#      iagno # go game
+#      hitori # sudoku game
+#      atomix # puzzle game
+#    ]);
+
+  system.stateVersion = "23.05";
 }