replace alacritty with kitty on macos

This commit is contained in:
Noah Masur 2022-10-31 14:45:51 -04:00
parent 7bd2125438
commit d7b711ff02
7 changed files with 26 additions and 10 deletions

View File

@ -25,9 +25,10 @@ darwin.lib.darwinSystem {
} }
../common.nix ../common.nix
../../modules/darwin ../../modules/darwin
../../modules/mail
../../modules/applications/alacritty.nix ../../modules/applications/alacritty.nix
../../modules/applications/kitty.nix
../../modules/applications/discord.nix ../../modules/applications/discord.nix
../../modules/mail/himalaya.nix
../../modules/repositories/notes.nix ../../modules/repositories/notes.nix
../../modules/programming/nix.nix ../../modules/programming/nix.nix
../../modules/programming/terraform.nix ../../modules/programming/terraform.nix

View File

@ -6,7 +6,6 @@
# programs.rofi.terminal = "${pkgs.kitty}/bin/kitty"; # programs.rofi.terminal = "${pkgs.kitty}/bin/kitty";
programs.kitty = { programs.kitty = {
enable = true; enable = true;
darwinLaunchOptions = null;
environment = { }; environment = { };
extraConfig = ""; extraConfig = "";
font.size = 14; font.size = 14;
@ -63,12 +62,10 @@
${pkgs.neovim}/bin/nvim -c 'setlocal nonumber nolist showtabline=0 foldcolumn=0|Man!' -c "autocmd VimEnter * normal G" -''; ${pkgs.neovim}/bin/nvim -c 'setlocal nonumber nolist showtabline=0 foldcolumn=0|Man!' -c "autocmd VimEnter * normal G" -'';
# Window # Window
window_padding_width = 4; window_padding_width = 6;
tab_bar_edge = "top"; tab_bar_edge = "top";
tab_bar_style = "slant"; tab_bar_style = "slant";
# macos_traditional_fullscreen = true;
}; };
}; };
}; };

View File

@ -5,6 +5,7 @@
./fonts.nix ./fonts.nix
./hammerspoon.nix ./hammerspoon.nix
./homebrew.nix ./homebrew.nix
./kitty.nix
./networking.nix ./networking.nix
./nixpkgs.nix ./nixpkgs.nix
./system.nix ./system.nix

View File

@ -56,7 +56,7 @@ function obj:init()
-- Launcher shortcuts -- Launcher shortcuts
self.launcher:bind("ctrl", "space", function() end) self.launcher:bind("ctrl", "space", function() end)
self.launcher:bind("", "return", function() self.launcher:bind("", "return", function()
self:switch("Alacritty.app") self:switch("kitty.app")
end) end)
self.launcher:bind("", "C", function() self.launcher:bind("", "C", function()
self:switch("Calendar.app") self:switch("Calendar.app")

16
modules/darwin/kitty.nix Normal file
View File

@ -0,0 +1,16 @@
{ config, pkgs, lib, ... }: {
# MacOS-specific settings for Kitty
home-manager.users.${config.user} = {
programs.kitty = {
darwinLaunchOptions = [ "--start-as=fullscreen" ];
font.size = lib.mkForce 20;
settings = {
shell = "${pkgs.fish}/bin/fish";
macos_traditional_fullscreen = true;
macos_quit_when_last_window_closed = true;
};
};
};
}

View File

@ -1,4 +1,4 @@
{ config, lib, ... }: { { config, pkgs, lib, ... }: {
home-manager.users.${config.user} = { home-manager.users.${config.user} = {
@ -21,7 +21,7 @@
rebuild-home = lib.mkForce { rebuild-home = lib.mkForce {
body = '' body = ''
git -C ${config.dotfilesPath} add --intent-to-add --all git -C ${config.dotfilesPath} add --intent-to-add --all
commandline -r ${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#${config.networking.hostName}"; commandline -r "${pkgs.home-manager}/bin/home-manager switch --flake ${config.dotfilesPath}#${config.networking.hostName}";
commandline --function execute commandline --function execute
''; '';
}; };

View File

@ -1,8 +1,9 @@
{ config, pkgs, lib, ... }: { { config, pkgs, lib, ... }: {
users.users."${config.user}" = { # macOS user users.users."${config.user}" = {
# macOS user
home = config.homePath; home = config.homePath;
shell = pkgs.zsh; # Default shell shell = pkgs.fish; # Default shell
}; };
} }