diff --git a/baldur/configuration.nix b/baldur/configuration.nix
index a6a1f2e..33af346 100644
--- a/baldur/configuration.nix
+++ b/baldur/configuration.nix
@@ -1,5 +1,8 @@
 { pkgs, lib, ... }:
 with lib; {
+
+  boot.loader.systemd-boot.enable = true;
+
   # boot = {
   #   # binfmt.emulatedSystems = [ "armv7l-linux" "aarch64-linux" ];
   #   # kernelPackages = pkgs.linuxPackages_5_18;
@@ -268,5 +271,5 @@ with lib; {
   #   ];
   # };
 
-  system.stateVersion = "22.05";
+  system.stateVersion = "22.11";
 }
diff --git a/baldur/hardware-configuration.nix b/baldur/hardware-configuration.nix
new file mode 100644
index 0000000..e630609
--- /dev/null
+++ b/baldur/hardware-configuration.nix
@@ -0,0 +1,22 @@
+{ modulesPath, ... }:
+
+{
+  imports =
+    [
+      (modulesPath + "/profiles/qemu-guest.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "virtio_blk" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    {
+      device = "/dev/disk/by-uuid/7fa05ac4-8e10-4994-bb7d-4be88e4a6696";
+      fsType = "ext4";
+    };
+
+  swapDevices = [ ];
+
+}
diff --git a/baldur/hm.nix b/baldur/hm.nix
index 6049090..758735c 100644
--- a/baldur/hm.nix
+++ b/baldur/hm.nix
@@ -1,69 +1,23 @@
 { pkgs, ... }: {
-  nixpkgs.overlays = [
-    (_: _: {
-      devEnvironment = (import ./environment.nix) {
-        # enableCpp = true;
-        enableData = true;
-        # enableGo = true;
-        # enableHtml = true;
-        # enableJavascript = true;
-        # enableJava = true;
-        # enableLatex = true;
-        enableNix = true;
-        # enableOffice = true;
-        # enablePython = true;
-        # enableRust = true;
-        enableShell = true;
-        # enableSpelling = true;
-      };
-    })
-  ];
   home = {
     language.base = "it_IT.UTF-8";
     keyboard = {
       layout = "it";
-      options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ];
+      options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" "grp:menu_toggle" ];
     };
     packages = with pkgs; [
-      file
-      htop
-      neofetch
       nix-prefetch-scripts
-      ripgrep
-      wget
-      xclip
-      # yq
     ];
   };
   imports = [
     ../hm_modules/__basic.nix
 
-    ../hm_modules/configurations.nix
     # ../hm_modules/fonts.nix
-    ../hm_modules/bash.nix
-    ../hm_modules/bat.nix
-    # ../hm_modules/bottom.nix
-    # ../hm_modules/broot.nix
-    ../hm_modules/dircolors.nix
-    ../hm_modules/direnv.nix
-    # ../hm_modules/git.nix
-    # ../hm_modules/gpg.nix
     ../hm_modules/helix.nix
-    ../hm_modules/info.nix
-    # ../hm_modules/jq.nix
-    # ../hm_modules/kakoune.nix
-    ../hm_modules/keychain.nix
     # ../hm_modules/kitty.nix
-    ../hm_modules/lf.nix
-    ../hm_modules/man.nix
+    # ../hm_modules/lf.nix
     # ../hm_modules/megasync.nix
     # ../hm_modules/noti.nix
-    ../hm_modules/ssh.nix
-    ../hm_modules/starship.nix
-    ../hm_modules/tmux.nix
-    ../hm_modules/zoxide.nix
-    ../hm_modules/zsh.nix
-    ../hm_modules/shell_aliases.nix
   ];
 
   home.stateVersion = "22.05";
diff --git a/flake.nix b/flake.nix
index 7503830..08669d3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -206,20 +206,20 @@
       #   };
       # };
 
-      # baldurConfig = {
-      #   nixosConfigurations = rec {
-      #     baldur = nixpkgs.lib.nixosSystem rec {
-      #       system = "x86_64-linux";
-      #       modules = commonModules ++ [
-      #         # nixos-hardware.nixosModules.common-cpu-amd
-      #         # nixos-hardware.nixosModules.common-pc-ssd
-      #         ./baldur/hardware-configuration.nix
-      #         ./baldur/configuration.nix
-      #         { home-manager.users.bertof = import ./baldur/hm.nix; }
-      #       ];
-      #     };
-      #   };
-      # };
+      baldurConfig = {
+        nixosConfigurations = rec {
+          baldur = nixpkgs.lib.nixosSystem rec {
+            system = "x86_64-linux";
+            modules = commonModules ++ [
+              # nixos-hardware.nixosModules.common-cpu-amd
+              # nixos-hardware.nixosModules.common-pc-ssd
+              ./baldur/hardware-configuration.nix
+              ./baldur/configuration.nix
+              { home-manager.users.bertof = import ./baldur/hm.nix; }
+            ];
+          };
+        };
+      };
 
       lokiConfig = {
         nixosConfigurations = rec {
@@ -260,6 +260,7 @@
             modules = commonModules ++ [{ services.openssh = { enable = true; openFirewall = true; }; }];
             format = "install-iso";
           };
+
           # Installer DigitalOcean
           do = nixos-generators.nixosGenerate {
             inherit system;
@@ -275,7 +276,7 @@
       thorConfig
       odinConfig
       # freyaConfig
-      # baldurConfig
+      baldurConfig
       lokiConfig
       deployments
       images
diff --git a/hm_modules/__basic.nix b/hm_modules/__basic.nix
index 0690f0c..5961653 100644
--- a/hm_modules/__basic.nix
+++ b/hm_modules/__basic.nix
@@ -37,7 +37,7 @@
     ./info.nix
     ./jq.nix
     ./keychain.nix
-    ./lf.nix
+    ./lsd.nix
     ./man.nix
     ./shell_aliases.nix
     ./ssh.nix
diff --git a/odin/hm.nix b/odin/hm.nix
index 9113ce2..f281f47 100644
--- a/odin/hm.nix
+++ b/odin/hm.nix
@@ -92,8 +92,8 @@
     ../hm_modules/__basic.nix
 
     ../hm_modules/cpp.nix
-    ../hm_modules/go.nix
-    ../hm_modules/java.nix
+    # ../hm_modules/go.nix
+    # ../hm_modules/java.nix
     ../hm_modules/javascript.nix
     ../hm_modules/latex.nix
     ../hm_modules/python.nix
@@ -117,8 +117,8 @@
     ../hm_modules/kdeconnect.nix
     ../hm_modules/kitty.nix
     ../hm_modules/kubernetes-admin.nix
+    ../hm_modules/lf.nix
     ../hm_modules/libinput-gestures.nix
-    ../hm_modules/lsd.nix
     ../hm_modules/mangohud.nix
     ../hm_modules/megasync.nix
     ../hm_modules/mpv.nix
@@ -128,7 +128,6 @@
     ../hm_modules/nushell.nix
     ../hm_modules/obs-studio.nix
     ../hm_modules/office.nix
-    # ../hm_modules/onedrive.nix
     ../hm_modules/pass.nix
     ../hm_modules/picom.nix
     ../hm_modules/polybar.nix
@@ -136,7 +135,7 @@
     # ../hm_modules/pycharm.nix
     ../hm_modules/rofi.nix
     # ../hm_modules/screen_locker.nix
-    ../hm_modules/security.nix
+    # ../hm_modules/security.nix
     ../hm_modules/sxhkd.nix
     ../hm_modules/syncthing.nix
     ../hm_modules/terminator.nix
diff --git a/thor/hm.nix b/thor/hm.nix
index 88da5af..27d1414 100644
--- a/thor/hm.nix
+++ b/thor/hm.nix
@@ -84,7 +84,7 @@
 
     ../hm_modules/cpp.nix
     # ../hm_modules/go.nix
-    ../hm_modules/java.nix
+    # ../hm_modules/java.nix
     ../hm_modules/javascript.nix
     ../hm_modules/latex.nix
     ../hm_modules/python.nix
@@ -108,7 +108,7 @@
     # ../hm_modules/keepassxc.nix
     ../hm_modules/kitty.nix
     ../hm_modules/kubernetes-admin.nix
-    ../hm_modules/lsd.nix
+    ../hm_modules/lf.nix
     ../hm_modules/mangohud.nix
     ../hm_modules/megasync.nix
     ../hm_modules/mpv.nix
@@ -118,11 +118,11 @@
     ../hm_modules/nushell.nix
     ../hm_modules/obs-studio.nix
     ../hm_modules/office.nix
-    # ../hm_modules/onedrive.nix
     ../hm_modules/pass.nix
     ../hm_modules/picom.nix
     ../hm_modules/polybar.nix
     ../hm_modules/pro_audio.nix
+    # ../hm_modules/pycharm.nix
     ../hm_modules/rofi.nix
     # ../hm_modules/screen_locker.nix
     # ../hm_modules/security.nix