hosts/tablet.nix

@@ -21,6 +21,7 @@
     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 = [

nix-os/core.nix

@@ -6,37 +6,23 @@
 
 let
   /*
-   * pkg: package - nixpkgs package
+   * pkgs: 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 lib.hiPrio (
-      pkgs.stdenv.mkDerivation {
-      inherit wrapperArgs;
+  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} $wrapperArgs
+      makeWrapper ${pkg}/bin/${exe} $out/bin/${exe} ${lib.concatStringsSep " " 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"}"];})
+  };
+  wrapedNixPrograms = builtins.map lib.hiPrio [
+    (mkWrappedExecutable {pkg = pkgs.nix; exe = "nix-build"; wrapperArgs = ["--add-flags" "\"--log-format\"" "--add-flags" "bar-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
@@ -47,7 +33,6 @@ in
 
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
-  nix.package = wrappedNix;
 
   # List packages installed in system profile. To search, run:
   # $ nix search wget
@@ -60,8 +45,7 @@ in
     fastfetch
     smartmontools
     ddrescue
-  ] ++ wrappedNixExecutables true
-    ++ wrappedNixosExecutables;
+  ] ++ wrapedNixPrograms;
 
   programs.git.enable = true;
   programs.git.config = {

nix-os/displayManagers/gdm.nix

@@ -7,6 +7,7 @@
   config = {
     services.xserver.displayManager.gdm = {
       enable = true;
+      wayland = false;
       autoSuspend = false;
     };
 

nix-os/nvidia.nix

@@ -12,12 +12,6 @@
     powerManagement.enable = true;
     open = false;
     nvidiaSettings = true;
-    package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
-      version = "555.42.02";
-      sha256_64bit = "sha256-k7cI3ZDlKp4mT46jMkLaIrc2YUx1lh1wj/J4SVSHWyk=";
-      settingsSha256 = "sha256-rtDxQjClJ+gyrCLvdZlT56YyHQ4sbaL+d5tL4L4VfkA=";
-      persistencedSha256 = "";
+    package = config.boot.kernelPackages.nvidiaPackages.stable;
   };
-  };
-  nixpkgs.config.nvidia.acceptLicense = true;
 }