noah/dotfiles
1
0
Fork 0
mirror of https://github.com/nmasur/dotfiles synced 2025-07-05 16:10:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: nix-darwin deprecations of useractivationscripts

Browse Source
This commit is contained in:
Noah Masur
2025-07-02 18:48:23 -06:00
parent d16ed6a4fc
commit 6b5a01262e
6 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/darwin/homebrew.nix
View File

@ -9,8 +9,8 @@
# Homebrew - Mac-specific packages that aren't in Nix # Homebrew - Mac-specific packages that aren't in Nix
config = lib.mkIf pkgs.stdenv.isDarwin { config = lib.mkIf pkgs.stdenv.isDarwin {
# Requires Homebrew to be installed # # Requires Homebrew to be installed
system.activationScripts.preUserActivation.text = '' system.activationScripts.preActivation.text = ''
if ! xcode-select --version 2>/dev/null; then if ! xcode-select --version 2>/dev/null; then
$DRY_RUN_CMD xcode-select --install $DRY_RUN_CMD xcode-select --install
fi fi

2
platforms/nix-darwin/modules/nmasur/presets/programs/homebrew.nix
View File

@ -15,7 +15,7 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
# Requires Homebrew to be installed # Requires Homebrew to be installed
system.activationScripts.preUserActivation.text = '' system.activationScripts.preActivation.text = ''
if ! xcode-select --version 2>/dev/null; then if ! xcode-select --version 2>/dev/null; then
$DRY_RUN_CMD xcode-select --install $DRY_RUN_CMD xcode-select --install
fi fi

2
platforms/nix-darwin/modules/nmasur/presets/services/finder.nix
View File

@ -59,7 +59,7 @@ in
}; };
# User-level settings # User-level settings
system.activationScripts.postUserActivation.text = '' system.activationScripts.postActivation.text = ''
echo "Show the ~/Library folder" echo "Show the ~/Library folder"
chflags nohidden ~/Library chflags nohidden ~/Library
''; '';

2
platforms/nix-darwin/modules/nmasur/presets/services/hammerspoon.nix
View File

@ -18,7 +18,7 @@ in
homebrew.casks = [ "hammerspoon" ]; homebrew.casks = [ "hammerspoon" ];
system.activationScripts.postUserActivation.text = '' system.activationScripts.postActivation.text = ''
defaults write org.hammerspoon.Hammerspoon MJConfigFile "${ defaults write org.hammerspoon.Hammerspoon MJConfigFile "${
config.home-manager.users.${username}.xdg.configHome config.home-manager.users.${username}.xdg.configHome
}/hammerspoon/init.lua" }/hammerspoon/init.lua"

2
platforms/nix-darwin/modules/nmasur/presets/services/menubar.nix
View File

@ -15,7 +15,7 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
# User-level settings # User-level settings
system.activationScripts.postUserActivation.text = '' system.activationScripts.postActivation.text = ''
echo "Reduce Menu Bar padding" echo "Reduce Menu Bar padding"
defaults write -globalDomain NSStatusItemSelectionPadding -int 6 defaults write -globalDomain NSStatusItemSelectionPadding -int 6
defaults write -globalDomain NSStatusItemSpacing -int 6 defaults write -globalDomain NSStatusItemSpacing -int 6

2
platforms/nix-darwin/modules/nmasur/profiles/base.nix
View File

@ -14,6 +14,8 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
system.primaryUser = config.nmasur.settings.username;
nmasur.presets = { nmasur.presets = {
programs = { programs = {
fish.enable = lib.mkDefault true; fish.enable = lib.mkDefault true;