diff --git a/platforms/home-manager/modules/nmasur/presets/programs/ghostty.nix b/platforms/home-manager/modules/nmasur/presets/programs/ghostty.nix index 2fb24b8..3ab5c42 100644 --- a/platforms/home-manager/modules/nmasur/presets/programs/ghostty.nix +++ b/platforms/home-manager/modules/nmasur/presets/programs/ghostty.nix @@ -21,7 +21,7 @@ in programs.ghostty = { enable = true; - package = if pkgs.stdenv.isDarwin then pkgs.nur.repos.DimitarNestorov.ghostty else pkgs.ghostty; + package = if pkgs.stdenv.isDarwin then null else pkgs.ghostty; enableFishIntegration = true; enableBashIntegration = true; diff --git a/platforms/home-manager/modules/nmasur/presets/services/hammerspoon/Spoons/Launcher.spoon/init.lua b/platforms/home-manager/modules/nmasur/presets/services/hammerspoon/Spoons/Launcher.spoon/init.lua index 730f127..87d2bad 100644 --- a/platforms/home-manager/modules/nmasur/presets/services/hammerspoon/Spoons/Launcher.spoon/init.lua +++ b/platforms/home-manager/modules/nmasur/presets/services/hammerspoon/Spoons/Launcher.spoon/init.lua @@ -57,7 +57,7 @@ function obj:init() self.launcher:bind("ctrl", "space", function() end) self.launcher:bind("", "return", function() -- self:switch("@wezterm@") - self:switch("@ghostty@") + self:switch("/Applications/Ghostty.app") end) self.launcher:bind("", "C", function() self:switch("Calendar.app") diff --git a/platforms/home-manager/modules/nmasur/presets/services/hammerspoon/default.nix b/platforms/home-manager/modules/nmasur/presets/services/hammerspoon/default.nix index 6bb4758..87ac644 100644 --- a/platforms/home-manager/modules/nmasur/presets/services/hammerspoon/default.nix +++ b/platforms/home-manager/modules/nmasur/presets/services/hammerspoon/default.nix @@ -23,7 +23,6 @@ in { discord = "${pkgs.discord}/Applications/Discord.app"; firefox = "${pkgs.firefox-unwrapped}/Applications/Firefox.app"; - ghostty = "${config.programs.ghostty.package}/Applications/Ghostty.app"; obsidian = "${pkgs.obsidian}/Applications/Obsidian.app"; slack = "${pkgs.slack}/Applications/Slack.app"; wezterm = "${pkgs.wezterm}/Applications/WezTerm.app"; diff --git a/platforms/nix-darwin/modules/nmasur/presets/services/dock.nix b/platforms/nix-darwin/modules/nmasur/presets/services/dock.nix index a9aa5be..323e83e 100644 --- a/platforms/nix-darwin/modules/nmasur/presets/services/dock.nix +++ b/platforms/nix-darwin/modules/nmasur/presets/services/dock.nix @@ -6,7 +6,6 @@ }: let - inherit (config.nmasur.settings) username; cfg = config.nmasur.presets.services.dock; in @@ -50,7 +49,7 @@ in "/System/Applications/Messages.app" "/System/Applications/Mail.app" "/Applications/zoom.us.app" - "${config.home-manager.users.${username}.programs.ghostty.package}/Applications/Ghostty.app" + "/Applications/Ghostty.app" "${pkgs.discord}/Applications/Discord.app" "${pkgs.obsidian}/Applications/Obsidian.app" ]; diff --git a/platforms/nix-darwin/modules/nmasur/profiles/base.nix b/platforms/nix-darwin/modules/nmasur/profiles/base.nix index f1f7f35..83013e8 100644 --- a/platforms/nix-darwin/modules/nmasur/profiles/base.nix +++ b/platforms/nix-darwin/modules/nmasur/profiles/base.nix @@ -39,6 +39,7 @@ in "scroll-reverser" # Different scroll style for mouse vs. trackpad "notunes" # Don't launch Apple Music with the play button "topnotch" # Darkens the menu bar to complete black + "ghostty" # Terminal application (not buildable on Nix on macOS) ]; };