From c3ff3db64f1d98e0cadd930d0f73edf5574a7a8f Mon Sep 17 00:00:00 2001 From: Tobias Ostner Date: Sat, 14 Jun 2025 14:15:51 +0200 Subject: [PATCH] nix flake update --- flake.lock | 18 +++++++++--------- module/configuration.nix | 8 +++----- module/home-manager.nix | 16 ++++++++++++++++ system/darwin.nix | 2 +- 4 files changed, 29 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index febee1d..66e799a 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1746254942, - "narHash": "sha256-Y062AuRx6l+TJNX8wxZcT59SSLsqD9EedAY0mqgTtQE=", + "lastModified": 1749873626, + "narHash": "sha256-1Mc/D/1RwwmDKY59f4IpDBgcQttxffm+4o0m67lQ8hc=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "760a11c87009155afa0140d55c40e7c336d62d7a", + "rev": "2f140d6ac8840c6089163fb43ba95220c230f22b", "type": "github" }, "original": { @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1746413188, - "narHash": "sha256-i6BoiQP0PasExESQHszC0reQHfO6D4aI2GzOwZMOI20=", + "lastModified": 1749821119, + "narHash": "sha256-X3WAS322EsebI4ohJcXhKpiyG1v+7wE4VOiXy1pxM/c=", "owner": "nix-community", "repo": "home-manager", - "rev": "8a318641ac13d3bc0a53651feaee9560f9b2d89a", + "rev": "79dfd9aa295e53773aad45480b44c131da29f35b", "type": "github" }, "original": { @@ -61,11 +61,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746328495, - "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=", + "lastModified": 1749794982, + "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e", + "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", "type": "github" }, "original": { diff --git a/module/configuration.nix b/module/configuration.nix index 95f6983..016c723 100644 --- a/module/configuration.nix +++ b/module/configuration.nix @@ -1,4 +1,4 @@ -{ hostname }: +{ hostname, username }: { nix = { optimise.automatic = true; @@ -65,10 +65,8 @@ }; system = { - activationScripts.postUserActivation.text = '' - /System/Library/PrivateFrameworks/SystemAdministration.framework/Resources/activateSettings -u - defaults write com.apple.symbolichotkeys AppleSymbolicHotKeys -dict-add 70 'enabled' - ''; + + primaryUser = username; defaults = { dock = { diff --git a/module/home-manager.nix b/module/home-manager.nix index efff2f2..0e0f913 100644 --- a/module/home-manager.nix +++ b/module/home-manager.nix @@ -113,6 +113,22 @@ }; }; + launchd.agents.disable-hotkey = { + enable = true; + config = { + ProgramArguments = [ + "defaults" + "write" + "com.apple.symbolichotkeys" + "AppleSymbolicHotKeys" + "-dict-add" + "70" + "enabled" + ]; + RunAtLoad = true; + }; + }; + xdg.configFile."aerospace/aerospace.toml".text = builtins.readFile ../config/aerospace/aerospace.toml; xdg.configFile."ghostty/config".text = builtins.readFile ../config/ghostty/config; } diff --git a/system/darwin.nix b/system/darwin.nix index 71bac40..35db3fc 100644 --- a/system/darwin.nix +++ b/system/darwin.nix @@ -7,7 +7,7 @@ , extraHomeManagerModules ? [ ] }: let - systemConfig = import ../module/configuration.nix { inherit hostname; }; + systemConfig = import ../module/configuration.nix { inherit hostname username; }; homeManagerConfig = import ../module/home-manager.nix { inherit email; }; in inputs.darwin.lib.darwinSystem {