diff --git a/nixos/base.nix b/nixos/base.nix
index 4b3a641..9f6b5aa 100644
--- a/nixos/base.nix
+++ b/nixos/base.nix
@@ -1,6 +1,5 @@
 { config, pkgs, lib, ... }: {
 
-
   imports = [
     # Include the results of the hardware scan.
     /etc/nixos/hardware-configuration.nix
@@ -47,7 +46,6 @@
     # firewall.enable = false;
   };
 
-
   # Set your time zone.
   time.timeZone = "Europe/Rome";
 
@@ -58,25 +56,28 @@
     keyMap = "it";
   };
 
-  # Enable the X11 windowing system.
-  services.xserver.enable = true;
 
-  # Enable the GNOME 3 Desktop Environment.
-  # services.xserver.displayManager.gdm = {
-  #   enable = true;
-  #   wayland = true;
-  #   nvidiaWayland = true;
-  # };
-  services.xserver.desktopManager.gnome.enable = true;
-  services.xserver.displayManager.sddm = {
+  # X11 windowing system.
+  services.xserver = {
     enable = true;
-    autoNumlock = true;
-  };
-  services.xserver.windowManager.bspwm.enable = true;
+    # Enable the GNOME 3 Desktop Environment.
+    # displayManager.gdm = {
+    #   enable = true;
+    #   wayland = true;
+    #   nvidiaWayland = true;
+    # };
+    desktopManager.gnome.enable = true;
+    displayManager.sddm = {
+      enable = true;
+      autoNumlock = true;
+    };
+    windowManager.bspwm.enable = true;
 
-  # Configure keymap in X11
-  services.xserver.layout = "it";
-  services.xserver.xkbOptions = "eurosign:e;";
+    # Configure keymap in X11
+    layout = "it";
+    xkbOptions = "eurosign:e;";
+    libinput.enable = true;
+  };
 
   # Enable CUPS to print documents.
   # services.printing.enable = true;
@@ -107,9 +108,6 @@
   #   daemon.enable = true;
   # };
 
-  # Enable touchpad support (enabled default in most desktopManager).
-  services.xserver.libinput.enable = true;
-
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.bertof = {
     isNormalUser = true;
@@ -164,51 +162,43 @@
         TIMELINE_CREATE=yes
         TIMELINE_CLEANUP=yes
       '';
+      common = {
+        extraConfig = bertofExtraConfig;
+      };
     in
       {
-        bertof_home = {
+        bertof_home = common // {
           subvolume = "/home/bertof";
-          extraConfig = bertofExtraConfig;
         };
-        bertof_music = {
+        bertof_music = common // {
           subvolume = "/home/bertof/Musica";
-          extraConfig = bertofExtraConfig;
         };
-        bertof_downloads = {
+        bertof_downloads = common // {
           subvolume = "/home/bertof/Scaricati";
-          extraConfig = bertofExtraConfig;
         };
-        bertof_images = {
+        bertof_images = common // {
           subvolume = "/home/bertof/Immagini";
-          extraConfig = bertofExtraConfig;
         };
-        bertof_videos = {
+        bertof_videos = common // {
           subvolume = "/home/bertof/Video";
-          extraConfig = bertofExtraConfig;
         };
-        bertof_documents = {
+        bertof_documents = common // {
           subvolume = "/home/bertof/Documenti";
-          extraConfig = bertofExtraConfig;
         };
-        bertof_games_ssd = {
+        bertof_games_ssd = common // {
           subvolume = "/home/bertof/Giochi/SSD";
-          extraConfig = bertofExtraConfig;
         };
-        bertof_games_hdd = {
+        bertof_games_hdd = common // {
           subvolume = "/home/bertof/Giochi/HDD";
-          extraConfig = bertofExtraConfig;
         };
-        bertof_git = {
+        bertof_git = common // {
           subvolume = "/home/bertof/Documenti/Git";
-          extraConfig = bertofExtraConfig;
         };
-        bertof_virt_ssd = {
+        bertof_virt_ssd = common // {
           subvolume = "/home/bertof/Documenti/VirtManager/SSD";
-          extraConfig = bertofExtraConfig;
         };
-        bertof_virt_hdd = {
+        bertof_virt_hdd = common // {
           subvolume = "/home/bertof/Documenti/VirtManager/HDD";
-          extraConfig = bertofExtraConfig;
         };
       };
   };
@@ -218,8 +208,19 @@
   hardware.bluetooth.enable = true;
   services.blueman.enable = true;
   services.zerotierone = { enable = true; joinNetworks = [ "8056c2e21cf9c753" ]; };
-  services.gvfs.enable = true;
+  services.gvfs = {
+    enable = true;
+    package = lib.mkForce pkgs.gnome3.gvfs;
+  };
   services.tlp.enable = false;
+  services.avahi = {
+    enable = true;
+    nssmdns = true;
+    # publish = {
+    #   enable = true;
+    #   addresses = true;
+    # };
+  };
 
   # Clamav
   services.clamav = { daemon.enable = true; updater.enable = true; };