diff --git a/flake.nix b/flake.nix
index 3d45cf9..c939372 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,8 +18,7 @@
       system = "x86_64-linux";
     in {
 
-    # nixos - system hostname
-    nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
+    nixosConfigurations.Rias = nixpkgs.lib.nixosSystem {
       specialArgs = {
         pkgs-stable = import nixpkgs-stable {
           inherit system;
@@ -28,7 +27,7 @@
         inherit inputs system;
       };
       modules = [
-        ./nixos/configuration.nix
+        ./nixos/hosts/Rias/configuration.nix
       ];
     };
 
diff --git a/home-manager/zsh.nix b/home-manager/zsh.nix
index 6c6d912..6b60109 100644
--- a/home-manager/zsh.nix
+++ b/home-manager/zsh.nix
@@ -16,7 +16,7 @@
 
       hms = "home-manager switch --flake ${flakeDir}";
 
-      conf = "$EDITOR ${flakeDir}/nixos/configuration.nix";
+      conf = "$EDITOR ${flakeDir}/nixos/hosts/$(hostname)/configuration.nix";
       pkgs = "$EDITOR ${flakeDir}/nixos/packages.nix";
 
       ll = "ls -l";
diff --git a/nixos/configuration.nix b/nixos/hosts/Rias/configuration.nix
similarity index 56%
rename from nixos/configuration.nix
rename to nixos/hosts/Rias/configuration.nix
index 97b5aa7..c759c5a 100644
--- a/nixos/configuration.nix
+++ b/nixos/hosts/Rias/configuration.nix
@@ -1,28 +1,30 @@
-{ config, ...}: {
+{ config, pkgs, ...}: {
   imports = [
     ./hardware-configuration.nix
-    ./packages.nix
-    ./modules/bundle.nix
+    ../../packages.nix
+    ../../modules/bundle.nix
   ];
 
   disabledModules = [
     ./modules/xserver.nix
   ];
 
-  networking.hostName = "nixos"; # Define your hostname.
+  networking.hostName = "Rias";
 
-  time.timeZone = "Europe/Moscow"; # Set your time zone.
+  time.timeZone = "Europe/Moscow";
 
-  i18n.defaultLocale = "ru_RU.UTF-8"; # Select internationalisation properties.
+  i18n.defaultLocale = "ru_RU.UTF-8";
 
-  nix.settings.experimental-features = [ "nix-command" "flakes" ]; # Enabling flakes
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
-  system.stateVersion = "23.05"; # Don't change it bro
+  system.stateVersion = "23.05";
 
   hardware.opengl = {
     enable = true;
     driSupport = true;
     driSupport32Bit = true;
+    extraPackages = with pkgs; [nvidia-vaapi-driver intel-media-driver];
+    extraPackages32 = with pkgs.pkgsi686Linux; [nvidia-vaapi-driver intel-media-driver];
   };
 
   services.xserver.videoDrivers = [ "nvidia" ];
@@ -34,11 +36,5 @@
     open = false;
     nvidiaSettings = true;
     package = config.boot.kernelPackages.nvidiaPackages.stable;
-
-    prime = {
-      sync.enable = true;
-		  intelBusId = "PCI:0:2:0";
-		  nvidiaBusId = "PCI:1:0:0";
-	  };
   };
 }
diff --git a/nixos/hardware-configuration.nix b/nixos/hosts/Rias/hardware-configuration.nix
similarity index 62%
rename from nixos/hardware-configuration.nix
rename to nixos/hosts/Rias/hardware-configuration.nix
index 0d6c8d2..4751c0a 100644
--- a/nixos/hardware-configuration.nix
+++ b/nixos/hosts/Rias/hardware-configuration.nix
@@ -4,19 +4,29 @@
 { config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "sd_mod" "rtsx_pci_sdmmc" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/48ebb252-9212-49e3-a036-501d549477f5";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/c32a41f3-f084-44ea-ac52-179a3bc44bbf";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/F3A3-D76B";
+    fsType = "vfat";
+    options = [ "fmask=0022" "dmask=0022" ];
+  };
+
+  fileSystems."/mnt/D" = {
+    device = "/dev/disk/by-uuid/EC7C275B7C272036";
+    fsType = "ntfs";
+    options = ["umask=0022" "gid=100" "uid=1001"];
+  };
 
   swapDevices = [ ];
 
@@ -26,8 +36,6 @@
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
   # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp0s20f0u6.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;