flake: Update for Plasma 5.26

flake.lock

@@ -24,11 +24,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1662958374,
+        "lastModified": 1665824418,
-        "narHash": "sha256-MpyHx+UjOA8Zi0r0dRKRL509Wqz7JFWI7XFJJstL10w=",
+        "narHash": "sha256-OZX8io9UKzxFAwdRvf4uOThDFpGtlbMyi13RbqIpmoY=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "46c1067b0b397df28de5e8f551d2df54f7da7a93",
+        "rev": "08445dd7824253ee8580f06127460a7d14e942cf",
         "type": "github"
       },
       "original": {
@@ -134,6 +134,21 @@
       }
     },
     "flake-utils_6": {
+      "locked": {
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_7": {
       "locked": {
         "lastModified": 1644229661,
         "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
@@ -154,11 +169,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1662759269,
+        "lastModified": 1665655007,
-        "narHash": "sha256-lt8bAfEZudCQb+MxoNKmenhMTXhu3RCCyLYxU9t5FFk=",
+        "narHash": "sha256-34ZMJlgqJb73RY/gJz8B4cjdM5ukas2crMYQpmyRGeQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "9f7fe353b613d0e45d7a5cdbd1f13c96c15803dd",
+        "rev": "8cbc6500dfca22d907054f68c564019b3b6cf295",
         "type": "github"
       },
       "original": {
@@ -221,11 +236,11 @@
         "utils": "utils_3"
       },
       "locked": {
-        "lastModified": 1660330190,
+        "lastModified": 1665655007,
-        "narHash": "sha256-RgQUtZGmdb9fRkdBcI8x1KYuykbQCBaeY6ejFls7hFM=",
+        "narHash": "sha256-34ZMJlgqJb73RY/gJz8B4cjdM5ukas2crMYQpmyRGeQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8675cfa549e1240c9d2abb1c878bc427eefcf926",
+        "rev": "8cbc6500dfca22d907054f68c564019b3b6cf295",
         "type": "github"
       },
       "original": {
@@ -340,13 +355,36 @@
         "type": "github"
       }
     },
+    "nixgl": {
+      "inputs": {
+        "flake-utils": "flake-utils_6",
+        "nixpkgs": [
+          "ostylk-home",
+          "pkg-unstable"
+        ]
+      },
+      "locked": {
+        "lastModified": 1661367362,
+        "narHash": "sha256-Qc8MXcV+YCPREu8kk6oggk23ZBKLqeQRAIsLbHEviPE=",
+        "owner": "guibou",
+        "repo": "nixGL",
+        "rev": "7165ffbccbd2cf4379b6cd6d2edd1620a427e5ae",
+        "type": "github"
+      },
+      "original": {
+        "owner": "guibou",
+        "ref": "main",
+        "repo": "nixGL",
+        "type": "github"
+      }
+    },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1662714967,
+        "lastModified": 1665839131,
-        "narHash": "sha256-IOTq5tAGGmBFj7tQbkcyLE261JUeTUucEE3p0WLZ4qM=",
+        "narHash": "sha256-0KYo13PfwvPw5i/SC+hGy3hsgR++Co7SIzv+0e9YOnM=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "1fec8fda86dac5701146c77d5f8a414b14ed1ff6",
+        "rev": "674d05f9ae2249d606a0e6fc63e522d2031a27ac",
         "type": "github"
       },
       "original": {
@@ -374,9 +412,10 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 0,
+        "lastModified": 1665643254,
-        "narHash": "sha256-HBcM19nGhI3IWwPNVlYb0MZ8VW6iKp4JbAVkeIHVykc=",
+        "narHash": "sha256-IBVWNJxGCsshwh62eRfR6+ry3bSXmulB3VQRzLQo3hk=",
-        "path": "/nix/store/5356r3f8pfz731rwcm1xrwaqqcbrq8gg-source",
+        "path": "/nix/store/9z3mf509n245ydbsx13ygcp7w4yc3s5g-source",
+        "rev": "ba187fbdc5e35322c7dff556ef2c47bddfd6e8d7",
         "type": "path"
       },
       "original": {
@@ -402,11 +441,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1654953433,
+        "lastModified": 1662996720,
-        "narHash": "sha256-TwEeh4r50NdWHFAHQSyjCk2cZxgwUfcCCAJOhPdXB28=",
+        "narHash": "sha256-XvLQ3SuXnDMJMpM1sv1ifPjBuRytiDYhB12H/BNTjgY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "90cd5459a1fd707819b9a3fb9c852beaaac3b79a",
+        "rev": "5f326e2a403e1cebaec378e72ceaf5725983376d",
         "type": "github"
       },
       "original": {
@@ -418,11 +457,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1662911228,
+        "lastModified": 1665732960,
-        "narHash": "sha256-oJOrB2lEeBLaO8g1DKG5PK9a1zyOWypkscrEfxxEj8A=",
+        "narHash": "sha256-WBZ+uSHKFyjvd0w4inbm0cNExYTn8lpYFcHEes8tmec=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c97e777ff06fcb8d37dcdf5e21e9eff1f34f0e90",
+        "rev": "4428e23312933a196724da2df7ab78eb5e67a88e",
         "type": "github"
       },
       "original": {
@@ -524,11 +563,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1662966217,
+        "lastModified": 1665843281,
-        "narHash": "sha256-jLOh0txlWYlvvSUJmPLdfdaaUuoqRJjGPEEUKF2ya94=",
+        "narHash": "sha256-OvRNNVJuismkTkpFjh3/B5vKZ6g0FK5mrx3jOsyUqmA=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "fbba74f5057f1941066ecca23c681adf6738e5c9",
+        "rev": "335b2a8147ae0db34321842a0e2705f96091f210",
         "type": "github"
       },
       "original": {
@@ -572,17 +611,18 @@
         "impermanence": "impermanence_2",
         "libwacom-surface": "libwacom-surface",
         "linux-surface": "linux-surface",
+        "nixgl": "nixgl",
         "pkg-compile": "pkg-compile",
         "pkg-stable": "pkg-stable",
         "pkg-unstable": "pkg-unstable",
         "rnix-lsp": "rnix-lsp_2"
       },
       "locked": {
-        "lastModified": 1660515901,
+        "lastModified": 1665757700,
-        "narHash": "sha256-5sQVUgj9vnDW8hPIrynGviUXFPADrrL9X4qm3SLbqPM=",
+        "narHash": "sha256-ewx+XtdjZSwoY148+FMAhnhkReb8wnXdB4jd48e/ew4=",
         "ref": "refs/heads/master",
-        "rev": "48fa0996c44bc160802faaad2692ccfbbfb2647b",
+        "rev": "2f221bae4c04e89b371c64995b36c3fab48f82fe",
-        "revCount": 98,
+        "revCount": 109,
         "type": "git",
         "url": "https://destiny.ostylk.de/gitea/NixDistro/Home.git"
       },
