darwin build

This commit is contained in:
Noah Masur 2025-03-16 15:12:07 -04:00
parent 98356634cd
commit e0588878b1
No known key found for this signature in database
10 changed files with 33 additions and 33 deletions

View File

@ -15,7 +15,7 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
home.packages = [ home.packages = [
pkgs.victor-mono # Used for Vim and Terminal pkgs.nerd-fonts.victor-mono # Used for Vim and Terminal
pkgs.nerd-fonts.hack # For Polybar, Rofi pkgs.nerd-fonts.hack # For Polybar, Rofi
]; ];
fonts.fontconfig = { fonts.fontconfig = {

View File

@ -44,7 +44,7 @@ in
userEmail = lib.mkForce cfg.work.email; userEmail = lib.mkForce cfg.work.email;
includes = [ includes = [
{ {
path = "${config.xdg.configHome}/${config.xdg.configFile."git/personal".target}"; path = "${config.home.homeDirectory}/${config.xdg.configFile."git/personal".target}";
condition = "gitdir:~/dev/personal/"; condition = "gitdir:~/dev/personal/";
} }
]; ];

View File

@ -20,7 +20,7 @@ in
xdg.configFile."hammerspoon/Spoons/DismissAlerts.spoon".source = ./Spoons/DismissAlerts.spoon; xdg.configFile."hammerspoon/Spoons/DismissAlerts.spoon".source = ./Spoons/DismissAlerts.spoon;
xdg.configFile."hammerspoon/Spoons/Launcher.spoon/init.lua".source = pkgs.substituteAll { xdg.configFile."hammerspoon/Spoons/Launcher.spoon/init.lua".source = pkgs.substituteAll {
src = ./Spoons/Launcher.spoon/init.lua; src = ./Spoons/Launcher.spoon/init.lua;
firefox = "${pkgs.firefox-bin}/Applications/Firefox.app"; firefox = "${pkgs.firefox-unwrapped}/Applications/Firefox.app";
discord = "${pkgs.discord}/Applications/Discord.app"; discord = "${pkgs.discord}/Applications/Discord.app";
wezterm = "${pkgs.wezterm}/Applications/WezTerm.app"; wezterm = "${pkgs.wezterm}/Applications/WezTerm.app";
obsidian = "${pkgs.obsidian}/Applications/Obsidian.app"; obsidian = "${pkgs.obsidian}/Applications/Obsidian.app";

View File

@ -15,6 +15,12 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
nmasur.presets = {
fonts.enable = lib.mkDefault true;
services.hammerspoon.enable = lib.mkDefault true;
programs.nixpkgs-darwin.enable = lib.mkDefault true;
};
home.homeDirectory = lib.mkForce "/Users/${config.home.username}"; home.homeDirectory = lib.mkForce "/Users/${config.home.username}";
# Default shell setting doesn't work # Default shell setting doesn't work

View File

@ -45,7 +45,7 @@ in
"/Applications/1Password.app" "/Applications/1Password.app"
"${pkgs.slack}/Applications/Slack.app" "${pkgs.slack}/Applications/Slack.app"
"/System/Applications/Calendar.app" "/System/Applications/Calendar.app"
"${pkgs.firefox-bin}/Applications/Firefox.app" "${pkgs.firefox-unwrapped}/Applications/Firefox.app"
"/System/Applications/Messages.app" "/System/Applications/Messages.app"
"/System/Applications/Mail.app" "/System/Applications/Mail.app"
"/Applications/zoom.us.app" "/Applications/zoom.us.app"

View File

@ -1,24 +0,0 @@
{
config,
lib,
...
}:
let
cfg = config.nmasur.presets.services.nix-daemon;
in
{
options.nmasur.presets.services.nix-daemon.enable = lib.mkEnableOption "Nix garbage collection";
config = lib.mkIf cfg.enable {
services.nix-daemon.enable = true;
nix.gc.interval = {
Hour = 12;
Minute = 15;
Day = 1;
};
};
}

View File

@ -18,6 +18,8 @@ in
nix = { nix = {
enable = true;
# Set channel to flake packages, used for nix-shell commands # Set channel to flake packages, used for nix-shell commands
nixPath = [ "nixpkgs=${pkgs.path}" ]; nixPath = [ "nixpkgs=${pkgs.path}" ];
@ -37,6 +39,11 @@ in
gc = { gc = {
automatic = true; automatic = true;
options = "--delete-older-than 10d"; options = "--delete-older-than 10d";
interval = {
Hour = 12;
Minute = 15;
Day = 1;
};
}; };
settings = { settings = {

View File

@ -14,7 +14,7 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
security.pam.enableSudoTouchIdAuth = true; security.pam.services.sudo_local.touchIdAuth = true;
system = { system = {

View File

@ -16,7 +16,7 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
users.users."${username}" = { users.users."${username}" = {
# macOS user # macOS user
home = config.home-manager.users.${username}.home.homeDirectory; home = "/Users/${username}";
uid = 502; uid = 502;
# shell = pkgs.fish; # Default shell # shell = pkgs.fish; # Default shell
}; };

View File

@ -14,9 +14,20 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
nmasur.presets.programs = { nmasur.presets = {
fish.enable = lib.mkDefault true; programs = {
homebrew.enable = lib.mkDefault true; fish.enable = lib.mkDefault true;
homebrew.enable = lib.mkDefault true;
};
services = {
dock.enable = lib.mkDefault true;
finder.enable = lib.mkDefault true;
hammerspoon.enable = lib.mkDefault true;
menubar.enable = lib.mkDefault true;
nix.enable = lib.mkDefault true;
settings.enable = lib.mkDefault true;
user.enable = lib.mkDefault true;
};
}; };
homebrew.brews = [ homebrew.brews = [