Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@
};
darwinMachinesPerSystem = {
aarch64-darwin = [
"mhelton-mbp14"
];
};
nixosMachines = lib.mapAttrs' (n: lib.nameValuePair "nixos-${n}") (
Expand Down Expand Up @@ -348,6 +349,29 @@
};

darwinConfigurations = {
mhelton-mbp14 = withSystem "aarch64-darwin" (
{ pkgs, ... }:
darwin.lib.darwinSystem {
specialArgs = { inherit inputs; };
modules = (builtins.attrValues darwinModules) ++ [
{ nixpkgs.pkgs = pkgs; }
./hosts/mhelton-mbp14
home-manager.darwinModules.home-manager
{
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
extraSpecialArgs = { inherit inputs; };
users.mhelton.imports = [
./home/mhelton
./home/mhelton/work.nix
./home/mhelton/darwin.nix
];
};
}
];
}
);
};
};

Expand Down
5 changes: 4 additions & 1 deletion home/mhelton/graphical.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ let
withPlasma = osConfig.services.desktopManager.plasma6.enable;
in
{
imports = lib.optionals withPlasma [
imports = [
./ghostty.nix
]
++ lib.optionals withPlasma [
./plasma.nix
];

Expand Down
1 change: 0 additions & 1 deletion home/mhelton/packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
imports = [
inputs.nixvim.homeModules.nixvim
./kitty.nix
./ghostty.nix
];

home.packages = with pkgs; [
Expand Down
21 changes: 11 additions & 10 deletions hosts/common/darwin.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
inputs,
config,
pkgs,
...
}:
Expand Down Expand Up @@ -38,9 +37,12 @@
optimise.automatic = true;
};

users.knownUsers = [ "mhelton" ];
users.users = {
mhelton = {
home = "/Users/mhelton";
shell = pkgs.fish;
uid = 501;
};
};

Expand All @@ -51,6 +53,8 @@
wget
];

services.tailscale.enable = true;

nix-homebrew = {
enable = true;
enableRosetta = true;
Expand All @@ -74,12 +78,10 @@
casks = [
"rectangle"
"firefox"
"aldente"
"deskpad"
];
};

programs.zsh.enable = true;
programs.fish.enable = true;

security.pam.services.sudo_local.touchIdAuth = true;

Expand All @@ -94,13 +96,11 @@
tilesize = 57;
show-recents = false;
persistent-apps = [
"/System/Applications/Launchpad.app"
"/System/Applications/Apps.app"
"/Applications/Firefox.app"
"/System/Applications/Messages.app"
"/System/Applications/FaceTime.app"
"/Applications/Mimestream.app"
"${pkgs.kitty}/Applications/kitty.app"
"/Applications/Obsidian.app"
"/System/Applications/System\ Settings.app"
];
};
Expand All @@ -114,9 +114,10 @@
"NSAutomaticSpellingCorrectionEnabled" = false;
"AppleInterfaceStyleSwitchesAutomatically" = true;
};
WindowManager = {
EnableStandardClickToShowDesktop = false;
StandardHideWidgets = true;
};
};

system.activationScripts.postActivation.text = ''
dscl . -create '/Users/${builtins.elemAt (builtins.attrNames config.users.users) 0}' UserShell '${pkgs.zsh}/bin/zsh'
'';
}
21 changes: 21 additions & 0 deletions hosts/mhelton-mbp14/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{ ... }:
{
imports = [
../common/darwin.nix
];

system.stateVersion = 7;

networking.hostName = "mhelton-mbp14";

homebrew.casks = [
"dbeaver-community"
"microsoft-remote-desktop"
"slack"
];

system.defaults.dock.persistent-apps = [
"/Applications/Slack.app"
];

}