diff --git a/baldur/hm.nix b/baldur/hm.nix
deleted file mode 100644
index 035835a..0000000
--- a/baldur/hm.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ pkgs, ... }: {
-  home = {
-    language.base = "it_IT.UTF-8";
-    keyboard = {
-      layout = "it";
-      options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" "grp:menu_toggle" ];
-    };
-    packages = builtins.attrValues { inherit (pkgs) nix-prefetch-scripts; };
-  };
-  imports = [
-    ../modules/hm/__basic.nix
-
-    # ../modules/hm/development/cpp.nix
-    # ../modules/hm/development/data.nix
-    # ../modules/hm/development/go.nix
-    # ../modules/hm/development/javascript.nix
-    # ../modules/hm/development/latex.nix
-    # ../modules/hm/development/python.nix
-    # ../modules/hm/development/rust.nix
-
-    # ../modules/hm/fonts.nix
-    ../modules/hm/helix.nix
-    # ../modules/hm/kitty.nix
-    # ../modules/hm/lf.nix
-    # ../modules/hm/megasync.nix
-    # ../modules/hm/noti.nix
-  ];
-
-  home.stateVersion = "22.05";
-}
diff --git a/flake.nix b/flake.nix
index 054570d..7cb2035 100644
--- a/flake.nix
+++ b/flake.nix
@@ -121,10 +121,10 @@
             modules = commonModules ++ [
               ./modules/nixos/server
 
-              ./thor/hardware-configuration.nix
+              ./instances/thor/hardware-configuration.nix
               nixos-hardware.nixosModules.common-cpu-amd
               nixos-hardware.nixosModules.common-pc-ssd
-              ./thor/configuration.nix
+              ./instances/thor/configuration.nix
 
               ./modules/nixos/pro_audio.nix
               ./modules/nixos/sesar.nix
@@ -132,7 +132,7 @@
               ./modules/nixos/steam-link.nix
               ./modules/nixos/kdeconnect.nix
             ] ++ homeManagerModules ++ [
-              { home-manager.users.bertof = import ./thor/hm.nix; }
+              { home-manager.users.bertof = import ./instances/thor/hm.nix; }
             ];
           };
         };
@@ -147,8 +147,8 @@
               nixos-hardware.nixosModules.common-cpu-intel
               nixos-hardware.nixosModules.common-pc-laptop
               nixos-hardware.nixosModules.common-pc-laptop-ssd
-              ./odin/hardware-configuration.nix
-              ./odin/common_configuration.nix
+              ./instances/odin/hardware-configuration.nix
+              ./instances/odin/common_configuration.nix
 
               ./modules/nixos/pro_audio.nix
               ./modules/nixos/sesar.nix
@@ -157,20 +157,20 @@
               ./modules/nixos/kdeconnect.nix
               ./modules/nixos/garage.nix
             ] ++ homeManagerModules ++ [
-              { home-manager.users.bertof = import ./odin/hm.nix; }
+              { home-manager.users.bertof = import ./instances/odin/hm.nix; }
             ];
           in
           rec {
             odin-nvidia = nixpkgs.lib.nixosSystem {
               system = "x86_64-linux";
               modules = commonModules ++ odinCommonModules
-                ++ [ ./odin/configuration-nvidia.nix ];
+                ++ [ ./instances/odin/configuration-nvidia.nix ];
             };
 
             odin-intel = nixpkgs.lib.nixosSystem {
               system = "x86_64-linux";
               modules = commonModules ++ odinCommonModules
-                ++ [ ./odin/configuration-intel.nix ];
+                ++ [ ./instances/odin/configuration-intel.nix ];
             };
 
             odin = odin-intel;
@@ -188,13 +188,13 @@
               })
               ./modules/nixos/server
 
-              ./freya/hardware-configuration.nix
-              ./freya/configuration.nix
+              ./instances/freya/hardware-configuration.nix
+              ./instances/freya/configuration.nix
 
               ./modules/nixos/garage.nix
               ./modules/nixos/nextcloud.nix
             ] ++ homeManagerModules ++ [
-              { home-manager.users.bertof = import ./freya/hm.nix; }
+              { home-manager.users.bertof = import ./instances/freya/hm.nix; }
             ];
           };
         };
