From 28d295b57435801e43705223cd6f0ba2b8674adc Mon Sep 17 00:00:00 2001
From: John Locke <john@freelock.com>
Date: Fri, 22 Mar 2024 16:26:52 -0700
Subject: [PATCH] Desktop updates

---
 desktop/default.nix        |  3 ---
 desktop/dev.nix            | 10 +++++++++-
 desktop/include/compat.nix |  5 +----
 desktop/include/i18n.nix   |  2 +-
 desktop/overlays.nix       | 13 +++++++++++++
 5 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 desktop/overlays.nix

diff --git a/desktop/default.nix b/desktop/default.nix
index c0f57b5..f6afc6d 100644
--- a/desktop/default.nix
+++ b/desktop/default.nix
@@ -1,8 +1,5 @@
 
 {
-  pkgs,
-  ...
-}  @ args: {
 
   imports = [
     ../base
diff --git a/desktop/dev.nix b/desktop/dev.nix
index d6d0553..9a9eb4f 100644
--- a/desktop/dev.nix
+++ b/desktop/dev.nix
@@ -1,4 +1,10 @@
-{pkgs, ...}: {
+{config, pkgs, lib, ...}:
+{
+  nixpkgs.config = {
+    packageOverrides = pkgs: {
+      inherit mergedPkgs;
+    };
+  };
 
   environment.systemPackages = with pkgs; [
     ddev
@@ -9,6 +15,8 @@
     vscode
   ];
 
+  # increase inotify limits - https://intellij-support.jetbrains.com/hc/en-us/articles/15268113529362-Inotify-Watches-Limit-Linux
+  boot.kernel.sysctl = { "fs.inotify.max_user_watches" = 1048576; };
 
   # DDev setup
   # Install & enable docker.
diff --git a/desktop/include/compat.nix b/desktop/include/compat.nix
index 3112f13..9e00a6c 100644
--- a/desktop/include/compat.nix
+++ b/desktop/include/compat.nix
@@ -1,7 +1,4 @@
-{
-  pkgs,
-  ...
-}  @ args: {
+{ pkgs, ... }: {
 
   # AppImage support
   boot.binfmt.registrations.appimage = {
diff --git a/desktop/include/i18n.nix b/desktop/include/i18n.nix
index d6e25c7..70ea9a7 100644
--- a/desktop/include/i18n.nix
+++ b/desktop/include/i18n.nix
@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{
 
   # Configure keymap in X11
   services.xserver.xkb = {
diff --git a/desktop/overlays.nix b/desktop/overlays.nix
new file mode 100644
index 0000000..83a2eb6
--- /dev/null
+++ b/desktop/overlays.nix
@@ -0,0 +1,13 @@
+# overlays.nix
+
+{ self, nixpkgs, myNixpkgs }:
+
+let
+  myOverlay = final: prev: {
+    # Replace 'examplePackage' with the package you want to override
+    jetbrains.phpstorm = myNixpkgs.jetbrains.phpstorm;
+  };
+in
+{
+  overlays = [ myOverlay ];
+}