diff --git a/homes/aarch64-darwin/yadunut@yadunut-mbp/default.nix b/homes/aarch64-darwin/yadunut@yadunut-mbp/default.nix index 3fc8f0e..8792bf2 100644 --- a/homes/aarch64-darwin/yadunut@yadunut-mbp/default.nix +++ b/homes/aarch64-darwin/yadunut@yadunut-mbp/default.nix @@ -1,63 +1,67 @@ { lib, pkgs, + home, + inputs, config, ... }: { - - nix = { - package = pkgs.nix; - settings = { - substituters = [ - "https://nix-community.cachix.org" - "https://cache.nixos.org" - ]; - trusted-public-keys = [ - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" - ]; + config = { + nix = { + package = pkgs.nix; + settings = { + substituters = [ + "https://nix-community.cachix.org" + "https://cache.nixos.org" + ]; + trusted-public-keys = [ + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" + ]; + }; }; - }; - home.packages = [ - # pkgs.dive - pkgs.entr - pkgs.jq - pkgs.just - pkgs.rsync - pkgs.claude-code - pkgs.dive - pkgs.cachix - pkgs.ouch - ]; + home.packages = [ + # pkgs.dive + pkgs.entr + pkgs.jq + pkgs.just + pkgs.rsync + pkgs.claude-code + pkgs.dive + pkgs.cachix + pkgs.ouch + inputs.agenix.packages.aarch64-darwin.default # this should be using ${home} but it doesn't seem to be working + ]; - home.sessionVariables = { - JAVA_HOME = "/Library/Java/JavaVirtualMachines/zulu-17.jdk/Contents/Home"; - ANDROID_HOME = "$HOME/Library/Android/sdk"; - }; + home.sessionVariables = { + JAVA_HOME = "/Library/Java/JavaVirtualMachines/zulu-17.jdk/Contents/Home"; + ANDROID_HOME = "$HOME/Library/Android/sdk"; + }; - home.sessionPath = [ - "$ANDROID_HOME/emulator" - "$ANDROID_HOME/platform-tools" - "/opt/homebrew/bin" - ]; + home.sessionPath = [ + "$ANDROID_HOME/emulator" + "$ANDROID_HOME/platform-tools" + "/opt/homebrew/bin" + ]; - zsh.enable = true; - nushell.enable = true; - neovim.enable = true; - git = { - enable = true; - gpgProgram = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"; - signingKey = "~/.ssh/yadunut_ed25519.pub"; - }; + zsh.enable = true; + nushell.enable = true; + neovim.enable = true; + git = { + enable = true; + gpgProgram = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"; + signingKey = "~/.ssh/yadunut_ed25519.pub"; + }; - targets.darwin = { - defaults."com.apple.dock".autohide = true; - defaults."com.apple.finder".AppleShowAllFiles = true; - defaults.NSGlobalDomain.AppleShowAllExtensions = true; - defaults.NSGlobalDomain.KeyRepeat = 2; - defaults.NSGlobalDomain.ApplePressAndHoldEnabled = false; + targets.darwin = { + defaults."com.apple.dock".autohide = true; + defaults."com.apple.finder".AppleShowAllFiles = true; + defaults.NSGlobalDomain.AppleShowAllExtensions = true; + defaults.NSGlobalDomain.KeyRepeat = 2; + defaults.NSGlobalDomain.ApplePressAndHoldEnabled = false; + }; + home.stateVersion = "23.11"; # Please read the comment before changing. + programs.home-manager.enable = true; }; - home.stateVersion = "23.11"; # Please read the comment before changing. - programs.home-manager.enable = true; }