diff --git a/flake.nix b/flake.nix index 92ec82c..5ae661f 100644 --- a/flake.nix +++ b/flake.nix @@ -104,10 +104,6 @@ {nixpkgs.overlays = overlays;} ./hosts/laptop/configuration.nix home-manager.darwinModules.home-manager - hosts.nixosModule - { - networking.stevenBlackHosts.enable = true; - } { home-manager = { useGlobalPkgs = true; diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index ef36590..ddfbde8 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -71,7 +71,7 @@ # minimal dock dock = { autohide = false; - show-process-indicators = false; + show-process-indicators = true; show-recents = true; static-only = true; }; @@ -81,6 +81,25 @@ ShowPathbar = true; FXEnableExtensionChangeWarning = false; }; - # Tab between form controls and F-row that behaves as F1-F12 + + CustomUserPreferences = { + launchd.user.agents.UserKeyMapping.serviceConfig = { + ProgramArguments = [ + "/usr/bin/hidutil" + "property" + "--match" + "{"ProductID":0x0,"VendorID":0x0,"Product":"Apple Internal Keyboard / Trackpad"}" + "--set" + ( + let + # https://developer.apple.com/library/archive/technotes/tn2450/_index.html + caps_lock = "0x700000039"; + escape = "0x700000029"; + in "{"UserKeyMapping":[{"HIDKeyboardModifierMappingDst":${escape},"HIDKeyboardModifierMappingSrc":${caps_lock}},{"HIDKeyboardModifierMappingDst":${caps_lock},"HIDKeyboardModifierMappingSrc":${escape}}]}" + ) + ]; + RunAtLoad = true; + }; + }; }; } diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index 5fe1760..e812412 100644 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -31,6 +31,7 @@ # environment. home.packages = with pkgs; [ + # ghostty.packages.aarch64-darwin.default pyright ruff python312Packages.jedi-language-server