tmayoff/.dotfiles
1
0
Fork 0
mirror of https://codeberg.org/tmayoff/.dotfiles.git synced 2025-12-06 08:48:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated macos settings

Browse source
This commit is contained in:
Tyler Mayoff 2025-02-12 15:34:33 -05:00
parent 7c09c1e289
commit 9aae46a78f
No known key found for this signature in database
GPG key ID: B62A5AFAD8E14845
6 changed files with 36 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dot_config/aerospace/aerospace.toml
View file

@ -211,5 +211,5 @@ shift-down = ['volume set 0', 'mode main']
[workspace-to-monitor-force-assignment] [workspace-to-monitor-force-assignment]
1 = 'built-in' 1 = 'built-in'
2 = ['^DELL U2723QE \(1\)$'] 2 = ['^DELL U2723QE \(1\)$', 'BenQ EX2710 \(2\)$']
3 = ['^DELL U2723QE \(2\)$', '3'] 3 = ['^DELL U2723QE \(2\)$', 'BenQ EX2710 \(1\)$']

5
dot_config/flake/flake.nix
View file

@ -55,9 +55,8 @@
./home/hinge/darwin.nix ./home/hinge/darwin.nix
home-manager.darwinModules.home-manager home-manager.darwinModules.home-manager
{ {
# pkgs = allPkgs."aarch64-darwin"; home-manager.useGlobalPkgs = false;
#home-manager.useGlobalPkgs = true; home-manager.useUserPackages = false;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = {inherit inputs outputs;}; home-manager.extraSpecialArgs = {inherit inputs outputs;};
home-manager.users."tyler.mayoff" = import ./home/hinge/hinge.nix; home-manager.users."tyler.mayoff" = import ./home/hinge/hinge.nix;

2
dot_config/flake/home/common.nix
View file

@ -77,6 +77,8 @@
programs.zellij = { programs.zellij = {
enable = true; enable = true;
enableFishIntegration = false;
enableZshIntegration = false;
}; };
programs.starship = { programs.starship = {

4
dot_config/flake/home/fish.nix
View file

@ -7,8 +7,8 @@
set -gx DEBEMAIL "tyler@tylermayoff.com" set -gx DEBEMAIL "tyler@tylermayoff.com"
fish_add_path $HOME/.local/bin fish_add_path $HOME/.local/bin
fish_add_path /opt/homebrew/bin # fish_add_path /opt/homebrew/bin
fish_add_path /opt/homebrew/opt/llvm@18/bin # fish_add_path /opt/homebrew/opt/llvm@18/bin
if test -e $HOME/.config/fish/variables-$(hostname)fish if test -e $HOME/.config/fish/variables-$(hostname)fish
source $HOME/.config/fish/variables-$(hostname).fish source $HOME/.config/fish/variables-$(hostname).fish

27
dot_config/flake/home/hinge/darwin.nix
View file

@ -1,11 +1,28 @@
{pkgs, ...}: { {
pkgs,
lib,
...
}: {
# services.aerospace.enable = true; # services.aerospace.enable = true;
imports = [ imports = [
# ../fish.nix # ../fish.nix
]; ];
users.users."tyler.mayoff".shell = pkgs.fish; nix.extraOptions =
''
auto-optimise-store = true
experimental-features = nix-command flakes
''
+ lib.optionalString (pkgs.system == "aarch64-darwin") ''
extra-platforms = x86_64-darwin aarch64-darwin
'';
users.knownUsers = ["tyler.mayoff"];
users.users."tyler.mayoff" = {
uid = 502;
shell = pkgs.fish;
};
services.sketchybar.enable = true; services.sketchybar.enable = true;
@ -13,7 +30,11 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
pinentry_mac pinentry_mac
]; llvmPackages_19.clang-tools
# android-tools
jdk17
];
programs.fish.enable = true; programs.fish.enable = true;
programs.zsh.enable = true;
} }

6
dot_config/flake/home/hinge/hinge.nix
View file

@ -29,14 +29,16 @@
just just
yarn yarn
cocoapods cocoapods
# android-tools
jdk17
]; ];
sessionVariables = { sessionVariables = {
ANDROID_HOME = "/Users/tyler.mayoff/Library/Android/sdk"; ANDROID_HOME = "/Users/tyler.mayoff/Library/Android/sdk";
PATH = "$PATH:/Users/tyler.mayoff/Library/Android/sdk/platform-tools"; PATH = "$PATH:/Users/tyler.mayoff/Library/Android/sdk/platform-tools";
}; };
file.".gnupg/gpg-agent.conf".text = ''
pinentry-program ${pkgs.pinentry_mac}/Applications/pinentry-mac.app/Contents/MacOS/pinentry-mac
'';
}; };
home.stateVersion = "24.11"; home.stateVersion = "24.11";