@@ -625,11 +665,11 @@
     },
     "pkg-unstable": {
       "locked": {
-        "lastModified": 1660162369,
+        "lastModified": 1665643254,
-        "narHash": "sha256-pZukMP4zCA1FaBg0xHxf7KdE/Nv/C5YbDID7h2L8O7A=",
+        "narHash": "sha256-IBVWNJxGCsshwh62eRfR6+ry3bSXmulB3VQRzLQo3hk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3a11db5f408095b8f08b098ec2066947f4b72ce2",
+        "rev": "ba187fbdc5e35322c7dff556ef2c47bddfd6e8d7",
         "type": "github"
       },
       "original": {
@@ -735,7 +775,7 @@
     },
     "tablet-mode_2": {
       "inputs": {
-        "flake-utils": "flake-utils_6",
+        "flake-utils": "flake-utils_7",
         "nixpkgs": "nixpkgs_9"
       },
       "locked": {
@@ -754,11 +794,11 @@
     },
     "utils": {
       "locked": {
-        "lastModified": 1653893745,
+        "lastModified": 1659877975,
-        "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
         "type": "github"
       },
       "original": {
@@ -784,11 +824,11 @@
     },
     "utils_3": {
       "locked": {
-        "lastModified": 1653893745,
+        "lastModified": 1659877975,
-        "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
         "type": "github"
       },
       "original": {

hosts/miku.nix

@@ -77,7 +77,7 @@
       direnv.enable = true;
       office.enable = true;
       plasma = {
-        enable = false;
+        enable = true;
         sddm = {
           backgroundImage = pkgs.fetchurl {
             url = "https://cdn.donmai.us/original/d3/1b/__manjuu_prinz_eugen_roon_bismarck_friedrich_der_grosse_and_3_more_azur_lane_drawn_by_zaphn__d31bf4ac564d60f8787818842c369e7f.jpg";
@@ -90,14 +90,14 @@
     };
     services = {
       gamemode.enable = true;
-      gnome.enable = true;
+      gnome.enable = false;
       logiops.enable = true;
       input-remapper = {
         enable = true;
         postStartCommand = "${pkgs.input-remapper}/bin/input-remapper-control --command start --preset NOOP --device \"Razer Razer Tartarus V2\"";
       };
       gdm = {
-        enable = true;
+        enable = false;
       };
     };
     system = {
@@ -188,6 +188,10 @@
       libinput.enable = true;
     };
     earlyoom.enable = lib.mkForce false;
+
+    udev.extraRules = ''
+        ACTION=="add", SUBSYSTEM=="usb", DRIVERS=="usb", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c52b", ATTR{power/wakeup}="disabled", ATTR{driver/1-7/power/wakeup}="disabled"
+    '';
   };
 
   hardware = {

modules/default.nix

@@ -3,7 +3,6 @@
     # Hardware modules
     ./hardware/mobile.nix
     ./hardware/surface-pro6.nix
-    ./hardware/wifi.nix
 
     # Programs
     ./programs/alacritty

modules/desktop/plasma.nix

@@ -160,9 +160,13 @@ in {
           breeze-gtk
           bismuth
           gwenview
-          yakuake 
+          yakuake
+
+          kdeplasma-addons
+          plasma-nm
         ] ++ lib.optionals cfg.mobile.enable plasmaMobilePackages;
         packages = with pkgs; [
+          kde-rounded-corners
           index-fm
           rsibreak
           kalendar

modules/users/alexander.nix

@@ -24,7 +24,7 @@
       programs.ssh = {
         enable = true;
         matchBlocks = let
-          sshPort = (import ../../lib/ports.nix).sshPort;
+          sshPort = 3434;
         in {
           ayame = {
             port = sshPort;

overlays/sandbox.nix

@@ -85,6 +85,8 @@ in {
     additionalBlacklist = [ "/mnt" ];
     additionalMounts = [
       "/mnt/Storage/Games/LeagueOfLegends"
+      "/mnt/Storage/Games/Origin"
+      "/mnt/Storage/Games/SteamLibrary"
       "/mnt/tmp"
     ];
     mountInHome = [ ".local/share/lutris" ".config/lutris" "Games" ];

overlays/simple.nix

@@ -68,64 +68,4 @@ final: prev:
   };
 
   discord-app = prev.discord-app.override { chromium = prev.ungoogled-chromium; };
-
-  lapce = prev.lapce.overrideAttrs (old: rec {
-    version = "0.1.2";
-    src = prev.fetchFromGitHub {
-      owner = "lapce";
-      repo = "lapce";
-      rev = "v${version}";
-      sha256 = "1pn3ikh72z5y1ywx3bilghrzrwqc1inds2yxnz37l8s1azf3nzlc";
-    };
-
-    cargoDeps = old.cargoDeps.overrideAttrs (_: {
-      inherit src;
-      outputHash = "sha256-spmRgwTh0Sg+OvT/s85xEvOfs2DdCihnX6Ya+sDyePM=";
-    });
-    nativeBuildInputs = with prev; old.nativeBuildInputs ++ [
-      wrapGAppsHook
-    ];
-    buildInputs = with prev; old.buildInputs ++ [
-      libglvnd
-      glib cairo pango atk gdk-pixbuf gtk3
-    ];
-
-    preFixup = ''
-      patchelf \
-        --add-needed ${prev.vulkan-loader}/lib/libvulkan.so.1 \
-        --add-needed ${prev.libglvnd}/lib/libGL.so.1 \
-        $out/bin/lapce
-    '';
-  });
-
-  # See https://github.com/NixOS/nixpkgs/issues/171320
-  # Fixes XWayland crashing after a resume.
-  xwayland = prev.xwayland.overrideAttrs (old: rec {
-    version = "21.1.4";
-    src = prev.fetchurl {
-      url = "mirror://xorg/individual/xserver/xwayland-${version}.tar.xz";
-      sha256 = "sha256-GfZ5XzHPqOs1Kx5bPDefIu5gIOmHAf8sxnnajE8RWfc=";
-    };
-  });
-
-  # See
-  # https://github.com/NixOS/nixpkgs/commit/2bf8d8c0162507d08f9fc48e36ce7225f4879bd4
-  libsForQt5 = prev.libsForQt5.overrideScope' (finalp: prevp: {
-    plasma5 = prevp.plasma5.overrideScope' (finalq: prevq: {
-      plasma-mobile = prevq.plasma-mobile.overrideAttrs (old: {
-        buildInputs = with prevp; old.buildInputs ++ [
-          plasma-workspace
-        ];
-      });
-    });
-  });
-  plasma5Packages = prev.plasma5Packages.overrideScope' (finalp: prevp: {
-    plasma5 = prevp.plasma5.overrideScope' (finalq: prevq: {
-      plasma-mobile = prevq.plasma-mobile.overrideAttrs (old: {
-        buildInputs = with prevp; old.buildInputs ++ [
-          plasma-workspace
-        ];
-      });
-    });
-  });
 }

packages/tools/games/replaysorcery/default.nix

@@ -1,5 +1,5 @@
 { stdenv, lib,
-  pkgconfig, cmake, ffmpeg, libdrm, libpulseaudio, xorg, libnotify,
+  pkg-config, cmake, ffmpeg, libdrm, libpulseaudio, xorg, libnotify,
   fetchgit }:
 
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    pkgconfig cmake
+    pkg-config cmake
   ];
 
   buildInputs = [

packages/tools/virtualisation/evdev-proxy/default.nix

@@ -1,7 +1,7 @@
 {
   lib
 , rustPlatform
-, pkgconfig, udev
+, pkg-config, udev
 , fetchFromGitHub
 }:
 
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
 
   patches = [ ./add-evdev-selector.patch ];
   
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ udev ];