Skip to content

Commit

Permalink
gamma mbp setup
Browse files Browse the repository at this point in the history
  • Loading branch information
loganlinn committed Oct 7, 2024
1 parent 0440d34 commit 32c25c1
Show file tree
Hide file tree
Showing 10 changed files with 118 additions and 15 deletions.
41 changes: 41 additions & 0 deletions darwin/common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,51 @@
};

programs.bash.enable = true;

programs.zsh.enable = true;

services.nix-daemon.enable = true;

system.defaults = {
NSGlobalDomain = {
AppleKeyboardUIMode = 3;
ApplePressAndHoldEnabled = false;
InitialKeyRepeat = 25;
KeyRepeat = 1;
NSAutomaticCapitalizationEnabled = false;
NSAutomaticDashSubstitutionEnabled = false;
NSAutomaticPeriodSubstitutionEnabled = false;
NSAutomaticQuoteSubstitutionEnabled = false;
NSAutomaticSpellingCorrectionEnabled = false;
NSNavPanelExpandedStateForSaveMode = true;
NSNavPanelExpandedStateForSaveMode2 = true;
_HIHideMenuBar = false;
};

dock = {
autohide = true;
mru-spaces = false;
orientation = "bottom";
showhidden = true;
};

finder = {
AppleShowAllExtensions = true;
QuitMenuItem = true;
FXEnableExtensionChangeWarning = false;
};

trackpad = {
Clicking = false;
TrackpadThreeFingerDrag = true;
};
};

system.keyboard = {
enableKeyMapping = true;
remapCapsLockToControl = true;
};

nix = {
configureBuildUsers = true;
gc = {
Expand Down
34 changes: 34 additions & 0 deletions darwin/gammabook/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
self,
inputs,
pkgs,
lib,
...
}:
{
imports = [
self.darwinModules.common
self.darwinModules.home-manager
../modules/homebrew.nix
];

homebrew.enable = true;

home-manager.users.logan =
{ options, config, ... }:
{
imports = [
self.homeModules.common
self.homeModules.nix-colors
self.homeModules.nixvim
../../nix/home/dev
../../nix/home/pretty.nix
../../nix/home/kitty
];

programs.kitty.enable = true;

home.stateVersion = "22.11";
};

}
10 changes: 5 additions & 5 deletions darwin/modules/homebrew.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
taps = [
# "d12frosted/emacs-plus"
# "railwaycat/emacsport"
"Azure/kubelogin"
# "Azure/kubelogin"
];
brews = [
"kubelogin"
# "kubelogin"
# "azure-cli"
# "libvterm"
# {
Expand All @@ -31,9 +31,9 @@
# "1password"
# "iTerm"
# "google-chrome"
"kitty"
"slack"
"syncthing"
# "kitty"
# "slack"
# "syncthing"
];
masApps = {
Tailscale = 1475387142;
Expand Down
2 changes: 1 addition & 1 deletion darwin/modules/security.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
{
security = {
pam.enableSudoTouchIdAuth = true;
pki.certificates = [];
pki.certificates = [ ];
};
}
7 changes: 6 additions & 1 deletion darwin/modules/skhd.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:

{
services.skhd = {
Expand Down
12 changes: 6 additions & 6 deletions darwin/modules/yabai.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
focus_follows_mouse = "autoraise";
mouse_follows_focus = "off";

top_padding = 10;
top_padding = 10;
bottom_padding = 10;
left_padding = 10;
right_padding = 10;
window_gap = 10;
window_placement = "second_child";
window_opacity = "off";
left_padding = 10;
right_padding = 10;
window_gap = 10;
window_placement = "second_child";
window_opacity = "off";

mouse_modifier = "ctrl";
mouse_action1 = "move";
Expand Down
8 changes: 7 additions & 1 deletion darwin/patchbook.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
{ inputs, pkgs, lib, ... }: {
{
inputs,
pkgs,
lib,
...
}:
{

imports = [
./common.nix
Expand Down
8 changes: 7 additions & 1 deletion flake-module/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -163,11 +163,17 @@ in
imports = [ nix-colors.homeManagerModule ];
colorScheme = lib.mkDefault nix-colors.colorSchemes.doom-one;
};
nixvim = {
imports = [
inputs.nixvim.homeManagerModules.nixvim
# ../nix/home/nixvim
];
};
secrets = inputs.agenix.homeManagerModules.default;
};

flake.darwinModules = {
common = import ../nix-darwin/common.nix;
common = import ../darwin/common.nix;
home-manager = moduleWithSystem (
systemArgs@{
inputs',
Expand Down
4 changes: 4 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,10 @@
};
}
];

darwinConfigurations.logan-gammabook = self.lib.mkDarwinSystem "aarch64-darwin" [
./darwin/gammabook
];
};

# my repl depends on attrs exposed by flake-parts's debug option.
Expand Down
7 changes: 7 additions & 0 deletions nix/home/nixvim/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{ self, inputs, ... }:
{
imports = [
inputs.nixvim.homeManagerModules.nixvim
../../modules/programs/nixvim
];
}

0 comments on commit 32c25c1

Please sign in to comment.