@@ -207,12 +207,12 @@
             modules = commonModules ++ [
               ./modules/nixos/server
               # ./baldur/hardware-configuration.nix
-              ./baldur/configuration.nix
+              ./instances/baldur/configuration.nix
               "${nixpkgs}/nixos/modules/virtualisation/digital-ocean-config.nix"
               ./modules/nixos/digitalocean.nix
               ./modules/nixos/garage.nix
             ] ++ homeManagerModules ++ [
-              { home-manager.users.bertof = import ./baldur/hm.nix; }
+              { home-manager.users.bertof = import ./instances/baldur/hm.nix; }
             ];
           };
         };
@@ -227,14 +227,14 @@
 
               nixos-hardware.nixosModules.common-cpu-intel
               nixos-hardware.nixosModules.common-pc-ssd
-              ./loki/hardware-configuration.nix
-              ./loki/configuration.nix
+              ./instances/loki/hardware-configuration.nix
+              ./instances/loki/configuration.nix
 
               ./modules/nixos/garage.nix
             ] ++ homeManagerModules ++ [
               {
-                home-manager.users.bertof = import ./loki/hm.nix;
-                home-manager.users.tiziano = import ./loki/hm_tiziano.nix;
+                home-manager.users.bertof = import ./instances/loki/hm.nix;
+                home-manager.users.tiziano = import ./instances/loki/hm_tiziano.nix;
               }
             ];
           };
diff --git a/baldur/configuration.nix b/instances/baldur/configuration.nix
similarity index 100%
rename from baldur/configuration.nix
rename to instances/baldur/configuration.nix
diff --git a/baldur/hardware-configuration.nix b/instances/baldur/hardware-configuration.nix
similarity index 100%
rename from baldur/hardware-configuration.nix
rename to instances/baldur/hardware-configuration.nix
diff --git a/instances/baldur/hm.nix b/instances/baldur/hm.nix
new file mode 100644
index 0000000..62583f5
--- /dev/null
+++ b/instances/baldur/hm.nix
@@ -0,0 +1,30 @@
+{ pkgs, ... }: {
+  home = {
+    language.base = "it_IT.UTF-8";
+    keyboard = {
+      layout = "it";
+      options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" "grp:menu_toggle" ];
+    };
+    packages = builtins.attrValues { inherit (pkgs) nix-prefetch-scripts; };
+  };
+  imports = [
+    ../../modules/hm/__basic.nix
+
+    # ../../modules/hm/development/cpp.nix
+    # ../../modules/hm/development/data.nix
+    # ../../modules/hm/development/go.nix
+    # ../../modules/hm/development/javascript.nix
+    # ../../modules/hm/development/latex.nix
+    # ../../modules/hm/development/python.nix
+    # ../../modules/hm/development/rust.nix
+
+    # ../../modules/hm/fonts.nix
+    ../../modules/hm/helix.nix
+    # ../../modules/hm/kitty.nix
+    # ../../modules/hm/lf.nix
+    # ../../modules/hm/megasync.nix
+    # ../../modules/hm/noti.nix
+  ];
+
+  home.stateVersion = "22.05";
+}
diff --git a/freya/configuration.nix b/instances/freya/configuration.nix
similarity index 100%
rename from freya/configuration.nix
rename to instances/freya/configuration.nix
diff --git a/freya/hardware-configuration.nix b/instances/freya/hardware-configuration.nix
similarity index 100%
rename from freya/hardware-configuration.nix
rename to instances/freya/hardware-configuration.nix
diff --git a/freya/hm.nix b/instances/freya/hm.nix
similarity index 54%
rename from freya/hm.nix
rename to instances/freya/hm.nix
index a726f36..a91fb93 100644
--- a/freya/hm.nix
+++ b/instances/freya/hm.nix
@@ -11,16 +11,16 @@
     };
   };
   imports = [
-    ../modules/hm/__basic.nix
+    ../../modules/hm/__basic.nix
 
-    ../modules/hm/cava.nix
-    ../modules/hm/dunst.nix
-    ../modules/hm/helix.nix
-    ../modules/hm/kitty.nix
-    ../modules/hm/lf.nix
-    ../modules/hm/spotifyd.nix
-    ../modules/hm/syncthing.nix
-    # ../modules/hm/xidlehook.nix
+    ../../modules/hm/cava.nix
+    ../../modules/hm/dunst.nix
+    ../../modules/hm/helix.nix
+    ../../modules/hm/kitty.nix
+    ../../modules/hm/lf.nix
+    ../../modules/hm/spotifyd.nix
+    ../../modules/hm/syncthing.nix
+    # ../../modules/hm/xidlehook.nix
   ];
 
   home.stateVersion = "22.11";
