add workaround for vscode freezing acer

This reverts commit 6fe528e509.

flake.lock

@@ -44,11 +44,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776913134,
+        "lastModified": 1778105658,
-        "narHash": "sha256-/9vfRJTDh9Y4Duo862rzDqBIN7cEFTsAffVZ/UvxVas=",
+        "narHash": "sha256-PxurBCejSjB99wxkpiPTUi4aHSYlfiHzrCwAGuDTRb8=",
         "owner": "sadjow",
         "repo": "claude-code-nix",
-        "rev": "20e4b82d08d97bf45d78f32c31eb3509db1c2f2a",
+        "rev": "f065f848c6a11f93124b09164fa92e8253a0264d",
         "type": "github"
       },
       "original": {
@@ -58,33 +58,6 @@
         "type": "github"
       }
     },
-    "cppnix": {
-      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "flake-parts": "flake-parts",
-        "git-hooks-nix": "git-hooks-nix",
-        "nixpkgs": [
-          "nixbsd",
-          "nixpkgs"
-        ],
-        "nixpkgs-23-11": "nixpkgs-23-11",
-        "nixpkgs-regression": "nixpkgs-regression"
-      },
-      "locked": {
-        "lastModified": 1771531533,
-        "narHash": "sha256-E6uWPzQoMpzUb+2kcrxaYsfhUXjyIAoTpI6DPtbe1Y0=",
-        "owner": "rhelmot",
-        "repo": "nix",
-        "rev": "d623444c12428e69a3269d3b4b40200f2b4618fc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rhelmot",
-        "ref": "freebsd-safe",
-        "repo": "nix",
-        "type": "github"
-      }
-    },
     "crane": {
       "locked": {
         "lastModified": 1765145449,
@@ -132,36 +105,6 @@
       }
     },
     "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1733328505,
-        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_3": {
-      "locked": {
-        "lastModified": 1733328505,
-        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
-        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
-        "revCount": 69,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
-      }
-    },
-    "flake-compat_4": {
       "flake": false,
       "locked": {
         "lastModified": 1627913399,
@@ -177,28 +120,6 @@
         "type": "github"
       }
     },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "nixbsd",
-          "cppnix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1733312601,
-        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -232,41 +153,6 @@
         "type": "github"
       }
     },
-    "git-hooks-nix": {
-      "inputs": {
-        "flake-compat": [
-          "nixbsd",
-          "cppnix"
-        ],
-        "gitignore": [
-          "nixbsd",
-          "cppnix"
-        ],
-        "nixpkgs": [
-          "nixbsd",
-          "cppnix",
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": [
-          "nixbsd",
-          "cppnix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1734279981,
-        "narHash": "sha256-NdaCraHPp8iYMWzdXAt5Nv6sA3MUzlCiGiR586TCwo0=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "aa9f40c906904ebd83da78e7f328cd8aeaeae785",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "type": "github"
-      }
-    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -296,11 +182,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776964438,
+        "lastModified": 1778144356,
-        "narHash": "sha256-AF0cby9Xuijr5qaFpYKbm1mExV956Hk233bel6QxpFw=",
+        "narHash": "sha256-dGM+QCstz/DyLB68+JK5GWyMx4QSqmOJEVgZmy63d/g=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e09259dd2e147d35ef889784b51e89b0a10ffe15",
+        "rev": "e4419d3123b780d5f4c0bceeace450424387638c",
         "type": "github"
       },
       "original": {
@@ -334,24 +220,20 @@
         "type": "github"
       }
     },
