mirror of
https://github.com/nmasur/dotfiles
synced 2026-07-07 00:53:57 +00:00
switch from nix-darwin control to more home-manager darwin settings
This commit is contained in:
@@ -17,32 +17,25 @@ in
|
||||
|
||||
nmasur.presets = {
|
||||
fonts.enable = lib.mkDefault true;
|
||||
services.hammerspoon.enable = lib.mkDefault true;
|
||||
programs.nixpkgs-darwin.enable = lib.mkDefault true;
|
||||
programs.mpv.enable = lib.mkDefault true;
|
||||
services = {
|
||||
darwin-settings.enable = lib.mkDefault true;
|
||||
dock.enable = lib.mkDefault true;
|
||||
finder.enable = lib.mkDefault true;
|
||||
hammerspoon.enable = lib.mkDefault true;
|
||||
menubar.enable = lib.mkDefault true;
|
||||
};
|
||||
programs = {
|
||||
fish-darwin.enable = lib.mkDefault true;
|
||||
homebrew.enable = lib.mkDefault true;
|
||||
nixpkgs-darwin.enable = lib.mkDefault true;
|
||||
mpv.enable = lib.mkDefault true;
|
||||
};
|
||||
};
|
||||
|
||||
home.homeDirectory = lib.mkForce "/Users/${config.home.username}";
|
||||
|
||||
# Default shell setting doesn't work
|
||||
home.sessionVariables = {
|
||||
SHELL = "${pkgs.fish}/bin/fish";
|
||||
};
|
||||
|
||||
# Used for aerc
|
||||
xdg.enable = lib.mkDefault pkgs.stdenv.isDarwin;
|
||||
|
||||
programs.fish.shellAbbrs.t = "trash";
|
||||
|
||||
# Add homebrew paths to CLI path
|
||||
home.sessionPath = [
|
||||
"/opt/homebrew/bin/"
|
||||
"/opt/homebrew/opt/trash/bin"
|
||||
];
|
||||
|
||||
home.packages = [
|
||||
pkgs.noti # Create notifications programmatically
|
||||
pkgs.ice-bar # Menu bar hiding
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
@@ -43,6 +43,14 @@ in
|
||||
pkgs.uv # Python packaging
|
||||
];
|
||||
|
||||
home.file.".Brewfile".text = /* homebrew */ ''
|
||||
cask "1password" # 1Password will not launch from Nix on macOS
|
||||
# cask "gitify" # Git notifications in menu bar (downgrade manually from 4.6.1)
|
||||
# cask "logitech-g-hub" # Mouse and keyboard management
|
||||
cask "logitune" # Logitech webcam firmware
|
||||
cask "meetingbar" # Show meetings in menu bar
|
||||
'';
|
||||
|
||||
programs.fish.shellAliases.ec2 = "aws-ec2";
|
||||
|
||||
nmasur.presets = {
|
||||
|
||||
Reference in New Issue
Block a user