diff --git a/hosts/tablet.nix b/hosts/tablet.nix
index 32de99d..7c449bf 100644
--- a/hosts/tablet.nix
+++ b/hosts/tablet.nix
@@ -21,7 +21,6 @@
     networking.hostName = "wroclaw-hp";
     networking.networkmanager.enable = true;
     networking.firewall.enable = true;
-    services.xserver.displayManager.gdm.wayland = lib.mkForce true;
     hardware.sensor.iio.enable = true;
 
     networking.firewall.allowedTCPPortRanges = [
diff --git a/nix-os/core.nix b/nix-os/core.nix
index 7f07c00..75cf2dd 100644
--- a/nix-os/core.nix
+++ b/nix-os/core.nix
@@ -6,23 +6,37 @@
 
 let
   /*
-   * pkgs: package - nixpkgs package
+   * pkg: package - nixpkgs package
    * exe: string - executable (under bin) in pkgs
    * wrapperArgs: string[] - arguments to pass to the wrapper
    */
-  mkWrappedExecutable = {pkg, exe ? pkg.meta.mainProgram, wrapperArgs}: let inherit (pkgs) lib makeWrapper; in pkgs.stdenv.mkDerivation {
-    name = "${pkg.name}-wrap-${exe}";
-    nativeBuildInputs = [ makeWrapper ];
-    phases = ["installPhase"];
-    installPhase = ''
-      mkdir -p $out/bin
-      makeWrapper ${pkg}/bin/${exe} $out/bin/${exe} ${lib.concatStringsSep " " wrapperArgs}
-    '';
-  };
-  wrapedNixPrograms = builtins.map lib.hiPrio [
-    (mkWrappedExecutable {pkg = pkgs.nix; exe = "nix-build"; wrapperArgs = ["--add-flags" "\"--log-format\"" "--add-flags" "bar-with-logs"];})
+  mkWrappedExecutable = {pkg, exe ? pkg.meta.mainProgram, wrapperArgs}: let inherit (pkgs) lib makeWrapper; in lib.hiPrio (
+      pkgs.stdenv.mkDerivation {
+      inherit wrapperArgs;
+      name = "${pkg.name}-wrap-${exe}";
+      nativeBuildInputs = [ makeWrapper ];
+      phases = ["installPhase"];
+      installPhase = ''
+        mkdir -p $out/bin
+        makeWrapper ${pkg}/bin/${exe} $out/bin/${exe} $wrapperArgs
+      '';
+    }
+  );
+
+  # bool -> nixpkgs[]
+  wrappedNixExecutables = inEnvironment: assert builtins.isBool inEnvironment; [
+    (mkWrappedExecutable {pkg = pkgs.nix; exe = "nix-build"; wrapperArgs = ["--add-flags" "\"--log-format\"" "--add-flags" "bar${lib.optionalString inEnvironment "-with-logs"}"];})
     (mkWrappedExecutable {pkg = pkgs.nix; exe = "nix-shell"; wrapperArgs = ["--add-flags" "\"--log-format\"" "--add-flags" "bar"];})
   ];
+  wrappedNixosExecutables = [
+    (mkWrappedExecutable {pkg = pkgs.nixos-rebuild; wrapperArgs = ["--add-flags" "\"--log-format\"" "--add-flags" "bar"];})
+  ];
+  wrappedNix = (pkgs.buildEnv {
+    name = "wrappedNix-${pkgs.nix.version}";
+    paths = [ pkgs.nix ] ++ wrappedNixExecutables false;
+  }).overrideAttrs {
+    version = pkgs.nix.version;
+  };
 in
 {
   # kernel
@@ -33,6 +47,7 @@ in
 
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
+  nix.package = wrappedNix;
 
   # List packages installed in system profile. To search, run:
   # $ nix search wget
@@ -45,7 +60,8 @@ in
     fastfetch
     smartmontools
     ddrescue
-  ] ++ wrapedNixPrograms;
+  ] ++ wrappedNixExecutables true
+    ++ wrappedNixosExecutables;
 
   programs.git.enable = true;
   programs.git.config = {
diff --git a/nix-os/displayManagers/gdm.nix b/nix-os/displayManagers/gdm.nix
index f3e4cbc..ce9811a 100644
--- a/nix-os/displayManagers/gdm.nix
+++ b/nix-os/displayManagers/gdm.nix
@@ -7,7 +7,6 @@
   config = {
     services.xserver.displayManager.gdm = {
       enable = true;
-      wayland = false;
       autoSuspend = false;
     };
 
diff --git a/nix-os/nvidia.nix b/nix-os/nvidia.nix
index 6a30716..2113d0a 100644
--- a/nix-os/nvidia.nix
+++ b/nix-os/nvidia.nix
@@ -12,6 +12,12 @@
     powerManagement.enable = true;
     open = false;
     nvidiaSettings = true;
-    package = config.boot.kernelPackages.nvidiaPackages.stable;
+    package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
+      version = "555.42.02";
+      sha256_64bit = "sha256-k7cI3ZDlKp4mT46jMkLaIrc2YUx1lh1wj/J4SVSHWyk=";
+      settingsSha256 = "sha256-rtDxQjClJ+gyrCLvdZlT56YyHQ4sbaL+d5tL4L4VfkA=";
+      persistencedSha256 = "";
+    };
   };
+  nixpkgs.config.nvidia.acceptLicense = true;
 }