diff --git a/hosts/igor/default.nix b/hosts/igor/default.nix
index 4fc7703..159fedd 100644
--- a/hosts/igor/default.nix
+++ b/hosts/igor/default.nix
@@ -19,7 +19,7 @@
   config.boot.loader.grub.enable = true;
   config.boot.loader.grub.efiSupport = true;
   config.boot.loader.grub.efiInstallAsRemovable = true;
-  config.boot.loader.efi.efiSysMountPoint = "/boot/efi";
+  #config.boot.loader.efi.efiSysMountPoint = "/boot/efi";
   # Define on which hard drive you want to install Grub.
   config.boot.loader.grub.device = "/dev/sdb"; # or "nodev" for efi only
 
@@ -64,32 +64,34 @@
   config.time.timeZone = "Europe/Berlin";
 
   # Enable the X11 windowing system.
-  services.xserver.enable = true;
+  config.services.xserver.enable = true;
+
+  config.services.logind.lidSwitch = "lock";
 
   # Enable the GNOME Desktop Environment.
-  services.xserver.displayManager.gdm.enable = true;
-  services.xserver.desktopManager.gnome.enable = true;
+  config.services.xserver.displayManager.gdm.enable = true;
+  config.services.xserver.desktopManager.gnome.enable = true;
 
   # Configure keymap in X11
-  services.xserver.xkb.layout = "us";
-  services.xserver.xkb.variant = "dvorak";
-  services.xserver.xkb.options = "eurosign:e,caps:escape";
+  config.services.xserver.xkb.layout = "us";
+  config.services.xserver.xkb.variant = "dvorak";
+  config.services.xserver.xkb.options = "eurosign:e,caps:escape";
 
   # Enable CUPS to print documents.
-  services.printing.enable = true;
+  config.services.printing.enable = true;
 
   # Enable sound.
   # hardware.pulseaudio.enable = true;
   # OR
-  services.pipewire = {
+  config.services.pipewire = {
     enable = true;
     pulse.enable = true;
   };
 
   # Enable touchpad support (enabled default in most desktopManager).
-  services.libinput.enable = true;
+  config.services.libinput.enable = true;
 
-  programs.firefox.enable = true;
+  config.programs.firefox.enable = true;
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
   config.users.users.alex = {
@@ -107,6 +109,5 @@
 
   config.programs.zsh.enable = true;
 
-  config.system.copySystemConfiguration = true;
   config.system.stateVersion = "24.11";
 }
diff --git a/hosts/igor/hardware-configuration.nix b/hosts/igor/hardware-configuration.nix
index 4810052..11478a1 100644
--- a/hosts/igor/hardware-configuration.nix
+++ b/hosts/igor/hardware-configuration.nix
@@ -13,6 +13,38 @@
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/e7720a57-f96a-4f37-a2ad-43527868418c";
+      fsType = "btrfs";
+      options = [ "subvol=rootfs" ];
+    };
+
+  fileSystems."/.swapvol" =
+    { device = "/dev/disk/by-uuid/e7720a57-f96a-4f37-a2ad-43527868418c";
+      fsType = "btrfs";
+      options = [ "subvol=swap" ];
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/2EDA-47FD";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
+
+  fileSystems."/home" =
+    { device = "/dev/disk/by-uuid/e7720a57-f96a-4f37-a2ad-43527868418c";
+      fsType = "btrfs";
+      options = [ "subvol=home" ];
+    };
+
+  fileSystems."/nix" =
+    { device = "/dev/disk/by-uuid/e7720a57-f96a-4f37-a2ad-43527868418c";
+      fsType = "btrfs";
+      options = [ "subvol=nix" ];
+    };
+
+  swapDevices = [ ];
+
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
   # still possible to use this option, but it's recommended to use it in conjunction