diff --git a/configuration.nix b/configuration.nix
index 7e67d98..4048f37 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -29,10 +29,16 @@ in
     ];
 
   # Bootloader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-  boot.loader.efi.efiSysMountPoint = "/boot/efi";
-  boot.enableContainers = true;
+  boot = {
+    loader.systemd-boot.enable = true;
+    tmp.useTmpfs = true;
+    initrd.availableKernelModules = ["usbhid" "uas" "usb_storage" "nvme"];
+    #kernelParams = [
+    #];
+    loader.efi.canTouchEfiVariables = true;
+    loader.efi.efiSysMountPoint = "/boot/efi";
+    enableContainers = true;
+  };
 
   networking.hostName = "nix"; # Define your hostname.
 
@@ -41,8 +47,8 @@ in
   # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
 
   # Enable networking
-  # networking.networkmanager.enable = true;
-  networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+  networking.networkmanager.enable = true;
+  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
   # Set your time zone.
   time.timeZone = "America/New_York";
@@ -69,6 +75,8 @@ in
     layout = "us";
     xkbVariant = "";
 
+    videoDrivers = ["nvidia"];
+
     desktopManager = {
       plasma5.enable = conf.wm == "plasma";
       xterm.enable = false;
@@ -87,6 +95,22 @@ in
     };
   };
 
+  hardware = {
+    opengl = {
+      enable = true;
+      driSupport = true;
+      driSupport32Bit = true;
+    };
+
+    nvidia = {
+      modesetting.enable = true;
+      powerManagement.enable = false;
+      powerManagement.finegrained = false;
+      open = false;
+      nvidiaSettings = true;
+    };
+  };
+
   # Enable CUPS to print documents.
   services.printing.enable = true;
 
@@ -190,9 +214,6 @@ in
 
   # List services that you want to enable:
 
-  # Enable the OpenSSH daemon.
-  # services.openssh.enable = true;
-
   # Open ports in the firewall.
   # networking.firewall.allowedTCPPorts = [ ... ];
   # networking.firewall.allowedUDPPorts = [ ... ];
diff --git a/flake.nix b/flake.nix
index 1ed4d7f..76c6131 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,7 +28,7 @@
         home-manager.useUserPackages = true;
         home-manager.users.mbk = (import ./home.nix) conf;
       }
-      (nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix")
+      # (nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix")
     ];
   in
   {
diff --git a/hardware-configuration.nix b/hardware-configuration.nix
index 4552b0e..b55fe09 100644
--- a/hardware-configuration.nix
+++ b/hardware-configuration.nix
@@ -8,23 +8,23 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "ehci_pci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
+  boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/bbba7906-baa7-41e2-b744-82d1017b1496";
+    { device = "/dev/disk/by-uuid/3b09656b-3261-4ac1-af56-a86d488c0c37";
       fsType = "ext4";
     };
 
   fileSystems."/boot/efi" =
-    { device = "/dev/disk/by-uuid/C50D-A980";
+    { device = "/dev/disk/by-uuid/DDBD-91FF";
       fsType = "vfat";
     };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/3fdd00f2-308d-43aa-9168-70a192be1e3e"; }
+    [ { device = "/dev/disk/by-uuid/90bc78b9-a353-4653-8cc1-7265130ca5ff"; }
     ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
@@ -32,9 +32,10 @@
   # still possible to use this option, but it's recommended to use it in conjunction
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
+  # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-  hardware.opengl.driSupport32Bit = true;
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
diff --git a/home.nix b/home.nix
index 3df2329..968c579 100644
--- a/home.nix
+++ b/home.nix
@@ -54,6 +54,7 @@ in
     # managing with elpas :(
     # emacsPackages.idris2-mode
     # emacsPackages.evil
+    ripgrep
   ];
 
   programs.fish = {
@@ -164,6 +165,11 @@ in
     enable = true;
     userName = "mehbark";
     userEmail = "terezi@pyrope.net";
+    extraConfig = {
+      safe = {
+      	directory = "*";
+      };
+    };
   };
 
   programs.git.difftastic = {