-    "mini-tmpfiles": {
+    "linux-ntfs": {
-      "inputs": {
+      "flake": false,
-        "nixpkgs": [
-          "nixbsd",
-          "nixpkgs"
-        ]
-      },
       "locked": {
-        "lastModified": 1742754557,
+        "lastModified": 1778111793,
-        "narHash": "sha256-nGxgiNhA94eSl8jcQwCboJ5Ed132z8yrFdOoT+rf8bE=",
+        "narHash": "sha256-E+f1utc2Az4ZmqvkZ8lDgHpXsheJobUMbLff1vdpQHE=",
-        "owner": "nixos-bsd",
+        "owner": "Lumpiasty",
-        "repo": "mini-tmpfiles",
+        "repo": "linux-ntfs",
-        "rev": "534ee577692c7092fdcd035f89bc29b663c6f9ca",
+        "rev": "7fbf82056e26d99bfa4d5aab87ce287cd8c8cbef",
         "type": "github"
       },
       "original": {
-        "owner": "nixos-bsd",
+        "owner": "Lumpiasty",
-        "repo": "mini-tmpfiles",
+        "ref": "main",
+        "repo": "linux-ntfs",
         "type": "github"
       }
     },
@@ -371,6 +253,26 @@
         "type": "github"
       }
     },
+    "nix-skills": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1775452536,
+        "narHash": "sha256-1MjzL/U5OtALBmsel4YHVSK9jr2c/YP4eXfi7lA5C+o=",
+        "owner": "sudosubin",
+        "repo": "nix-skills",
+        "rev": "c2d1958a5cdd7ee83f552c046fbc7cb43e8171e4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "sudosubin",
+        "repo": "nix-skills",
+        "type": "github"
+      }
+    },
     "nix-sweep": {
       "inputs": {
         "cf": "cf",
@@ -380,11 +282,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776294562,
+        "lastModified": 1777567981,
-        "narHash": "sha256-3i0WOmrYlRoAyjPpdyV2jiuUQhL8+NkSBvcdDwHt+ds=",
+        "narHash": "sha256-8ZVUoerhitQdBRtQalX0US1Nmc4c9cRGDhBpfAPH51w=",
         "owner": "jzbor",
         "repo": "nix-sweep",
-        "rev": "908c739dad8ab5c6ab737cf417efcbbec126987a",
+        "rev": "b3f71b38917ec9701a505ae3caa6907ccc6b5380",
         "type": "github"
       },
       "original": {
@@ -394,33 +296,13 @@
         "type": "github"
       }
     },
-    "nixbsd": {
-      "inputs": {
-        "cppnix": "cppnix",
-        "flake-compat": "flake-compat_3",
-        "mini-tmpfiles": "mini-tmpfiles",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1777600581,
-        "narHash": "sha256-DbKmDIFNLqR8xXnSepJPr29FngkiPDa8+vAErZRrQUA=",
-        "path": "/home/user/Projects/nixbsd",
-        "type": "path"
-      },
-      "original": {
-        "path": "/home/user/Projects/nixbsd",
-        "type": "path"
-      }
-    },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1776830795,
+        "lastModified": 1778143761,
-        "narHash": "sha256-PAfvLwuHc1VOvsLcpk6+HDKgMEibvZjCNvbM1BJOA7o=",
+        "narHash": "sha256-lkesY6x2X2qxlqLM7CT2iM/0rP2JB7fruPN3h8POXmI=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "72674a6b5599e844c045ae7449ba91f803d44ebc",
+        "rev": "3bcaa367d4c550d687a17ac792fd5cda214ee871",
         "type": "github"
       },
       "original": {
@@ -432,11 +314,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1776548001,
+        "lastModified": 1777954456,
-        "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=",
+        "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc",
+        "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
         "type": "github"
       },
       "original": {
@@ -446,41 +328,46 @@
         "type": "github"
       }
     },
