diff --git a/.envrc b/.envrc deleted file mode 100644 index 1a512a4..0000000 --- a/.envrc +++ /dev/null @@ -1,2 +0,0 @@ -# export SOPS_AGE_KEY_FILE=${HOME}/.config/sops/age/keys.txt -export SOPS_AGE_KEY_FILE=$(pwd)/.keys.txt diff --git a/.sops.yaml b/.sops.yaml deleted file mode 100644 index 45ea201..0000000 --- a/.sops.yaml +++ /dev/null @@ -1,4 +0,0 @@ -creation_rules: - - path_regex: secrets/[^/]+\.(yaml|json|env|ini)$ - age: >- - age1fwwfdh3np846pcwlsre2d8py3a8z5gfltx3jcyghdfx9esn6a40sm60mdj diff --git a/darwin.nix b/darwin.nix index 97ff748..ead65e6 100644 --- a/darwin.nix +++ b/darwin.nix @@ -39,13 +39,25 @@ system.defaults.dock.persistent-others = [ ]; # Input devices - system.keyboard.enableKeyMapping = true; - system.keyboard.remapCapsLockToEscape = true; + system.keyboard = { + enableKeyMapping = true; + remapCapsLockToEscape = true; + userKeyMapping = [ + { + # Unbind cmd + space + HIDKeyboardModifierMappingSrc = 30064771129; # Command + Space + HIDKeyboardModifierMappingDst = 0; # No action (unbind) + } + ]; + }; system.defaults.NSGlobalDomain.InitialKeyRepeat = 25; system.defaults.NSGlobalDomain.KeyRepeat = 2; system.defaults.NSGlobalDomain."com.apple.mouse.tapBehavior" = 1; system.defaults.NSGlobalDomain."com.apple.trackpad.scaling" = 0.875; - system.defaults.trackpad.Dragging = true; + system.defaults.trackpad = { + Dragging = true; + Clicking = true; + }; # Finder system.defaults.finder.AppleShowAllExtensions = true; diff --git a/home/home.nix b/home/home.nix index 6d86c80..4456bf7 100644 --- a/home/home.nix +++ b/home/home.nix @@ -3,7 +3,6 @@ pkgs, lib, config, - sops-nix, ... }: { diff --git a/home/pkgs.nix b/home/pkgs.nix index bcede05..511df9f 100644 --- a/home/pkgs.nix +++ b/home/pkgs.nix @@ -21,7 +21,6 @@ with pkgs; woff2 bat rsync - sops # Dev devenv