diff --git a/darwin/aerospace.nix b/darwin/aerospace.nix index cecf9d9..c043208 100644 --- a/darwin/aerospace.nix +++ b/darwin/aerospace.nix @@ -68,6 +68,7 @@ in # alt-enter = "exec-and-forget \"open -n -a /Applications/Slack.app\""; alt-shift-f = "fullscreen"; + alt-shift-q = "close --quit-if-last-window"; alt-space = "layout floating tiling"; alt-e = "layout tiles horizontal vertical"; alt-t = "layout h_accordion"; diff --git a/darwin/default.nix b/darwin/default.nix index c28465a..0fc50c6 100644 --- a/darwin/default.nix +++ b/darwin/default.nix @@ -53,6 +53,10 @@ }; config = { + users.users.${user} = { + home = "/Users/${user}"; + }; + system.defaults = { CustomUserPreferences = { NSGlobalDomain = { @@ -106,7 +110,7 @@ mineffect = "scale"; minimize-to-application = true; mru-spaces = false; - orientation = "left"; + orientation = "bottom"; show-recents = false; wvous-br-corner = 1; # Disabled }; @@ -152,6 +156,7 @@ environment.systemPackages = with pkgs; [ + mas vim htop ] diff --git a/darwin/homebrew.nix b/darwin/homebrew.nix index 0e2cb8d..b42612c 100644 --- a/darwin/homebrew.nix +++ b/darwin/homebrew.nix @@ -23,6 +23,12 @@ firefox = mkEnableOption "Enable Firefox"; chromium = mkEnableOption "Enable Chromium"; aldente = mkEnableOption "Enable AlDente"; + zotero = mkEnableOption "Enable Zotero"; + amphetamine = mkEnableOption "Enable Amphetamine"; + scroll-reverser = mkEnableOption "Enable Scroll Reverser"; + ice = mkEnableOption "Enable Ice Menu Manager"; + contexts = mkEnableOption "Enable Contexts"; + forklift = mkEnableOption "Enable Forklift 4"; }; config = lib.mkMerge [ @@ -49,6 +55,13 @@ }; }; } + # mas apps + (lib.mkIf config.custom.brew.amphetamine { + homebrew.masApps = { + "Amphetamine" = 937984704; + }; + }) + # casks (lib.mkIf config.custom.brew.zen-browser { homebrew.casks = [ "zen-browser" @@ -119,5 +132,30 @@ "aldente" ]; }) + (lib.mkIf config.custom.brew.zotero { + homebrew.casks = [ + "zotero" + ]; + }) + (lib.mkIf config.custom.brew.scroll-reverser { + homebrew.casks = [ + "scroll-reverser" + ]; + }) + (lib.mkIf config.custom.brew.ice { + homebrew.casks = [ + "jordanbaird-ice" + ]; + }) + (lib.mkIf config.custom.brew.contexts { + homebrew.casks = [ + "contexts" + ]; + }) + (lib.mkIf config.custom.brew.forklift { + homebrew.casks = [ + "forklift" + ]; + }) ]; } diff --git a/darwin/nix.nix b/darwin/nix.nix index 734b1af..807a074 100644 --- a/darwin/nix.nix +++ b/darwin/nix.nix @@ -7,6 +7,7 @@ self, user, dots, + system, ... }: @@ -86,6 +87,7 @@ # }; }; + nixpkgs.hostPlatform = system; # add nixos-option workaround for flakes # https://github.com/NixOS/nixpkgs/issues/97855#issuecomment-1075818028 nixpkgs.overlays = [ diff --git a/hosts/dango/default.nix b/hosts/dango/default.nix index 99fbee1..904ba8d 100644 --- a/hosts/dango/default.nix +++ b/hosts/dango/default.nix @@ -11,14 +11,7 @@ ... }: { - imports = [ - ]; - - nixpkgs.hostPlatform = system; - - users.users.${user} = { - home = "/Users/${user}"; - }; + imports = [ ]; custom = { aerospace.enable = true; @@ -39,6 +32,11 @@ firefox = true; chromium = true; aldente = true; + zotero = true; + amphetamine = true; + scroll-reverser = true; + ice = true; + contexts = true; }; };