-    "nixpkgs-23-11": {
+    "nixpkgs-linuxeol": {
       "locked": {
-        "lastModified": 1717159533,
+        "lastModified": 1776914381,
-        "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=",
+        "narHash": "sha256-F4YjgKNs1kEIfTsinPDusep2Y+GDFK+3R2AujSZQ18M=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
+        "rev": "162f04bf3dd222187388bc990a8678170d594419",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
+        "rev": "162f04bf3dd222187388bc990a8678170d594419",
         "type": "github"
       }
     },
-    "nixpkgs-regression": {
+    "ntfsplus": {
+      "inputs": {
+        "linux-ntfs": "linux-ntfs",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
       "locked": {
-        "lastModified": 1643052045,
+        "lastModified": 1774317576,
-        "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
+        "narHash": "sha256-HSDFaDLvfS/NqJlXbHh9135DEpqH6JrNuWqbu3YPcTg=",
-        "owner": "NixOS",
+        "owner": "cmspam",
-        "repo": "nixpkgs",
+        "repo": "ntfsplus-flake",
-        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
+        "rev": "e22d1bcbac31b4e6484d32c503396e8184650215",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "cmspam",
-        "repo": "nixpkgs",
+        "repo": "ntfsplus-flake",
-        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
         "type": "github"
       }
     },
     "peerix": {
       "inputs": {
-        "flake-compat": "flake-compat_4",
+        "flake-compat": "flake-compat_2",
         "flake-utils": "flake-utils_2",
         "nixpkgs": [
           "nixpkgs"
@@ -553,10 +440,12 @@
         "home-manager": "home-manager",
         "lanzaboote": "lanzaboote",
         "nix-flatpak": "nix-flatpak",
+        "nix-skills": "nix-skills",
         "nix-sweep": "nix-sweep",
-        "nixbsd": "nixbsd",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
+        "nixpkgs-linuxeol": "nixpkgs-linuxeol",
+        "ntfsplus": "ntfsplus",
         "peerix": "peerix",
         "plasma-manager": "plasma-manager"
       }

flake.nix

@@ -3,6 +3,7 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs-linuxeol.url = "github:NixOS/nixpkgs/162f04bf3dd222187388bc990a8678170d594419";
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     home-manager = {
       url = "github:nix-community/home-manager/master";
@@ -34,8 +35,13 @@
       url = "github:Lumpiasty/acer-wmi-ext/main";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    nixbsd = {
+    ntfsplus = {
-      url = "path:/home/user/Projects/nixbsd";
+      url = "github:cmspam/ntfsplus-flake";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.linux-ntfs.url = "github:Lumpiasty/linux-ntfs/main";
+    };
+    nix-skills = {
+      url = "github:sudosubin/nix-skills";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
@@ -45,13 +51,11 @@
       nixosConfigurations = 
         let
           mkNixosSystem = import lib/mkNixosSystem.nix inputs;
-          mkNixbsdSystem = import lib/mkNixbsdSystem.nix inputs;
         in
           with nixos-hardware.nixosModules; {
             x260 = mkNixosSystem lenovo-thinkpad-x260 hosts/x260.nix;
             acer = mkNixosSystem {} hosts/acer.nix;
             gaming-pc = mkNixosSystem {} hosts/gaming-pc.nix;
-            bestieTest = mkNixbsdSystem hosts/bestieTest.nix;
           };
     };
 }

home-modules/dev.nix

@@ -21,6 +21,26 @@
         pkgs.vscode-extensions.arrterian.nix-env-selector
         pkgs.vscode-extensions.jnoortheen.nix-ide
       ];
+      # profiles.default.userSettings = {
+      #   "claudeCode.claudeProcessWrapper" = "${pkgs.claude-code}/bin/claude-code";
+      # };
+      argvSettings = {
+        # https://github.com/microsoft/vscode/issues/262065#issue-3328712020
+        disable-hardware-acceleration = osConfig.networking.hostName == "acer";
+        # If not set, vscode errors out when starting with "argv.json incorrect"
+        enable-crash-reporter = false;
+      };
+    };
+
+    # Just a fixed-location executable that launches claude code
+    # so we can point vscode's extenstion at it, not the nix store path
+    # remove it once we configure vscode using nix
+    home.file.".config/claude-code-wrapper" = {
+      text = ''
+        #!${pkgs.stdenv.shell}
+        exec ${pkgs.claude-code}/bin/claude "$@"
+      '';
+      executable = true;
     };
 
     home.packages = with pkgs; [
@@ -46,16 +66,6 @@
       nodejs_24
       codex
       claude-code
-      (
-        # Wrapping opencode to set the OPENCODE_ENABLE_EXA environment variable
-        runCommand "opencode" {
-          buildInputs = [ makeWrapper ];
-        } ''
-          mkdir -p $out/bin
-          makeWrapper ${pkgs.opencode}/bin/opencode $out/bin/opencode \
-            --set OPENCODE_ENABLE_EXA "1"
-          ''
-      )
       winbox4
       amdgpu_top
       dua
@@ -114,5 +124,22 @@
         fi
       ''
     );
+
+    programs.opencode = {
+      enable = true;
+      package = (
+        # Wrapping opencode to set the OPENCODE_ENABLE_EXA environment variable
+        pkgs.runCommand "opencode" {
+          buildInputs = [ pkgs.makeWrapper ];
+        } ''
+          mkdir -p $out/bin
+          makeWrapper ${pkgs.opencode}/bin/opencode $out/bin/opencode \
+            --set OPENCODE_ENABLE_EXA "1"
+          ''
+      );
+      skills = with pkgs.skills; {
+        caveman = majiayu000."claude-skill-registry".caveman + "/";
+      };
+    };
   };
 }

home-modules/pc.nix

@@ -6,7 +6,16 @@
   config = lib.mkIf (config.lumpiastyHome.enablePcApps && osConfig.lumpiasty.pc) {
     home.packages = with pkgs; [
       vesktop
-      spotify
+      # Manual update, not yet in nixpkgs as for now
+      (spotify.overrideAttrs (old: rec {
+        version = "1.2.86.502.g8cd7fb22";
+        rev = "94";
+        src = fetchurl {
+          name = "spotify-${version}-${rev}.snap";
+          url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
+          hash = "sha256-XhwyaObck6viIvDRXEztlSLja5fsfw5HgHUUQzMehLI=";
+        };
+      }))
       pass-wayland
       teamspeak6-client
       easyeffects

hosts/acer.nix

@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, pkgs, nixpkgs-linuxeol, ... }:
 
 rec {
   # Identity
@@ -23,7 +23,7 @@ rec {
 
   # Kernel
   # boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
-  boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_19;
+  boot.kernelPackages = nixpkgs-linuxeol.legacyPackages."x86_64-linux".linuxKernel.packages.linux_6_19;
   boot.zfs.package = pkgs.zfs_unstable;
 
   # Swap

hosts/bestieTest.nix

@@ -1,30 +0,0 @@
-{ config, pkgs, lib, ... }: {
-  nixpkgs.hostPlatform = "x86_64-freebsd";
-  nixpkgs.config.allowUnsupportedSystem = true;
-
-  users.users.root.initialPassword = "toor";
-
-  networking.dhcpcd.wait = "background";
-
-  users.users.bestie = {
-    isNormalUser = true;
-    description = "your bestie";
-    extraGroups = [ "wheel" ];
-    inherit (config.users.users.root) initialPassword;
-  };
-
-  services.sshd.enable = true;
-  boot.loader.stand-freebsd.enable = true;
-
-  fileSystems."/" = {
-    device = "/dev/gpt/nixos";
-    fsType = "ufs";
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/msdosfs/ESP";
-    fsType = "msdosfs";
-  };
-
-  virtualisation.vmVariant.virtualisation.diskImage = "./${config.system.name}.qcow2";
-}

hosts/gaming-pc.nix

@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, pkgs, nixpkgs-linuxeol, ... }:
 
 {
   # Identity
@@ -53,7 +53,7 @@
 
   # Kernel
   # boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
-  boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_19;
+  boot.kernelPackages = nixpkgs-linuxeol.legacyPackages."x86_64-linux".linuxKernel.packages.linux_6_19;
 
   # Swap
   zramSwap = {
@@ -94,7 +94,7 @@
       "/var/games" = 
         {
           device = "/dev/disk/by-uuid/8A3094A230949733"; # "Shared" NTFS partition
-          fsType = "ntfs-3g";
+          fsType = "ntfs";
           options = [
             "uid=1000" "gid=100" # My user account
             "nofail" # Don't fail boot if failed to mount because windows left it dirty
@@ -102,6 +102,11 @@
         };
     };
 
+  # Use ntfs-plus instead driver
+  services.ntfsplus.enable = true;
+  # Force disable ntfs-3g driver
+  boot.supportedFilesystems.ntfs = lib.mkForce false;
+
   # Config modules
   lumpiasty = {
     pc = true;
@@ -124,8 +129,14 @@
   };
   services.transmission.enable = lib.mkForce false;
 
+  # programs.steam.enable = true;
+  # programs.steam.gamescopeSession.enable = true;
+
   nix.settings.system-features = [ "gccarch-haswell" ];
   
+  # Local LLaMA.cpp server
+  networking.firewall.allowedTCPPorts = [ 8080 ];
+
   # nixpkgs.hostPlatform = {
   #   system = "x86_64-linux";
   #   gcc.arch = "haswell";

lib/mkNixbsdSystem.nix

@@ -1,60 +0,0 @@
-{
-  self,
-  nixpkgs,
-  nixbsd,
-  home-manager,
-  nix-flatpak,
-  plasma-manager,
-  lanzaboote,
-  claude-code,
-  nix-sweep,
-  peerix,
-  acer-wmi-ext,
-  ...
-}:
-hostConfig:
-
-nixbsd.lib.nixbsdSystem {
-  modules = [
-    # Cross-compile FreeBSD from Linux, builds dispatched to remote builder
-    {
-      nixpkgs.buildPlatform = "x86_64-linux";
-      nixpkgs.config.allowUnsupportedSystem = true;
-      nixpkgs.overlays = [
-        (final: prev: {
-          # No-op emulator for FreeBSD - builds happen on remote builder where binaries run natively
-          freebsdEmulator = prev.runCommand "freebsd-emulator" { } ''
-            mkdir -p $out/bin
-            cat > $out/bin/freebsd-exec << 'SCRIPT'
-            #!/bin/sh
-            exec "$@"
-            SCRIPT
-            chmod +x $out/bin/freebsd-exec
-          '';
-
-          # Override mesonEmulatorHook to not require a real emulator for FreeBSD
-          mesonEmulatorHook =
-            let
-              canExec = prev.stdenv.hostPlatform.canExecute prev.stdenv.targetPlatform;
-              emulatorPath = "${final.freebsdEmulator}/bin/freebsd-exec";
-            in
-            if canExec then
-              prev.mesonEmulatorHook
-            else
-              prev.makeSetupHook
-                {
-                  name = "mesonEmulatorHook";
-                  substitutions = {
-                    crossFile = prev.writeText "cross-file.conf" ''
-                      [binaries]
-                      exe_wrapper = '${prev.lib.escape [ "'" "\\" ] emulatorPath}'
-                    '';
-                  };
-                }
-                "${nixpkgs.outPath}/pkgs/build-support/setup-hooks/meson/emulator-hook.sh";
-        })
-      ];
-    }
-    hostConfig
-  ];
-}

lib/mkNixosSystem.nix

@@ -9,6 +9,9 @@
   nix-sweep,
   peerix,
   acer-wmi-ext,
+  ntfsplus,
+  nix-skills,
+  nixpkgs-linuxeol,
   ...
 }:
 hardwareConfig: hostConfig:
@@ -19,12 +22,14 @@ nixpkgs.lib.nixosSystem {
     inherit nix-flatpak;
     inherit plasma-manager;
     inherit acer-wmi-ext;
+    inherit nixpkgs-linuxeol;
   };
   modules = [
     {
       nixpkgs.overlays = [
         claude-code.overlays.default
         acer-wmi-ext.overlays.default
+        nix-skills.overlays.default
       ];
       nix.settings = {
         substituters = [ "https://claude-code.cachix.org" ];
@@ -36,6 +41,7 @@ nixpkgs.lib.nixosSystem {
     home-manager.nixosModules.home-manager
     nix-sweep.nixosModules.default
     peerix.nixosModules.peerix
+    ntfsplus.nixosModules.default
     ../modules
     hostConfig
   ];

modules/desktop/plasma.nix

@@ -8,7 +8,7 @@
     services.xserver.enable = true;
 
     # Enable the KDE Plasma Desktop Environment.
-    services.displayManager.sddm.enable = true;
+    services.displayManager.plasma-login-manager.enable = true;
     services.desktopManager.plasma6.enable = true;
 
     # Configure keymap in X11

modules/system/nix.nix

@@ -6,48 +6,14 @@ let
     else if config.boot.loader.systemd-boot.enable then 
       config.boot.loader.systemd-boot.configurationLimit
     else null;
-
-  # NixBSD builder VM SSH key (needs to be readable by root/nix-daemon)
-  builderKeyDir = "/etc/nix/builder-keys";
 in 
 {
   nix = {
     daemonIOSchedClass = "idle";
     daemonCPUSchedPolicy = "idle";
     settings.trusted-users = [ "root" "user" ];
-
-    # FreeBSD remote builder VM (NixBSD)
-    distributedBuilds = true;
-    buildMachines = [
-      {
-        hostName = "192.168.122.100";
-        system = "x86_64-freebsd";
-        sshUser = "root";
-        sshKey = "${builderKeyDir}/nixbsd-builder";
-        maxJobs = 8;
-        speedFactor = 1;
-        supportedFeatures = [ "big-parallel" ];
-      }
-    ];
-    settings.builders-use-substitutes = true;
   };
 
-  # Install the builder SSH key where root/nix-daemon can read it
-  system.activationScripts.nixbsd-builder-key = ''
-    mkdir -p ${builderKeyDir}
-    cp /home/user/Projects/nixbsd-flake/keys/builder ${builderKeyDir}/nixbsd-builder
-    chmod 600 ${builderKeyDir}/nixbsd-builder
-    chown root:root ${builderKeyDir}/nixbsd-builder
-  '';
-
-  # Skip host key checking for the local builder VM (keys change on rebuild)
-  programs.ssh.extraConfig = ''
-    Host 192.168.122.100
-      StrictHostKeyChecking no
-      UserKnownHostsFile /dev/null
-      LogLevel ERROR
-  '';
-
   # Clean up nix store from old configurations usinx nix-sweep
   services.nix-sweep = {
     enable = true;

modules/system/nixpkgs.nix

@@ -11,6 +11,6 @@
 
   # Ventoy has some blobs making it insecure
   nixpkgs.config.permittedInsecurePackages = [
-    "ventoy-qt5-1.1.10"
+    "ventoy-qt5-1.1.12"
   ];
 }

modules/system/zfs.nix

@@ -2,9 +2,8 @@
 
 {
   config = lib.mkIf config.boot.zfs.enabled {
-    # Set ARC max to 5% of physical RAM at boot
     systemd.services."zfs-arc-limit" = {
-      description = "Set ZFS ARC max to 5% of physical RAM";
+      description = "Set ZFS ARC max to 20% of physical RAM";
       # Ensure the module is loaded before we write to /sys
       after = [ "systemd-modules-load.service" ];
       # Run early, but it’s fine if ZFS has already imported; the limit still applies
@@ -15,8 +14,8 @@
         # Total RAM in kB
         mem_kb=$(awk '/MemTotal:/ {print $2}' /proc/meminfo)
         echo "DEBUG: Total RAM: $mem_kb kB"
-        # 5%, in bytes
+        # 20%, in bytes
-        arc_max_bytes=$(( mem_kb * 1024 / 100 * 5 ))
+        arc_max_bytes=$(( mem_kb * 1024 / 100 * 20 ))
         echo "DEBUG: Setting ZFS ARC max to: $arc_max_bytes bytes"
         param="/sys/module/zfs/parameters/zfs_arc_max"
         if [ -w "$param" ]; then

overlays/pkgs.nix

@@ -1,4 +1,9 @@
 self: super:
 {
   opencode-claude-auth = super.callPackage ../pkgs/opencode-claude-auth {};
+  # Build failure 08.05.2026
+  # https://github.com/NixOS/nixpkgs/issues/513245#issuecomment-4320293674
+  openldap = super.openldap.overrideAttrs {
+    doCheck = !super.stdenv.hostPlatform.isi686;
+  };
 }