Skip to content

Commit

Permalink
feat: darwin improvements (#998)
Browse files Browse the repository at this point in the history
  • Loading branch information
johnae authored Nov 16, 2024
1 parent 33c9f43 commit 85905bf
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 33 deletions.
15 changes: 7 additions & 8 deletions darwin/aarch64-darwin/VW2WRF4694.nix
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
homebrew.brews = [
"spotify/sptaps/kubectl-site"
"spotify/sptaps/hmtools"
"spotify/sptaps/protoman"
];

#services.karabiner-elements.enable = true; ## doesn't work atm
Expand All @@ -34,12 +35,7 @@
system.defaults.NSGlobalDomain."com.apple.trackpad.trackpadCornerClickBehavior" = 1;
system.defaults.NSGlobalDomain.InitialKeyRepeat = 15;
system.defaults.NSGlobalDomain.KeyRepeat = 2;

system.defaults.CustomSystemPreferences."com.apple.Terminal" = {
Shell = "/Users/johnaxele/.nushim.sh";
"Default Window Settings" = "Pro";
"Startup Window Settings" = "Pro";
};
system.defaults.NSGlobalDomain.ApplePressAndHoldEnabled = 0;

services.tailscale.enable = true;

Expand Down Expand Up @@ -94,10 +90,12 @@

environment.etc."zshrc.local".text = ''
export PATH=/opt/homebrew/bin:$PATH
export SHELL=nu
'';

environment.etc."bash.local".text = ''
export PATH=/opt/homebrew/bin:$PATH
export SHELL=nu
'';

home-manager.users.${adminUser.name} = {
Expand All @@ -107,8 +105,9 @@
home.file.".nushim.sh" = {
executable = true;
text = ''
source /etc/bashrc
exec nu
source /etc/bashrc
export SHELL=nu
exec nu
'';
};
home.packages = [
Expand Down
13 changes: 0 additions & 13 deletions flake.lock

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

4 changes: 1 addition & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@
juicefs-csi-driver.url = "https://raw.githubusercontent.com/juicedata/juicefs-csi-driver/v0.25.2/deploy/k8s.yaml"; # gh-release-update
kured.flake = false;
kured.url = "github:kubereboot/kured";
lsp-ai-bin.flake = false;
lsp-ai-bin.url = "https://github.com/SilasMarvin/lsp-ai/releases/download/v0.7.1/lsp-ai-x86_64-unknown-linux-gnu.gz"; # gh-release-update
mac-app-util.url = "github:hraban/mac-app-util";
microvm.url = "github:astro/microvm.nix";
microvm.inputs.flake-utils.follows = "flake-utils";
Expand Down Expand Up @@ -141,4 +139,4 @@
];
systems = ["x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin"];
};
}
}
8 changes: 0 additions & 8 deletions flake/packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,6 @@
p:
map tofuProvider [p.null p.external p.hcloud p.cloudflare p.random p.tailscale]
);
lsp-ai = pkgs.runCommand "lsp-ai" {} ''
ls -lah
ls -lah ${inputs.lsp-ai-bin}
mkdir -p $out/bin
gunzip -c ${inputs.lsp-ai-bin} > $out/bin/lsp-ai
patchelf --set-interpreter "$(cat ${pkgs.gcc}/nix-support/dynamic-linker)" $out/bin/lsp-ai
chmod +x $out/bin/lsp-ai
'';
kexec-installer-nixos-unstable-noninteractive = kexec-installer inputs.nixpkgs [
({
lib,
Expand Down
2 changes: 1 addition & 1 deletion users/profiles/mac.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ in {
./git.nix
./gitui.nix
./emacs/default.nix
# ./helix.nix
./helix.nix
./jujutsu.nix
./kubie.nix
./nushell/default.nix
Expand Down
7 changes: 7 additions & 0 deletions users/profiles/wezterm/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,13 @@ in {
else
config = dofile("${home.homeDirectory}/${xdg.configFile."wezterm/wezterm.fnl.lua".target}")
end
${
if pkgs.stdenv.isDarwin
then ''
config.front_end = "WebGpu"
''
else ""
}
return config
'';
};
Expand Down

0 comments on commit 85905bf

Please sign in to comment.