diff --git a/hosts/macbook/default.nix b/hosts/macbook/default.nix index 3fdf8a0..6163504 100644 --- a/hosts/macbook/default.nix +++ b/hosts/macbook/default.nix @@ -5,12 +5,11 @@ darwin.lib.darwinSystem { system = "x86_64-darwin"; specialArgs = { }; modules = [ - globals + (globals // { user = "Noah.Masur"; }) home-manager.darwinModules.home-manager { - user = "Noah.Masur"; gui.enable = true; - gui.colorscheme = (import ../modules/colorscheme/gruvbox); + gui.colorscheme = (import ../../modules/colorscheme/gruvbox); nixpkgs.overlays = [ nur.overlay ]; } ../common.nix diff --git a/modules/darwin/dotfiles.nix b/modules/darwin/dotfiles.nix index 2c86300..0ef0264 100644 --- a/modules/darwin/dotfiles.nix +++ b/modules/darwin/dotfiles.nix @@ -1,4 +1,4 @@ -{ config, ... }: { +{ config, lib, ... }: { home-manager.users.${config.user} = { diff --git a/modules/darwin/homebrew.nix b/modules/darwin/homebrew.nix index 7824f66..af644be 100644 --- a/modules/darwin/homebrew.nix +++ b/modules/darwin/homebrew.nix @@ -30,6 +30,8 @@ home-manager.users.${config.user} = { + programs.fish.shellAbbrs.t = "trash"; + home.activation = { # Always install homebrew if it doesn't exist