host: Use nixos-hardware

- Remove iptsd. It is packaged upstream

flake.lock

@@ -5,11 +5,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1634404028,
+        "lastModified": 1640802000,
-        "narHash": "sha256-JyP2Y6JCCYvUcVz7CXX5pXUfTGTU4GX51Yza82BgMfk=",
+        "narHash": "sha256-ZiI94Zv/IgW64fqKrtVaQqfUCkn9STvAjgfFmvtqcQ8=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "53aa91b4170da35a96fab1577c9a34bc0da44e27",
+        "rev": "c5558c88b2941bf94886dfdede6926b1ba5f5629",
         "type": "github"
       },
       "original": {
@@ -20,11 +20,11 @@
     },
     "emacs": {
       "locked": {
-        "lastModified": 1638668516,
+        "lastModified": 1641205295,
-        "narHash": "sha256-u67dzO+HVWlimD6OSXSajvkU6/c7fGp4faC48uCln7k=",
+        "narHash": "sha256-DG1JHIBWfLu9wLXcyRyHeQCmbWjtHNKMWSEjJQrYfAU=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "bd45e439c084c145d67272419eaf96b978f5c2ce",
+        "rev": "150c09f3e3029b4d2f0ceecee2bf3d5148404767",
         "type": "github"
       },
       "original": {
@@ -50,11 +50,11 @@
     },
     "flake-utils_2": {
       "locked": {
-        "lastModified": 1634851050,
+        "lastModified": 1638122382,
-        "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=",
+        "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935",
+        "rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
         "type": "github"
       },
       "original": {
@@ -68,11 +68,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1638571010,
+        "lastModified": 1641121012,
-        "narHash": "sha256-KSO7u13VRLdklQTKYJaBSfVcurEvw+HifAsHR7V2i5E=",
+        "narHash": "sha256-svaOMxNMQgFHjcxdmLojOxTxfqSENtnO+S3kb+npIwY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "781d25b315def05cd7ede3765226c54216f0b1fe",
+        "rev": "8e7a10602d1eb1d242c9d3f9b822203d5751a8c6",
         "type": "github"
       },
       "original": {
@@ -87,11 +87,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1634544068,
+        "lastModified": 1638281721,
-        "narHash": "sha256-RlRQBaAHfdWqfRyHdWuDPMkplBTYwuyDQqDcNbP/Sog=",
+        "narHash": "sha256-d3vAVFG6zov9NwjSuYntBiD+I5KjJLwX09c7uAzbONI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ff2bed9dac84fb202bbb3c49fdcfe30c29d0b12f",
+        "rev": "7329ffc6e911106494183557fc249180d5422929",
         "type": "github"
       },
       "original": {
@@ -103,11 +103,11 @@
     },
     "impermanence": {
       "locked": {
-        "lastModified": 1636812815,
+        "lastModified": 1640808801,
-        "narHash": "sha256-OG4/4cD2sGNM+ROaYhczwUJ3YCtzaIgX96rFjCs85JE=",
+        "narHash": "sha256-iHo8vyuYyhbk5MGfwn/7IahF8dBAwUYTZga4u0UsqPQ=",
         "owner": "nix-community",
         "repo": "impermanence",
-        "rev": "00df1e57bb9c7551b45a11c70f5472d0cbfbfff7",
+        "rev": "29d781b47b0ee6014abd541c132c647d18ab098e",
         "type": "github"
       },
       "original": {
@@ -121,41 +121,57 @@
         "nixpkgs": "nixpkgs_6"
       },
       "locked": {
-        "lastModified": 1629707199,
+        "lastModified": 1639947939,
-        "narHash": "sha256-sGxlmfp5eXL5sAMNqHSb04Zq6gPl+JeltIZ226OYN0w=",
+        "narHash": "sha256-pGsM8haJadVP80GFq4xhnSpNitYNQpaXk4cnA796Cso=",
-        "owner": "nmattia",
+        "owner": "nix-community",
         "repo": "naersk",
-        "rev": "df71f5e4babda41cd919a8684b72218e2e809fa9",
+        "rev": "2fc8ce9d3c025d59fee349c1f80be9785049d653",
         "type": "github"
       },
       "original": {
-        "owner": "nmattia",
+        "owner": "nix-community",
         "repo": "naersk",
         "type": "github"
       }
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1635881984,
+        "lastModified": 1640686209,
-        "narHash": "sha256-m6qai5HI+5/4uqSAiR1JceKQrimu/H3iOOn3BXWw3Rc=",
+        "narHash": "sha256-6glXUlKRDhEhNuYx6r3fXU6KH2/Vq9mJZjB9oUpwrmc=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "46df95ca81e7e4cf3458cdb4b7d1714b5fce9da5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
+    "nixos-hardware_2": {
+      "locked": {
+        "lastModified": 1637957946,
+        "narHash": "sha256-zhAql8UR2R/88VCEjvzoVpcFi3k4gkhJayNuYNZaWMY=",
         "owner": "ostylk",
         "repo": "nixos-hardware",
-        "rev": "b4238e8fb309c2d4ea1038423e9c47c5005aa0e6",
+        "rev": "bf27ac0017bb06c950f2f59a1213329382cb47c5",
         "type": "github"
       },
       "original": {
         "owner": "ostylk",
-        "ref": "surface-test",
+        "ref": "surface-update",
         "repo": "nixos-hardware",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1638198142,
+        "lastModified": 1638698569,
-        "narHash": "sha256-plU9b8r4St6q4U7VHtG9V7oF8k9fIpfXl/KDaZLuY9k=",
+        "narHash": "sha256-Ld3UN9fP9X00Jppd0gxUQ+EEt0pMiVHyDzn5AS0HGsc=",
-        "path": "/nix/store/k5f8bdi01gs45m1nnfypja4is7mkpvb5-source",
+        "path": "/nix/store/nkrpxpkz1cx5k0acfgzpy7b15219ds40-source",
-        "rev": "8a308775674e178495767df90c419425474582a1",
+        "rev": "af6071db609bdf86f5d36f0bc4a4ac0fe8e92c35",
         "type": "path"
       },
       "original": {
@@ -165,11 +181,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1636800699,
+        "lastModified": 1640540585,
-        "narHash": "sha256-SwbyVxXffu3G2ulJIbTf0iQfqhbGbdml4Dyv5j9BiAI=",
+        "narHash": "sha256-cCmknKFjWgam9jq+58wSd0Z4REia8mjBP65kXcL3ki8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2fa862644fc15ecb525eb8cd0a60276f1c340c7c",
+        "rev": "ac169ec6371f0d835542db654a65e0f2feb07838",
         "type": "github"
       },
       "original": {
@@ -181,11 +197,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1638698569,
+        "lastModified": 1641210259,
-        "narHash": "sha256-Ld3UN9fP9X00Jppd0gxUQ+EEt0pMiVHyDzn5AS0HGsc=",
+        "narHash": "sha256-O7oWcTw9WY/gbZPPqDpNYOAeT4bOK+1rtYC9ZaevTT0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "af6071db609bdf86f5d36f0bc4a4ac0fe8e92c35",
+        "rev": "18c84ea816348e2a098390101b92d1e39a9dbd45",
         "type": "github"
       },
       "original": {
@@ -210,10 +226,10 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1638198142,
+        "lastModified": 1638698569,
-        "narHash": "sha256-plU9b8r4St6q4U7VHtG9V7oF8k9fIpfXl/KDaZLuY9k=",
+        "narHash": "sha256-Ld3UN9fP9X00Jppd0gxUQ+EEt0pMiVHyDzn5AS0HGsc=",
-        "path": "/nix/store/k5f8bdi01gs45m1nnfypja4is7mkpvb5-source",
+        "path": "/nix/store/nkrpxpkz1cx5k0acfgzpy7b15219ds40-source",
-        "rev": "8a308775674e178495767df90c419425474582a1",
+        "rev": "af6071db609bdf86f5d36f0bc4a4ac0fe8e92c35",
         "type": "path"
       },
       "original": {
@@ -223,11 +239,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1636855248,
+        "lastModified": 1640653651,
-        "narHash": "sha256-ISyGm3p9uNvSqsgguK6+Pr0IDJ3pik14wTHZXfF3e/s=",
+        "narHash": "sha256-fByFYXYoE/6TqwKGbT7XBCOAlSsFzOXm4ZsRLoO70m8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "195d5816cddc056e07fd2aa3fe81ee6e3f9d96e2",
+        "rev": "7bca80140fc7732c7357b26002db3d87b3ba4c61",
         "type": "github"
       },
       "original": {
@@ -239,10 +255,10 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1638198142,
+        "lastModified": 1638698569,
-        "narHash": "sha256-plU9b8r4St6q4U7VHtG9V7oF8k9fIpfXl/KDaZLuY9k=",
+        "narHash": "sha256-Ld3UN9fP9X00Jppd0gxUQ+EEt0pMiVHyDzn5AS0HGsc=",
-        "path": "/nix/store/k5f8bdi01gs45m1nnfypja4is7mkpvb5-source",
+        "path": "/nix/store/nkrpxpkz1cx5k0acfgzpy7b15219ds40-source",
-        "rev": "8a308775674e178495767df90c419425474582a1",
+        "rev": "af6071db609bdf86f5d36f0bc4a4ac0fe8e92c35",
         "type": "path"
       },
       "original": {
@@ -252,11 +268,11 @@
     },
     "nixpkgs_7": {
       "locked": {
-        "lastModified": 1638564543,
+        "lastModified": 1640929225,
-        "narHash": "sha256-slB5V8mWwtpAYquwG/s7vlTROJhObkCPdGrshQlWicM=",
+        "narHash": "sha256-JcnGLghuMWCApRr1Rer5EnIGhQUdAfyAVpdZNH2LL2A=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b86b6bc5e753919ab4d7c902210234f324d0efa4",
+        "rev": "932ec35ff8ac0fef5667ad2b0db4a009440255a9",
         "type": "github"
       },
       "original": {
@@ -268,11 +284,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1638683309,
+        "lastModified": 1641198127,
-        "narHash": "sha256-KH8l/3/Ptvw4t7fzMO9hb5RmrAK7KNiFM9hqBG1YgMs=",
+        "narHash": "sha256-V5beyGlEIPoA5tGRHR8HKgUNOfq2Pk/pMRJsTDe5aH0=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "64e93e9e68325ed12029732bac269ada92ff65f5",
+        "rev": "f3540de5479a029dbf289232611800e3a83c6913",
         "type": "github"
       },
       "original": {
@@ -287,17 +303,17 @@
         "flake-utils": "flake-utils_2",
         "home-manager": "home-manager_2",
         "impermanence": "impermanence",
-        "nixos-hardware": "nixos-hardware",
+        "nixos-hardware": "nixos-hardware_2",
         "nixpkgs": "nixpkgs_5",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "rnix-lsp": "rnix-lsp"
       },
       "locked": {
-        "lastModified": 1636987186,
+        "lastModified": 1641167986,
-        "narHash": "sha256-uJ0Px5gvwtXF+HoGhMnN6Sel30XFcJUhhZfqXPFh6/A=",
+        "narHash": "sha256-3rsvxh53szG4Bsi+Z9soKUeQ0mkPIIXRKLcd7ixhGH8=",
         "ref": "master",
-        "rev": "44b8e77f43d9aadf31d8d696cf514784cc6a01eb",
+        "rev": "f433548e1182c66e5fe403b80dc213a09c630455",
-        "revCount": 143,
+        "revCount": 155,
         "type": "git",
         "url": "https://dev.ostylk.de/NixDistro/Config"
       },
@@ -313,11 +329,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1636977689,
+        "lastModified": 1640347520,
-        "narHash": "sha256-pQmAxKBoEhC851iRsowMErz9CYiJxGpARjhPeSapH1Y=",
+        "narHash": "sha256-UkieGBW9ap0pQbumYoG60Ed+BpzMRGuLQ6Zb41u7Fkk=",
         "owner": "nix-community",
         "repo": "rnix-lsp",
-        "rev": "9462b0d20325a06f7e43b5a0469ec2c92e60f5fe",
+        "rev": "d7cc2887ac9e65dd01715aac472edbf46b93ed31",
         "type": "github"
       },
       "original": {
@@ -332,6 +348,7 @@
         "emacs": "emacs",
         "flake-utils": "flake-utils",
         "home-manager": "home-manager",
+        "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_2",
         "nur": "nur",
         "ostylk": "ostylk",
@@ -340,11 +357,11 @@
     },
     "stable": {
       "locked": {
-        "lastModified": 1638564543,
+        "lastModified": 1640929225,
-        "narHash": "sha256-slB5V8mWwtpAYquwG/s7vlTROJhObkCPdGrshQlWicM=",
+        "narHash": "sha256-JcnGLghuMWCApRr1Rer5EnIGhQUdAfyAVpdZNH2LL2A=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b86b6bc5e753919ab4d7c902210234f324d0efa4",
+        "rev": "932ec35ff8ac0fef5667ad2b0db4a009440255a9",
         "type": "github"
       },
       "original": {

flake.nix

@@ -4,12 +4,12 @@
   inputs = {
     home-manager.url = "github:nix-community/home-manager/master";
     flake-utils.url = "github:numtide/flake-utils";
-    #nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     nixpkgs.url = "github:nixos/nixpkgs/master";
     stable.url = "github:nixos/nixpkgs/nixos-21.05";
     emacs.url = "github:nix-community/emacs-overlay";
     nur.url = "github:nix-community/nur";
     ostylk.url = "git+https://dev.ostylk.de/NixDistro/Config";
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
   };
 
   outputs = {

hosts/mashu.nix

@@ -1,6 +1,10 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, inputs, ... }:
 
 {
+  imports = with inputs.nixos-hardware.nixosModules; [
+    common-cpu-intel common-pc-ssd microsoft-surface
+  ];
+
   fileSystems = {
     "/" = {
       device = "/dev/disk/by-label/root";

hosts/miku.nix

@@ -1,6 +1,10 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, inputs, ... }:
 
 {
+ imports = with inputs.nixos-hardware.nixosModules; [
+   common-cpu-amd common-gpu-amd common-pc-ssd
+ ];
+
   fileSystems = {
     "/" = {
       device = "/dev/disk/by-label/root";
@@ -28,8 +32,8 @@
     trackma # Custom package
     anime-dl # Custom package
     thunderbird
-    multimc-wrapped # Custom package
+    #multimc-wrapped # Custom package
-    nwg-launchers
+    #nwg-launchers
     gnome-podcasts
     cantata
     newsflash
@@ -55,7 +59,7 @@
       };
       xournalpp.enable = true;
       zsh.enable = true;
-      plasma.enable = true;
+      #plasma.enable = true;
     };
     services = {
       gamemode.enable = true;
@@ -143,11 +147,14 @@
       "kvm.report_ignored_msrs=N"
       "fbcon=rotate:3"
       "quiet"
+      "nopti"
+      "nospectre_v2"
+      "nospec"
       "clocksource=tsc"
 	    "tsc=reliable"
     ];
     
-    #extraModulePackages = [ pkgs.linuxPackages_xanmod.vendor-reset ];
+    extraModulePackages = [ pkgs.linuxPackages_zen.vendor-reset ];
 
     #extraModulePackages = [ pkgs.linuxPackages.vendor-reset ];
     # NOTE: A regression appears to have happend between 5.10 and 5.12

lib/baseSystem.nix

@@ -112,6 +112,96 @@ in {
       jack.enable = true;
       alsa.enable = true;
       alsa.support32Bit = true;
+      /*
+      config.pipewire = {
+        "context.modules" = [
+          {
+            name = "libpipewire-module-rtkit";
+            args = {};
+            flags = [ "ifexists" "nofail" ];
+          }
+          { name = "libpipewire-module-protocol-native"; }
+          { name = "libpipewire-module-client-node"; }
+          { name = "libpipewire-module-adapter"; }
+          { name = "libpipewire-module-metadata"; }
+
+          {
+            name = "libpipewire-module-filter-chain";
+            args = {
+              "node.name" = "effect_output.virtual-surround-7.1-hesuvi";
+              "node.description" = "Virtual Surround Sink";
+              "media.name" = "Virtual Surround Sink";
+              "filter.graph" = {
+                nodes = [
+                  { type = "builtin"; label = "copy"; name = "copyFL"; }
+                  { type = "builtin"; label = "copy"; name = "copyFR"; }
+                  { type = "builtin"; label = "copy"; name = "copyFC"; }
+                  { type = "builtin"; label = "copy"; name = "copyRL"; }
+                  { type = "builtin"; label = "copy"; name = "copyRR"; }
+                  { type = "builtin"; label = "copy"; name = "copySL"; }
+                  { type = "builtin"; label = "copy"; name = "copySR"; }
+                  { type = "builtin"; label = "copy"; name = "copyLFE"; }
+
+                  { type = "builtin"; label = "convolver"; name = "convFL_L"; config = { filename = "hrir_hesuvi/hrir.wav"; channel = 0; }; }
+                  { type = "builtin"; label = "convolver"; name = "convFL_R"; config = { filename = "hrir_hesuvi/hrir.wav"; channel = 1; }; }
+                  { type = "builtin"; label = "convolver"; name = "convSL_L"; config = { filename = "hrir_hesuvi/hrir.wav"; channel = 2; }; }
+                  { type = "builtin"; label = "convolver"; name = "convSL_R"; config = { filename = "hrir_hesuvi/hrir.wav"; channel = 3; }; }
+                  { type = "builtin"; label = "convolver"; name = "convRL_L"; config = { filename = "hrir_hesuvi/hrir.wav"; channel = 4; }; }
+                  { type = "builtin"; label = "convolver"; name = "convRL_R"; config = { filename = "hrir_hesuvi/hrir.wav"; channel = 5; }; }
+                  { type = "builtin"; label = "convolver"; name = "convFC_L"; config = { filename = "hrir_hesuvi/hrir.wav"; channel = 6; }; }
+                  { type = "builtin"; label = "convolver"; name = "convFR_R"; config = { filename = "hrir_hesuvi/hrir.wav"; channel = 7; }; }
+                  { type = "builtin"; label = "convolver"; name = "convFR_L"; config = { filename = "hrir_hesuvi/hrir.wav"; channel = 8; }; }
+                  { type = "builtin"; label = "convolver"; name = "convSR_R"; config = { filename = "hrir_hesuvi/hrir.wav"; channel = 9; }; }
+                  { type = "builtin"; label = "convolver"; name = "convSR_L"; config = { filename = "hrir_hesuvi/hrir.wav"; channel = 10; }; }
+                  { type = "builtin"; label = "convolver"; name = "convRR_R"; config = { filename = "hrir_hesuvi/hrir.wav"; channel = 11; }; }
+                  { type = "builtin"; label = "convolver"; name = "convRR_L"; config = { filename = "hrir_hesuvi/hrir.wav"; channel = 12; }; }
+                  { type = "builtin"; label = "convolver"; name = "convFC_R"; config = { filename = "hrir_hesuvi/hrir.wav"; channel = 13; }; }
+
+                  { type = "builtin"; label = "convolver"; name = "convLFE_L"; config = { filename = "hrir_hesuvi/hrir.wav"; channel = 6; }; }
+                  { type = "builtin"; label = "convolver"; name = "convLFE_R"; config = { filename = "hrir_hesuvi/hrir.wav"; channel = 13; }; }
+
+                  { type = "builtin"; label = "mixer"; name = "mixL"; }
+                  { type = "builtin"; label = "mixer"; name = "mixR"; }
+                ];
+                links = let
+                  linkInput = channel: [
+                    { output = "copy${channel}:Out"; input = "conv${channel}_L:In"; }
+                    { output = "copy${channel}:Out"; input = "conv${channel}_R:In"; }
+                  ];
+                  linkOutput = channel: n: [
+                    { output = "conv${channel}_L:Out"; input = "mix_L:In ${builtins.toString n}"; }
+                    { output = "conv${channel}_R:Out"; input = "mix_R:In ${builtins.toString n}"; }
+                  ];
+                in (builtins.concatMap (channel: linkInput channel) [ "FL" "SL" "RL" "FC" "FR" "SR" "RR" "LFE" ])
+                   ++ [
+                     (linkOutput "FL" 1)
+                     (linkOutput "SL" 2)
+                     (linkOutput "RL" 3)
+                     (linkOutput "FC" 4)
+                     (linkOutput "FR" 5)
+                     (linkOutput "SR" 6)
+                     (linkOutput "RR" 7)
+                     (linkOutput "LFE" 8)
+                   ];
+                inputs = builtins.map (channel: "copy${channel}:In") [ "FL" "SL" "RL" "FC" "FR" "SR" "RR" "LFE" ];
+                outputs = [ "mixL:Out" "mixR:Out" ];
+              };
+
+              "capture.props" = {
+                "media.class" = "Audio/Sink";
+                "audio.channels" = 8;
+                "audio.position" = [ "FL" "FR" "FC" "LFE" "RL" "RR" "SL" "SR" ];
+              };
+              "playback.props" = {
+                "node.passive" = true;
+                "audio.channels" = 2;
+                "audio.positions" = [ "FL" "FR" ];
+              };
+            };
+          }
+        ];
+      };
+      */
     };
 
     # On desktop: Monitor keyboards, mice, ...
@@ -171,6 +261,7 @@ in {
   };
   
   boot = {
+    cleanTmpDir = true;
     loader =  {
       systemd-boot.enable = true;
       efi.canTouchEfiVariables = true;

modules/hardware/surface-pro6.nix

@@ -1,17 +1,6 @@
 { config, lib, pkgs, ... }:
 
 let
-  fetchurl = pkgs.fetchurl;
-  commit = "a602640f4334990828e07cf78bc78217b4e7901e";
-  kernelVersion = "5.15";
-  mkPatch = name: sha256: {
-    name = name;
-    patch = fetchurl {
-      inherit sha256;
-
-      url = "https://raw.githubusercontent.com/linux-surface/linux-surface/${commit}/patches/${kernelVersion}/${name}.patch";
-    };
-  };
   cfg = config.ptw.hardware.surface;
 in {
   options.ptw.hardware.surface = {
@@ -59,101 +48,26 @@ in {
     };
 
     boot = {
-      kernelPackages = pkgs.linuxPackages_5_15;
       kernelPatches = [
-        (mkPatch "0001-surface3-oemb" "0id92a1g9ghvw2wf05ad3j4i294m118rvb23rywvm04wcasgav4a")
-        (mkPatch "0002-mwifiex" "091380bv1gmbzh9ldcnhdw64g8m5lz0akync7r0lazcm6fjcwnxa")
-        (mkPatch "0003-ath10k" "1hy22n8mdw743gnh82asnyjiivx9hz95a6svf6lr2pkdz5dl48ra")
-        (mkPatch "0004-ipts" "0c192h414wp0zgcm78q79wcavrzah33k94vb1cjzfl6y53agzjam")
-        (mkPatch "0005-surface-sam" "1awffwlp6wz0i0kb4xd7zy7y7syggzc04ay53nxjhn54n8djlb1r")
-        (mkPatch "0006-surface-sam-over-hid" "1nf9wy57hqr28f2lqk9vjvk0fkm9vs3j8nq4f8izhdqmazl8bbak")
-        (mkPatch "0007-surface-gpe" "0a77haazdsmv4kr76cfng829cgd4zrzvbn3pf1rl67vbl6il9wli")
-        (mkPatch "0008-surface-button" "1ja9n1iia3p6cjifds95cv684w8cr2kibj19k7fm8bm58achia6f")
-        (mkPatch "0009-surface-typecover" "0dmcsilqcqzr3rdc8lpq857pjgkj9agmns8g1nrax9h0rfh9gl3m")
-        #(mkPatch "0010-cameras" "1clvd09qbl3cjmxmpjvnfq4f9csqarzk13ahz3s69hq401a2a83m")
-        (mkPatch "0011-amd-gpio" "0552k7d9hajafryvjvlxbaxbxkqmhjmk4i3hxbpdb3czz7i9cyzj") # TODO: Maybe drop
-        (mkPatch "0012-misc-fixes" "16fslvys2zjp8fpysig51cchikskzpvjww9w4nk3wsz6yh1xdm0f")
-
         {
           name = "surface-config";
           patch = null;
           # Options from https://github.com/linux-surface/linux-surface/blob/master/configs/surface-5.13.config
           extraConfig = ''
-        #
+            #
-        # Surface Aggregator Module
+            # Other
-        #
+            #
-        SURFACE_AGGREGATOR m
+            # Prevent a non-fatal "kernel oops" at boot crashing udev
-        SURFACE_AGGREGATOR_ERROR_INJECTION n
+            # (https://github.com/linux-surface/linux-surface/issues/61#issuecomment-579298172)
-        SURFACE_AGGREGATOR_BUS y
+            PINCTRL_INTEL y
-        SURFACE_AGGREGATOR_CDEV m
+            PINCTRL_SUNRISEPOINT y
-        SURFACE_AGGREGATOR_REGISTRY m
+            # Required for reading battery data
-
+            # (https://github.com/linux-surface/surface-aggregator-module/wiki/Testing-and-Installing)
-        SURFACE_ACPI_NOTIFY m
+            SERIAL_DEV_BUS y
-        SURFACE_DTX m
+            SERIAL_DEV_CTRL_TTYPORT y
-        SURFACE_PLATFORM_PROFILE m
+            MFD_INTEL_LPSS_PCI y
-
+            INTEL_IDMA64 y
-        SURFACE_HID m
+          '';
-        SURFACE_KBD m
-
-        BATTERY_SURFACE m
-        CHARGER_SURFACE m
-
-        #
-        # Surface Hotplug
-        #
-        SURFACE_HOTPLUG m
-
-        #
-        # IPTS touchscreen
-        #
-        # This only enables the user interface for IPTS data.
-        # For the touchscreen to work, you need to install iptsd.
-        #
-        MISC_IPTS m
-
-        #
-        # Cameras: IPU3
-        #
-        #VIDEO_IPU3_IMGU m
-        VIDEO_IPU3_CIO2 m
-        CIO2_BRIDGE y
-        #INTEL_SKL_INT3472 m
-
-        #
-        # Cameras: Sensor drivers
-        #
-        #VIDEO_OV5693 m
-        VIDEO_OV8865 m
-
-        #
-        # ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7
-        #
-        APDS9960 m
-
-        #
-        # Other Drivers
-        #
-        INPUT_SOC_BUTTON_ARRAY m
-        SURFACE_3_BUTTON m
-        SURFACE_3_POWER_OPREGION m
-        SURFACE_PRO3_BUTTON m
-        SURFACE_GPE m
-        SURFACE_BOOK1_DGPU_SWITCH m
-
-        #
-        # Other
-        #
-        # Prevent a non-fatal "kernel oops" at boot crashing udev
-        # (https://github.com/linux-surface/linux-surface/issues/61#issuecomment-579298172)
-        PINCTRL_INTEL y
-        PINCTRL_SUNRISEPOINT y
-        # Required for reading battery data
-        # (https://github.com/linux-surface/surface-aggregator-module/wiki/Testing-and-Installing)
-        SERIAL_DEV_BUS y
-        SERIAL_DEV_CTRL_TTYPORT y
-        MFD_INTEL_LPSS_PCI y
-        INTEL_IDMA64 y
-      '';
         }
       ];
     };

modules/programs/gnome/default.nix

@@ -39,7 +39,7 @@ in {
       geoclue2.enable = false;
       dleyna-renderer.enable = false;
       dleyna-server.enable = false;
-      gvfs.enable = lib.mkForce false;
+      gvfs.enable = true;
       telepathy.enable = false;
       gnome = {
         chrome-gnome-shell.enable = false;

overlays/simple.nix

@@ -1,24 +1,14 @@
 final: prev:
 
-let
+{
-  # NOTE: For some reason --fs-screen-name and --screen-name are not in
+  /*
-  #       0.33.1. So wait and then remove this.
+  mpv = prev.wrapMpv mpv {
-  mpv-git = prev.mpv-unwrapped.overrideAttrs (old: {
-    version = "0.34.0";
-    src = builtins.fetchGit {
-      url = "https://github.com/mpv-player/mpv.git";
-      ref = "master";
-      rev = "0b56e1c00a57fdb767674462c299a5c973a9e373";
-    };
-    patches = [];
-  });
-in {
-  mpv = prev.wrapMpv mpv-git {
     # Prevent the need for prefixing mpv with DRI_PRIME=1
     extraMakeWrapperArgs = [
       "--set" "DRI_PRIME" "1"
     ];
-  }; 
+  };
+  */ 
 
   gajim = prev.gajim.overrideAttrs (old: {
     # Enable notification sounds

packages/applications/networking/instant-messengers/gajim/default.nix

@@ -19,14 +19,14 @@
 }:
 
 let
-  commit = "2804e759eee439eb5d660368358b685a3c0b4110";
+  commit = "b3449635ac737d7c87640d0cdae93f1423571b97";
 in python3.pkgs.buildPythonApplication rec {
   pname = "gajim";
   version = "1.4.0";
   
   src = fetchurl {
     url = "https://dev.gajim.org/gajim/gajim/-/archive/${commit}/gajim-${commit}.tar.gz";
-    sha256 = "sha256-G5nvLlkEU89uAQZuYlZrPa0ycR7kx67sOLmUgORhNJw=";
+    sha256 = "sha256-9FTuZKhd0lC1r3nEQlqzBBQ5gyp3H/rpwUpN6+eDAL8=";
   };
 
   buildInputs = [

packages/default.nix

@@ -54,7 +54,6 @@ key-mapper = prev.callPackage ./tools/games/key-mapper {};
 
   sddm-sugar-dark = prev.callPackage ./sddm-sugar-dark {};
   
-  iptsd = prev.callPackage ./tools/daemons/iptsd {};
   surface-control = prev.callPackage ./tools/system/surface-control {};
 
   trackma = prev.callPackage ./tools/video/trackma {};

packages/tools/daemons/iptsd/default.nix

@@ -1,42 +0,0 @@
-{
-  stdenv, lib
-, fetchFromGitHub
-, meson, cmake, ninja, pkg-config
-, inih, systemd
-}:
-
-stdenv.mkDerivation rec {
-  pname = "iptsd";
-  version = "0.4";
-
-  src = fetchFromGitHub {
-    owner = "linux-surface";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "0bh7rr37yck82g41dw2xcfkmyp1ncd27n1slb8xlknp7vs9f10qa";
-  };
-
-  mesonFlags = [
-    "-Dsample_config=false"
-    "-Ddebug_tool=false"
-  ];
-  
-  patches = [
-    ./meson.patch
-  ];
-
-  postPatch = ''
-    sed -e "s|@UDEVRULESDIR@|$out/lib/udev/rules.d/|" --in-place meson.build
-  '';
-  
-  nativeBuildInputs = [ meson cmake ninja pkg-config ];
-  buildInputs = [ inih systemd ];
-
-  meta = with lib; {
-    homepage = "https://github.com/linux-surface/iptsd";
-    description = "Userspace daemon for Intel Precise Touch & Stylus";
-    license = licenses.gpl2;
-    maintainers = [];
-    platforms = platforms.linux;
-  };
-}

packages/tools/daemons/iptsd/meson.patch

@@ -1,32 +0,0 @@
-diff --git a/meson.build b/meson.build
-index b74a177..ca41ba3 100644
---- a/meson.build
-+++ b/meson.build
-@@ -104,18 +104,19 @@ configure_file(
- service_manager = get_option('service_manager')
- if service_manager.contains('systemd')
- 	systemd = dependency('systemd')
--	unitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir')
-+	#unitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir')
- 
- 	udev = dependency('udev')
--	udevdir = udev.get_pkgconfig_variable('udevdir')
--	rulesdir = join_paths(udevdir, 'rules.d')
-+	#udevdir = udev.get_pkgconfig_variable('udevdir')
-+	#udevdir = '@UDEVDIR@';
-+	#rulesdir = join_paths('@UDEVDIR@', 'rules.d')
- 
--	install_data(
--		join_paths(meson.current_build_dir(), 'iptsd.service'),
--		install_dir: unitdir
--	)
-+########install_data(
-+########	join_paths(meson.current_build_dir(), 'iptsd.service'),
-+########	install_dir: unitdir
-+########)
- 
--	install_data('etc/udev/50-ipts.rules', install_dir: rulesdir)
-+	install_data('etc/udev/50-ipts.rules', install_dir: '@UDEVRULESDIR@')
- endif
- 
- if service_manager.contains('openrc')