Merge branch 'stableconfig' into trunk

flake.lock

@@ -9,11 +9,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1774186997,
+        "lastModified": 1779903856,
-        "narHash": "sha256-hyNVlhAqmwcBPl7XRkxbGcMt1BfCOdvuEfBDUf0k8Oo=",
+        "narHash": "sha256-uRShMtD6xW3ZKZbCQ6sDzKWEnbBXUg3IGfOARYogKhg=",
         "owner": "ezKEa",
         "repo": "aagl-gtk-on-nix",
-        "rev": "546e95f7ec74892a31f883a10b1723c35f2c2edd",
+        "rev": "50671fc7f29d686f63ef34b603320d44ad7f2d29",
         "type": "github"
       },
       "original": {
@@ -46,11 +46,11 @@
     "cachyos-kernel": {
       "flake": false,
       "locked": {
-        "lastModified": 1776608760,
+        "lastModified": 1779781360,
-        "narHash": "sha256-ehDv8bF7k/2Kf4b8CCoSm51U/MOoFuLsRXqe5wZ57sE=",
+        "narHash": "sha256-02SR7VL4wc57NCVMhyVgz6/SVfyGv7mc4h+SmgR2I8g=",
         "owner": "CachyOS",
         "repo": "linux-cachyos",
-        "rev": "7e06e29005853bbaaa3b1c1067f915d6e0db728a",
+        "rev": "c7cb822e8ee91d993052becf2661b6f26f98eaa2",
         "type": "github"
       },
       "original": {
@@ -62,11 +62,11 @@
     "cachyos-kernel-patches": {
       "flake": false,
       "locked": {
-        "lastModified": 1776680283,
+        "lastModified": 1779618819,
-        "narHash": "sha256-wSHtct0KwbhFh9xYYp1ABaBsHE/K/1+oyrqHbIdiWFE=",
+        "narHash": "sha256-/cGZZCyJZS1QATHi+/2Q32NkjrYN2N2PpgFP8Ak4FJc=",
         "owner": "CachyOS",
         "repo": "kernel-patches",
-        "rev": "21c93f820124a8e7046f1e358739e1a14f6b700b",
+        "rev": "668b466fb461409329425b50c4a9d8d2c022a739",
         "type": "github"
       },
       "original": {
@@ -196,11 +196,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1775087534,
+        "lastModified": 1778716662,
-        "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
+        "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
+        "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
         "type": "github"
       },
       "original": {
@@ -313,11 +313,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776777932,
+        "lastModified": 1779969295,
-        "narHash": "sha256-0R3Yow/NzSeVGUke5tL7CCkqmss4Vmi6BbV6idHzq/8=",
+        "narHash": "sha256-HwIJ3tOcwSMiV75L7KqJXciXR9UfT+d7rwOZMX7cTnA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "5d5640599a0050b994330328b9fd45709c909720",
+        "rev": "61e2c9659324181e0f0ed911958c536333b1d4f6",
         "type": "github"
       },
       "original": {
@@ -334,11 +334,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776184304,
+        "lastModified": 1778805320,
-        "narHash": "sha256-No6QGBmIv5ChiwKCcbkxjdEQ/RO2ZS1gD7SFy6EZ7rc=",
+        "narHash": "sha256-nGFJ01m2CTBKD4ABtcY4vLhHrRN91LKr/pn41PcU78A=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3c7524c68348ef79ce48308e0978611a050089b2",
+        "rev": "9846abe15e7d0d36b8acbd4d05f2b87461744c92",
         "type": "github"
       },
       "original": {
@@ -379,14 +379,14 @@
         "cachyos-kernel-patches": "cachyos-kernel-patches",
         "flake-compat": "flake-compat_3",
         "flake-parts": "flake-parts_2",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1776710308,
+        "lastModified": 1779910731,
-        "narHash": "sha256-rrdCcEXukj2CDjsiOVPYb9LpTKzB89sIicBqoOBK3Xs=",
+        "narHash": "sha256-BSu/X9EyAyAPOjXsuwED4j4IeduP/5KVjTwiQSLkdik=",
         "owner": "xddxdd",
         "repo": "nix-cachyos-kernel",
-        "rev": "8c8219b1f4822932baea710948da7963f50e9739",
+        "rev": "a2cdbecf6abb1a1180bf9fe5c3028125416621f1",
         "type": "github"
       },
       "original": {
@@ -404,11 +404,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776692876,
+        "lastModified": 1777732699,
-        "narHash": "sha256-7Q05rUgwbkJnjxIJyi8bHUG+XnyZqLxFJz7c8RncpeU=",
+        "narHash": "sha256-2uX/XtOWZ/oy2rerRynVhqVA//ZXZ3Fo60PikLHEPQc=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "51b302c28dbf904a5c341be005eebe0779cf4f16",
+        "rev": "5482f113fd31ebac131d1ebeb2ae90bf0d5e41f5",
         "type": "github"
       },
       "original": {
@@ -420,27 +420,27 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1744536153,
+        "lastModified": 1779894193,
-        "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
+        "narHash": "sha256-2PixoQSj9hdtoXTu0ZxdI0cmAE6GUUjCODG+rtC1wDc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
+        "rev": "a09ffe51cfdc37950f14286593605ce64f76cc93",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
+        "ref": "nixos-unstable-small",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1774748309,
+        "lastModified": 1777168982,
-        "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=",
+        "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "333c4e0545a6da976206c74db8773a1645b5870a",
+        "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14",
         "type": "github"
       },
       "original": {
@@ -451,27 +451,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1776635459,
+        "lastModified": 1779560665,
-        "narHash": "sha256-3UVWm751p/8VAY1Mq+DgSTCv9HpMmdB2byhnRrVKflk=",
+        "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8d8538e67e516362d9d09ee5d3ce73dce944612b",
+        "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable-small",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1776548001,
-        "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc",
         "type": "github"
       },
       "original": {
@@ -516,23 +500,25 @@
         "lanzaboote": "lanzaboote",
         "nix-cachyos-kernel": "nix-cachyos-kernel",
         "nixos-wsl": "nixos-wsl",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_2",
         "snowfall-lib": "snowfall-lib",
         "sops-nix": "sops-nix",
-        "trilium-next-pr": "trilium-next-pr",
         "zen-browser": "zen-browser"
       }
     },
     "rust-overlay": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "aagl",
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1770952264,
+        "lastModified": 1777605393,
-        "narHash": "sha256-CjymNrJZWBtpavyuTkfPVPaZkwzIzGaf0E/3WgcwM14=",
+        "narHash": "sha256-Hjp0VOOHgHcTrX23iVvnfAudPcuCmfkfpQNFwv2v/ks=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "ec6a3d5cdf14bb5a1dd03652bd3f6351004d2188",
+        "rev": "ff88db34cfa486fc4964a6991cab1678d82eee8c",
         "type": "github"
       },
       "original": {
@@ -591,11 +577,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776771786,
+        "lastModified": 1777944972,
-        "narHash": "sha256-DRFGPfFV6hbrfO9a1PH1FkCi7qR5FgjSqsQGGvk1rdI=",
+        "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=",
         "owner": "mic92",
         "repo": "sops-nix",
-        "rev": "bef289e2248991f7afeb95965c82fbcd8ff72598",
+        "rev": "c591bf665727040c6cc5cb409079acb22dcce33c",
         "type": "github"
       },
       "original": {
@@ -634,22 +620,6 @@
         "type": "github"
       }
     },
-    "trilium-next-pr": {
-      "locked": {
-        "lastModified": 1736678965,
-        "narHash": "sha256-2A687i3Rq0/wqJVvpgaiRPWcfnBBuBhPjKaT8cnd7o0=",
-        "owner": "FliegendeWurst",
-        "repo": "nixpkgs",
-        "rev": "4fcdf706929246476e52e960760b6643cb8395c4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "FliegendeWurst",
-        "ref": "trilium-next",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "zen-browser": {
       "inputs": {
         "home-manager": "home-manager_2",
@@ -658,11 +628,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776790993,
+        "lastModified": 1779955179,
-        "narHash": "sha256-TxDU/PFKoOYm+ncWXyI2vurKQPqu54gMlCRzx5sGnZc=",
+        "narHash": "sha256-cHrbJ8pZrsFWUTJVk7AxWiEg5eiZptPQxtT0YXMIENo=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "3f4f36b17ceeda27fc4953e8bc29637333508c05",
+        "rev": "c341e3f6516fb1286d25b99d34b111f93028ae87",
         "type": "github"
       },
       "original": {

flake.nix

@@ -30,10 +30,6 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    trilium-next-pr = {
-      url = "github:FliegendeWurst/nixpkgs/trilium-next";
-      # Don't follow nixpkgs as this repo has its own pinned nixpkgs
-    };
     anikki = {
       url = "github:Hion-V/Anikki-flake";
       inputs.nixpkgs.follows = "nixpkgs";

modules/nixos/desktop-environment/default.nix

@@ -96,6 +96,16 @@ in {
     (lib.mkIf cfg.kde.enable {
       services.xserver.enable = true;
       services.desktopManager.plasma6.enable = true;
+      environment.sessionVariables = {
+        # Forces KWin to use the legacy DRM interface so "Allow Tearing" actually works
+        # KWIN_DRM_NO_AMS = "1";
+        # Disables the new triple buffering in Plasma 6.1+ to reduce latency
+        # KWIN_DRM_DISABLE_TRIPLE_BUFFERING = "1";
+        # KWIN_USE_HWCURSOR = "0";
+        # KWIN_DRM_USE_EGL_STREAMS = "0";
+        # MESA_VK_WSI_PRESENT_MODE = "immediate";
+        # vblank_mode = "0";
+      };
       environment.systemPackages = with pkgs; [
         kdePackages.qtwebsockets
         kdePackages.qtwebchannel

modules/nixos/steam/default.nix

@@ -33,11 +33,11 @@
       lutris
       vkd3d
       dxvk
-      corefonts
       protontricks
       mangohud
       vkbasalt
       gamescope
+      corefonts
     ];
 
     hardware.uinput.enable = true;
@@ -69,6 +69,7 @@
       package = pkgs.steam.override {
         extraPkgs = pkgs: with pkgs; [
           gamemode
+          noto-fonts-color-emoji
         ];
         extraEnv = {
           # SDL_VIDEODRIVER = "wayland,x11";

overlays/mbedtls-fix/default.nix

@@ -1,11 +0,0 @@
-{ ... }:
-
-final: prev: {
-  mbedtls_2 = prev.mbedtls_2.overrideAttrs (oldAttrs: {
-    doCheck = false;  # Skip failing PSA crypto tests
-  });
-  
-  haxe = prev.haxe.overrideAttrs (oldAttrs: {
-    buildInputs = (oldAttrs.buildInputs or []) ++ [ final.mbedtls_2 ];
-  });
-}

overlays/mesa-gcc/default.nix

@@ -2,13 +2,13 @@
 
 final: prev: {
   mesa = (prev.mesa.overrideAttrs (old: rec {
-    version = "git-unstable-2026-04-02";
+    version = "git-unstable-2026-05-07";
     src = prev.fetchFromGitLab {
       domain = "gitlab.freedesktop.org";
       owner = "mesa";
       repo = "mesa";
-      rev = "72e9f9a760a5dd81a74497f1daef054af1b6b827";
+      rev = "0f75fa5bfd29770128a412f1fcf5c4121f95e1bb";
-      hash = "sha256-81V5RdLSLYeGJ/wh5H8L6vq+QdR6yMkJxDV+6Yf5FPk=";
+      hash = "sha256-9sqgro3Y+yctcueHEO0hNmySLNn9F1HP3lPqcIow0+k=";
     };
     patches = [];
     buildInputs = old.buildInputs ++ (with prev.llvmPackages_21; [ 

overlays/openldap-testfailure-fix/default.nix

@@ -0,0 +1,7 @@
+{ ... }:
+
+final: prev: {
+  openldap = prev.openldap.overrideAttrs {
+    doCheck = !prev.stdenv.hostPlatform.isi686;
+  };
+}

systems/x86_64-linux/drivebystation-nix/configuration.nix

@@ -47,9 +47,9 @@
 
   services = {
     # Enable Gnome Session
-    displayManager.gdm.enable = true;
+    displayManager.gdm.enable = false;
-    displayManager.sddm.enable = false;
+    displayManager.sddm.enable = true;
-    displayManager.sddm.wayland.enable = false;
+    displayManager.sddm.wayland.enable = true;
     displayManager.cosmic-greeter.enable = false;
     displayManager.defaultSession = "gnome";
     
@@ -140,6 +140,7 @@
     htop
     rivalcfg
     blender
+    freecad
     reaper
     discord
     betterdiscordctl
@@ -238,6 +239,23 @@
   # Or disable the firewall altogether.
   # networking.firewall.enable = false;
 
+  fonts = {
+    packages = with pkgs; [
+      noto-fonts
+      noto-fonts-color-emoji
+    ];
+    fontconfig = {
+      enable = true;
+
+      defaultFonts = {
+        sansSerif = [ "DejaVu Sans" "Noto Color Emoji" ];
+        serif = [ "DejaVu Serif" "Noto Color Emoji" ];
+        monospace = [ "DejaVu Sans Mono" "Noto Color Emoji" ];
+        emoji = [ "Noto Color Emoji" ];
+      };
+    };
+  };
+
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave

systems/x86_64-linux/drivebystation-nix/default.nix

@@ -69,7 +69,6 @@ in
           # Packages from inputsq
           inputs.game-of-life.packages.x86_64-linux.default
           inputs.zen-browser.packages.x86_64-linux.default
-          inputs.trilium-next-pr.legacyPackages.x86_64-linux.trilium-next-desktop
           inputs.anikki.packages.x86_64-linux.default
           # We want flatpak support
           flatpak
@@ -100,16 +99,20 @@ in
       # Open ports in the firewall.
       networking.firewall.allowedTCPPorts = [
         59010 #SoundWireServer
+        5001
+        11434
         3389 #RDP
         22 #ssh
       ];
       networking.firewall.allowedUDPPorts = [
         59010 #SoundWireServer
+        5001
+        11434
         3389 #RDP
         22 #ssh
       ];
       # Or disable the firewall altogether.
-      # networking.firewall.enable = false;
+      networking.firewall.enable = false;
 
 
       # Install firefox.