diff --git a/loki/configuration.nix b/instances/loki/configuration.nix
similarity index 100%
rename from loki/configuration.nix
rename to instances/loki/configuration.nix
diff --git a/loki/hardware-configuration.nix b/instances/loki/hardware-configuration.nix
similarity index 100%
rename from loki/hardware-configuration.nix
rename to instances/loki/hardware-configuration.nix
diff --git a/instances/loki/hm.nix b/instances/loki/hm.nix
new file mode 100644
index 0000000..3cc6ead
--- /dev/null
+++ b/instances/loki/hm.nix
@@ -0,0 +1,32 @@
+{
+  home = {
+    language.base = "it_IT.UTF-8";
+    keyboard = {
+      layout = "it";
+      options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ];
+    };
+  };
+  imports = [
+    ../../modules/hm/__basic.nix
+
+    # ../../modules/hm/development/cpp.nix
+    # ../../modules/hm/development/data.nix
+    # ../../modules/hm/development/go.nix
+    # ../../modules/hm/development/javascript.nix
+    # ../../modules/hm/development/latex.nix
+    # ../../modules/hm/development/nix.nix
+    # ../../modules/hm/development/python.nix
+    # ../../modules/hm/development/rust.nix
+
+    ../../modules/hm/helix.nix
+    ../../modules/hm/kakoune.nix
+    ../../modules/hm/kitty.nix
+    ../../modules/hm/lf.nix
+    ../../modules/hm/megasync.nix
+    ../../modules/hm/syncthing.nix
+
+    ../../modules/hm/shell_aliases.nix
+  ];
+
+  home.stateVersion = "22.11";
+}
diff --git a/instances/loki/hm_tiziano.nix b/instances/loki/hm_tiziano.nix
new file mode 100644
index 0000000..c8bfaed
--- /dev/null
+++ b/instances/loki/hm_tiziano.nix
@@ -0,0 +1,23 @@
+{
+  home = {
+    language.base = "it_IT.UTF-8";
+    keyboard = {
+      layout = "it";
+      options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ];
+    };
+  };
+  imports = [
+    ../../modules/hm/__basic.nix
+
+    ../../modules/hm/helix.nix
+    ../../modules/hm/kakoune.nix
+    ../../modules/hm/kitty.nix
+    ../../modules/hm/lf.nix
+    ../../modules/hm/megasync.nix
+    ../../modules/hm/syncthing_tiziano.nix
+
+    ../../modules/hm/shell_aliases.nix
+  ];
+
+  home.stateVersion = "21.11";
+}
diff --git a/odin/common_configuration.nix b/instances/odin/common_configuration.nix
similarity index 100%
rename from odin/common_configuration.nix
rename to instances/odin/common_configuration.nix
diff --git a/odin/configuration-intel.nix b/instances/odin/configuration-intel.nix
similarity index 100%
rename from odin/configuration-intel.nix
rename to instances/odin/configuration-intel.nix
diff --git a/odin/configuration-nvidia.nix b/instances/odin/configuration-nvidia.nix
similarity index 100%
rename from odin/configuration-nvidia.nix
rename to instances/odin/configuration-nvidia.nix
diff --git a/odin/hardware-configuration.nix b/instances/odin/hardware-configuration.nix
similarity index 100%
rename from odin/hardware-configuration.nix
rename to instances/odin/hardware-configuration.nix
diff --git a/instances/odin/hm.nix b/instances/odin/hm.nix
new file mode 100644
index 0000000..ab804c5
--- /dev/null
+++ b/instances/odin/hm.nix
@@ -0,0 +1,122 @@
+{ pkgs, ... }: {
+  home = {
+    language.base = "it_IT.UTF-8";
+    keyboard = {
+      layout = "it,us,us";
+      variant = ",,colemak";
+      options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" "grp:menu_toggle" ];
+    };
+    packages = builtins.attrValues {
+      inherit (pkgs)
+        # element-desktop # matrix client
+        # freecad
+        # lutris
+        # minecraft
+        # mycrypto
+        # pcmanfm
+        # pulseaudio
+        # signal-desktop
+        # slack
+        # wineFull
+        arandr authenticator authy cava discord dmenu droidcam easyeffects evince evolution gallery-dl google-chrome gucharmap handbrake httpie inkscape keyboard-switch krita openvpn p7zip pavucontrol pentablet-driver procps pulseaudio retroarchFull shotwell spotify tdesktop transmission-gtk virt-manager virt-viewer wireguard-tools xournalpp zoom-us;
+      inherit (pkgs.gnome)
+        # geary
+        # gnome-boxes
+        # gnome-calendar
+        # gnome-sound-recorder
+        # seahorse
+        eog file-roller gnome-font-viewer gnome-screenshot gnome-system-monitor totem;
+      inherit (pkgs.unstable_pkgs) postman skypeforlinux;
+    };
+  };
+
+  services = { gnome-keyring.enable = true; };
+
+  xsession = {
+    enable = true;
+    numlock.enable = true;
+    initExtra = ''
+      ## Touchpad
+      ${pkgs.xorg.xinput}/bin/xinput set-prop 'DELL0824:00 06CB:7E92 Touchpad' 'libinput Natural Scrolling Enabled' 1
+      ${pkgs.xorg.xinput}/bin/xinput set-prop 'DELL0824:00 06CB:7E92 Touchpad' 'libinput Tapping Enabled' 1
+      ${pkgs.xorg.xinput}/bin/xinput set-prop 'DELL0824:00 06CB:7E92 Touchpad' 'libinput Disable While Typing Enabled' 1
+    '';
+  };
+
+  imports = [
+    ../../modules/hm/__basic.nix
+
+    ../../modules/hm/development/cpp.nix
+    ../../modules/hm/development/data.nix
+    ../../modules/hm/development/database.nix
+    ../../modules/hm/development/docker.nix
+    # ../../modules/hm/development/go.nix
+    ../../modules/hm/development/javascript.nix
+    ../../modules/hm/development/kubernetes.nix
+    ../../modules/hm/development/latex.nix
+    ../../modules/hm/development/markdown.nix
+    ../../modules/hm/development/nix.nix
+    ../../modules/hm/development/python.nix
+    ../../modules/hm/development/rust.nix
+
+    ../../modules/hm/alacritty.nix
+    ../../modules/hm/autorandr.nix
+    ../../modules/hm/biblio.nix
+    ../../modules/hm/bitwarden.nix
+    ../../modules/hm/blender.nix
+    ../../modules/hm/bspwm.nix
+    ../../modules/hm/cava.nix
+    ../../modules/hm/dunst.nix
+    # ../../modules/hm/dwarf-fortress.nix
+    ../../modules/hm/easyeffects.nix
+    ../../modules/hm/firefox.nix
+    # ../../modules/hm/fonts.nix
+    # ../../modules/hm/gnome_shell.nix
+    # ../../modules/hm/grobi.nix
+    ../../modules/hm/gtk_theme.nix
+    ../../modules/hm/heif.nix
+    ../../modules/hm/helix.nix
+    # ../../modules/hm/joystickwake.nix
+    ../../modules/hm/kakoune.nix
+    ../../modules/hm/kdeconnect.nix
+    # ../../modules/hm/keepassxc.nix
+    ../../modules/hm/kicad.nix
+    # ../../modules/hm/kitty.nix
+    ../../modules/hm/lf.nix
+    ../../modules/hm/libinput-gestures.nix
+    ../../modules/hm/mangohud.nix
+    ../../modules/hm/megasync.nix
+    ../../modules/hm/mpv.nix
+    # ../../modules/hm/nautilus.nix
+    ../../modules/hm/ncspot.nix
+    ../../modules/hm/nix-index.nix
+    ../../modules/hm/noti.nix
+    ../../modules/hm/nushell.nix
+    ../../modules/hm/obs-studio.nix
+    ../../modules/hm/office.nix
+    ../../modules/hm/pass.nix
+    ../../modules/hm/picom.nix
+    ../../modules/hm/polybar.nix
+    ../../modules/hm/pro_audio.nix
+    ../../modules/hm/pycharm.nix
+    ../../modules/hm/research.nix
+    ../../modules/hm/rofi.nix
+    # ../../modules/hm/screen_locker.nix
+    # ../../modules/hm/security.nix
+    ../../modules/hm/spotifyd.nix
+    ../../modules/hm/sxhkd.nix
+    ../../modules/hm/syncthing.nix
+    ../../modules/hm/terminator.nix
+    # ../../modules/hm/thunar.nix
+    # ../../modules/hm/twmn.nix
+    ../../modules/hm/update_background.nix
+    ../../modules/hm/vim.nix
+    ../../modules/hm/webapp.nix
+    ../../modules/hm/xidlehook.nix
+    ../../modules/hm/xresources.nix
+    ../../modules/hm/zathura.nix
+    ../../modules/hm/zellij.nix
+  ];
+
+  home.stateVersion = "22.05";
+}
diff --git a/thor/configuration.nix b/instances/thor/configuration.nix
similarity index 100%
rename from thor/configuration.nix
rename to instances/thor/configuration.nix
diff --git a/thor/hardware-configuration.nix b/instances/thor/hardware-configuration.nix
similarity index 100%
rename from thor/hardware-configuration.nix
rename to instances/thor/hardware-configuration.nix
diff --git a/instances/thor/hm.nix b/instances/thor/hm.nix
new file mode 100644
index 0000000..909333d
--- /dev/null
+++ b/instances/thor/hm.nix
@@ -0,0 +1,111 @@
+{ pkgs, ... }: {
+  home = {
+    language.base = "it_IT.UTF-8";
+    keyboard = {
+      layout = "us,it";
+      variant = ",colemak,";
+      options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" "grp:menu_toggle" ];
+    };
+    packages = builtins.attrValues {
+      inherit (pkgs)
+        # electrum
+        # element-desktop # matrix client
+        evolution
+        # freecad
+        # minecraft
+        # mycrypto
+        # pcmanfm
+        # pulseaudio
+        # signal-desktop
+        # slack
+        # wineFull
+        arandr authenticator authy discord dmenu docker-compose docker-machine droidcam easyeffects evince filelight gallery-dl google-chrome gucharmap handbrake httpie inkscape krita openvpn p7zip pavucontrol pcsx2 pentablet-driver procps pulseaudio retroarchFull shotwell spotify tdesktop transmission-gtk virt-manager virt-viewer wireguard-tools xournalpp zoom-us;
+      inherit (pkgs.gnome)
+        # geary
+        # gnome-boxes
+        # gnome-calendar
+        # gnome-sound-recorder
+        # seahorse
+        eog file-roller gnome-font-viewer gnome-screenshot gnome-system-monitor totem;
+      inherit (pkgs.unstable_pkgs) postman skypeforlinux;
+    };
+  };
+
+  services = { gnome-keyring.enable = true; };
+
+  imports = [
+    ../../modules/hm/__basic.nix
+
+    ../../modules/hm/development/cpp.nix
+    ../../modules/hm/development/data.nix
+    ../../modules/hm/development/database.nix
+    ../../modules/hm/development/docker.nix
+    # ../../modules/hm/development/go.nix
+    ../../modules/hm/development/javascript.nix
+    ../../modules/hm/development/kubernetes.nix
+    ../../modules/hm/development/latex.nix
+    ../../modules/hm/development/markdown.nix
+    ../../modules/hm/development/nix.nix
+    ../../modules/hm/development/python.nix
+    ../../modules/hm/development/rust.nix
+
+    ../../modules/hm/alacritty.nix
+    ../../modules/hm/autorandr.nix
+    ../../modules/hm/biblio.nix
+    ../../modules/hm/bitwarden.nix
+    ../../modules/hm/blender_nvidia.nix
+    ../../modules/hm/bspwm.nix
+    ../../modules/hm/cava.nix
+    ../../modules/hm/dunst.nix
+    # ../../modules/hm/dwarf-fortress.nix
+    ../../modules/hm/easyeffects.nix
+    ../../modules/hm/firefox.nix
+    ../../modules/hm/fonts.nix
+    # ../../modules/hm/gnome_shell.nix
+    # ../../modules/hm/grobi.nix
+    ../../modules/hm/gtk_theme.nix
+    ../../modules/hm/heif.nix
+    ../../modules/hm/helix.nix
+    ../../modules/hm/joystickwake.nix
+    ../../modules/hm/kakoune.nix
+    ../../modules/hm/kdeconnect.nix
+    # ../../modules/hm/keepassxc.nix
+    # ../../modules/hm/kitty.nix
+    ../../modules/hm/lf.nix
+    ../../modules/hm/lutris.nix
+    ../../modules/hm/mangohud.nix
+    ../../modules/hm/megasync.nix
+    ../../modules/hm/mpv.nix
+    # ../../modules/hm/nautilus.nix
+    ../../modules/hm/ncspot.nix
+    ../../modules/hm/nix-index.nix
+    ../../modules/hm/noti.nix
+    ../../modules/hm/nushell.nix
+    ../../modules/hm/obs-studio.nix
+    ../../modules/hm/office.nix
+    ../../modules/hm/pass.nix
+    ../../modules/hm/picom.nix
+    ../../modules/hm/polybar.nix
+    ../../modules/hm/pro_audio.nix
+    ../../modules/hm/pycharm.nix
+    ../../modules/hm/spotifyd.nix
+    ../../modules/hm/research.nix
+    ../../modules/hm/rofi.nix
+    # ../../modules/hm/screen_locker.nix
+    # ../../modules/hm/security.nix
+    ../../modules/hm/sxhkd.nix
+    ../../modules/hm/syncthing.nix
+    ../../modules/hm/terminator.nix
+    # ../../modules/hm/thunar.nix
+    # ../../modules/hm/twmn.nix
+    ../../modules/hm/update_background.nix
+    ../../modules/hm/vim.nix
+    ../../modules/hm/webapp.nix
+    ../../modules/hm/xidlehook.nix
+    ../../modules/hm/xresources.nix
+    ../../modules/hm/zathura.nix
+    ../../modules/hm/zellij.nix
+  ];
+
+  home.stateVersion = "22.11";
+}
diff --git a/loki/hm.nix b/loki/hm.nix
deleted file mode 100644
index a371a36..0000000
--- a/loki/hm.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  home = {
-    language.base = "it_IT.UTF-8";
-    keyboard = {
-      layout = "it";
-      options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ];
-    };
-  };
-  imports = [
-    ../modules/hm/__basic.nix
-
-    # ../modules/hm/development/cpp.nix
-    # ../modules/hm/development/data.nix
-    # ../modules/hm/development/go.nix
-    # ../modules/hm/development/javascript.nix
-    # ../modules/hm/development/latex.nix
-    # ../modules/hm/development/nix.nix
-    # ../modules/hm/development/python.nix
-    # ../modules/hm/development/rust.nix
-
-    ../modules/hm/helix.nix
-    ../modules/hm/kakoune.nix
-    ../modules/hm/kitty.nix
-    ../modules/hm/lf.nix
-    ../modules/hm/megasync.nix
-    ../modules/hm/syncthing.nix
-
-    ../modules/hm/shell_aliases.nix
-  ];
-
-  home.stateVersion = "22.11";
-}
diff --git a/loki/hm_tiziano.nix b/loki/hm_tiziano.nix
deleted file mode 100644
index 750bfb6..0000000
--- a/loki/hm_tiziano.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  home = {
-    language.base = "it_IT.UTF-8";
-    keyboard = {
-      layout = "it";
-      options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ];
-    };
-  };
-  imports = [
-    ../modules/hm/__basic.nix
-
-    ../modules/hm/helix.nix
-    ../modules/hm/kakoune.nix
-    ../modules/hm/kitty.nix
-    ../modules/hm/lf.nix
-    ../modules/hm/megasync.nix
-    ../modules/hm/syncthing_tiziano.nix
-
-    ../modules/hm/shell_aliases.nix
-  ];
-
-  home.stateVersion = "21.11";
-}
diff --git a/odin/hm.nix b/odin/hm.nix
deleted file mode 100644
index 07e7534..0000000
--- a/odin/hm.nix
+++ /dev/null
@@ -1,122 +0,0 @@
-{ pkgs, ... }: {
-  home = {
-    language.base = "it_IT.UTF-8";
-    keyboard = {
-      layout = "it,us,us";
-      variant = ",,colemak";
-      options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" "grp:menu_toggle" ];
-    };
-    packages = builtins.attrValues {
-      inherit (pkgs)
-        # element-desktop # matrix client
-        # freecad
-        # lutris
-        # minecraft
-        # mycrypto
-        # pcmanfm
-        # pulseaudio
-        # signal-desktop
-        # slack
-        # wineFull
-        arandr authenticator authy cava discord dmenu droidcam easyeffects evince evolution gallery-dl google-chrome gucharmap handbrake httpie inkscape keyboard-switch krita openvpn p7zip pavucontrol pentablet-driver procps pulseaudio retroarchFull shotwell spotify tdesktop transmission-gtk virt-manager virt-viewer wireguard-tools xournalpp zoom-us;
-      inherit (pkgs.gnome)
-        # geary
-        # gnome-boxes
-        # gnome-calendar
-        # gnome-sound-recorder
-        # seahorse
-        eog file-roller gnome-font-viewer gnome-screenshot gnome-system-monitor totem;
-      inherit (pkgs.unstable_pkgs) postman skypeforlinux;
-    };
-  };
-
-  services = { gnome-keyring.enable = true; };
-
-  xsession = {
-    enable = true;
-    numlock.enable = true;
-    initExtra = ''
-      ## Touchpad
-      ${pkgs.xorg.xinput}/bin/xinput set-prop 'DELL0824:00 06CB:7E92 Touchpad' 'libinput Natural Scrolling Enabled' 1
-      ${pkgs.xorg.xinput}/bin/xinput set-prop 'DELL0824:00 06CB:7E92 Touchpad' 'libinput Tapping Enabled' 1
-      ${pkgs.xorg.xinput}/bin/xinput set-prop 'DELL0824:00 06CB:7E92 Touchpad' 'libinput Disable While Typing Enabled' 1
-    '';
-  };
-
-  imports = [
-    ../modules/hm/__basic.nix
-
-    ../modules/hm/development/cpp.nix
-    ../modules/hm/development/data.nix
-    ../modules/hm/development/database.nix
-    ../modules/hm/development/docker.nix
-    # ../modules/hm/development/go.nix
-    ../modules/hm/development/javascript.nix
-    ../modules/hm/development/kubernetes.nix
-    ../modules/hm/development/latex.nix
-    ../modules/hm/development/markdown.nix
-    ../modules/hm/development/nix.nix
-    ../modules/hm/development/python.nix
-    ../modules/hm/development/rust.nix
-
-    ../modules/hm/alacritty.nix
-    ../modules/hm/autorandr.nix
-    ../modules/hm/biblio.nix
-    ../modules/hm/bitwarden.nix
-    ../modules/hm/blender.nix
-    ../modules/hm/bspwm.nix
-    ../modules/hm/cava.nix
-    ../modules/hm/dunst.nix
-    # ../modules/hm/dwarf-fortress.nix
-    ../modules/hm/easyeffects.nix
-    ../modules/hm/firefox.nix
-    # ../modules/hm/fonts.nix
-    # ../modules/hm/gnome_shell.nix
-    # ../modules/hm/grobi.nix
-    ../modules/hm/gtk_theme.nix
-    ../modules/hm/heif.nix
-    ../modules/hm/helix.nix
-    # ../modules/hm/joystickwake.nix
-    ../modules/hm/kakoune.nix
-    ../modules/hm/kdeconnect.nix
-    # ../modules/hm/keepassxc.nix
-    ../modules/hm/kicad.nix
-    # ../modules/hm/kitty.nix
-    ../modules/hm/lf.nix
-    ../modules/hm/libinput-gestures.nix
-    ../modules/hm/mangohud.nix
-    ../modules/hm/megasync.nix
-    ../modules/hm/mpv.nix
-    # ../modules/hm/nautilus.nix
-    ../modules/hm/ncspot.nix
-    ../modules/hm/nix-index.nix
-    ../modules/hm/noti.nix
-    ../modules/hm/nushell.nix
-    ../modules/hm/obs-studio.nix
-    ../modules/hm/office.nix
-    ../modules/hm/pass.nix
-    ../modules/hm/picom.nix
-    ../modules/hm/polybar.nix
-    ../modules/hm/pro_audio.nix
-    ../modules/hm/pycharm.nix
-    ../modules/hm/research.nix
-    ../modules/hm/rofi.nix
-    # ../modules/hm/screen_locker.nix
-    # ../modules/hm/security.nix
-    ../modules/hm/spotifyd.nix
-    ../modules/hm/sxhkd.nix
-    ../modules/hm/syncthing.nix
-    ../modules/hm/terminator.nix
-    # ../modules/hm/thunar.nix
-    # ../modules/hm/twmn.nix
-    ../modules/hm/update_background.nix
-    ../modules/hm/vim.nix
-    ../modules/hm/webapp.nix
-    ../modules/hm/xidlehook.nix
-    ../modules/hm/xresources.nix
-    ../modules/hm/zathura.nix
-    ../modules/hm/zellij.nix
-  ];
-
-  home.stateVersion = "22.05";
-}
diff --git a/thor/hm.nix b/thor/hm.nix
deleted file mode 100644
index 298d69d..0000000
--- a/thor/hm.nix
+++ /dev/null
@@ -1,111 +0,0 @@
-{ pkgs, ... }: {
-  home = {
-    language.base = "it_IT.UTF-8";
-    keyboard = {
-      layout = "us,it";
-      variant = ",colemak,";
-      options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" "grp:menu_toggle" ];
-    };
-    packages = builtins.attrValues {
-      inherit (pkgs)
-        # electrum
-        # element-desktop # matrix client
-        evolution
-        # freecad
-        # minecraft
-        # mycrypto
-        # pcmanfm
-        # pulseaudio
-        # signal-desktop
-        # slack
-        # wineFull
-        arandr authenticator authy discord dmenu docker-compose docker-machine droidcam easyeffects evince filelight gallery-dl google-chrome gucharmap handbrake httpie inkscape krita openvpn p7zip pavucontrol pcsx2 pentablet-driver procps pulseaudio retroarchFull shotwell spotify tdesktop transmission-gtk virt-manager virt-viewer wireguard-tools xournalpp zoom-us;
-      inherit (pkgs.gnome)
-        # geary
-        # gnome-boxes
-        # gnome-calendar
-        # gnome-sound-recorder
-        # seahorse
-        eog file-roller gnome-font-viewer gnome-screenshot gnome-system-monitor totem;
-      inherit (pkgs.unstable_pkgs) postman skypeforlinux;
-    };
-  };
-
-  services = { gnome-keyring.enable = true; };
-
-  imports = [
-    ../modules/hm/__basic.nix
-
-    ../modules/hm/development/cpp.nix
-    ../modules/hm/development/data.nix
-    ../modules/hm/development/database.nix
-    ../modules/hm/development/docker.nix
-    # ../modules/hm/development/go.nix
-    ../modules/hm/development/javascript.nix
-    ../modules/hm/development/kubernetes.nix
-    ../modules/hm/development/latex.nix
-    ../modules/hm/development/markdown.nix
-    ../modules/hm/development/nix.nix
-    ../modules/hm/development/python.nix
-    ../modules/hm/development/rust.nix
-
-    ../modules/hm/alacritty.nix
-    ../modules/hm/autorandr.nix
-    ../modules/hm/biblio.nix
-    ../modules/hm/bitwarden.nix
-    ../modules/hm/blender_nvidia.nix
-    ../modules/hm/bspwm.nix
-    ../modules/hm/cava.nix
-    ../modules/hm/dunst.nix
-    # ../modules/hm/dwarf-fortress.nix
-    ../modules/hm/easyeffects.nix
-    ../modules/hm/firefox.nix
-    ../modules/hm/fonts.nix
-    # ../modules/hm/gnome_shell.nix
-    # ../modules/hm/grobi.nix
-    ../modules/hm/gtk_theme.nix
-    ../modules/hm/heif.nix
-    ../modules/hm/helix.nix
-    ../modules/hm/joystickwake.nix
-    ../modules/hm/kakoune.nix
-    ../modules/hm/kdeconnect.nix
-    # ../modules/hm/keepassxc.nix
-    # ../modules/hm/kitty.nix
-    ../modules/hm/lf.nix
-    ../modules/hm/lutris.nix
-    ../modules/hm/mangohud.nix
-    ../modules/hm/megasync.nix
-    ../modules/hm/mpv.nix
-    # ../modules/hm/nautilus.nix
-    ../modules/hm/ncspot.nix
-    ../modules/hm/nix-index.nix
-    ../modules/hm/noti.nix
-    ../modules/hm/nushell.nix
-    ../modules/hm/obs-studio.nix
-    ../modules/hm/office.nix
-    ../modules/hm/pass.nix
-    ../modules/hm/picom.nix
-    ../modules/hm/polybar.nix
-    ../modules/hm/pro_audio.nix
-    ../modules/hm/pycharm.nix
-    ../modules/hm/spotifyd.nix
-    ../modules/hm/research.nix
-    ../modules/hm/rofi.nix
-    # ../modules/hm/screen_locker.nix
-    # ../modules/hm/security.nix
-    ../modules/hm/sxhkd.nix
-    ../modules/hm/syncthing.nix
-    ../modules/hm/terminator.nix
-    # ../modules/hm/thunar.nix
-    # ../modules/hm/twmn.nix
-    ../modules/hm/update_background.nix
-    ../modules/hm/vim.nix
-    ../modules/hm/webapp.nix
-    ../modules/hm/xidlehook.nix
-    ../modules/hm/xresources.nix
-    ../modules/hm/zathura.nix
-    ../modules/hm/zellij.nix
-  ];
-
-  home.stateVersion = "22.11";
-}