Skip to content

macstuff #709

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
genebean merged 4 commits into from
Aug 2, 2026
Merged

macstuff #709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a5f9b67
ran nix flake update, got new brew version
genebean Aug 2, 2026
f3c8ed2
fixed bug in loading of oh-my-posh
genebean Aug 2, 2026
67c78a0
Manage displaylink again
genebean Aug 2, 2026
44507e5
install dnclient for nebula
genebean Aug 2, 2026
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
146 changes: 56 additions & 90 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions modules/genebean/home/programs/zsh.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,10 @@ in
# ─── Darwin ───────────────────────────────────────────────────────────
// lib.optionalAttrs genebeanLib.isDarwin {
currentwifi = "networksetup -getairportnetwork en0 |cut -d ':' -f2- | cut -d ' ' -f2-";
nixup = "sudo darwin-rebuild switch --flake ~/repos/dots";
nixup = "sudo darwin-rebuild switch --flake ~/repos/dots && exec zsh";
uwgconnect = "networksetup -setairportnetwork en0 SecureWest";
uwgforget = "networksetup -removepreferredwirelessnetwork en0 SecureWest";
ykey = "pkill -9 gpg-agent && source ~/.zshrc; ssh-add -L";
ykey = "pkill -9 gpg-agent && zsh -ic 'ssh-add -L'; exec zsh";
}
# ─── Linux (all Linux) ────────────────────────────────────────────────
// lib.optionalAttrs pkgs.stdenv.isLinux {
Expand All @@ -146,15 +146,15 @@ in
# ─── NixOS ────────────────────────────────────────────────────────────
// lib.optionalAttrs genebeanLib.isNixOS {
nixboot = "sudo nixos-rebuild boot --flake ~/repos/dots && echo 'Time to reboot!'";
nixup = "sudo nixos-rebuild switch --flake ~/repos/dots";
nixup = "sudo nixos-rebuild switch --flake ~/repos/dots && exec zsh";
nixroutes = "cd ~/repos/dots && echo '=== Current Routes ===' && ip route show && ip -6 route show && echo '' && echo '=== New Build Routes ===' && nix eval --json '.#nixosConfigurations.${hostname}.config.systemd.network.networks.\"10-wan\".routes'";
uwgconnect = "nmcli dev wifi connect SecureWest password";
uwgforget = "nmcli connection delete SecureWest";
ykey = "sudo systemctl restart pcscd && sudo pkill -9 gpg-agent && source ~/.zshrc; ssh-add -L";
ykey = "sudo systemctl restart pcscd && sudo pkill -9 gpg-agent && zsh -ic 'ssh-add -L'; exec zsh";
}
# ─── HM-only (non-NixOS Linux) ────────────────────────────────────────
// lib.optionalAttrs genebeanLib.isHMOnly {
nixup = "nix run ~/repos/dots#system-manager -- switch --sudo --flake ~/repos/dots#${username}-${system} && home-manager switch --flake ~/repos/dots#${username}-${system}";
nixup = "nix run ~/repos/dots#system-manager -- switch --sudo --flake ~/repos/dots#${username}-${system} && home-manager switch --flake ~/repos/dots#${username}-${system} && exec zsh";
};
};
};
Expand Down
3 changes: 2 additions & 1 deletion modules/hosts/darwin/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@
"appcleaner"
"balenaetcher"
"bartender"
#"displaylink"
"displaylink"
"dnclient"
"font-hack-nerd-font"
"font-inconsolata-g-for-powerline"
"font-source-code-pro-for-powerline"
Expand Down
Loading