From 939627452b68460def735c50ccf941546e069518 Mon Sep 17 00:00:00 2001 From: vanderscycle Date: Fri, 3 Jan 2025 12:25:56 -0800 Subject: [PATCH 1/2] removed aerospace --- nix-darwin/users/henri.vandersleyen/configuration.nix | 6 +++--- nix-darwin/users/henri.vandersleyen/home.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nix-darwin/users/henri.vandersleyen/configuration.nix b/nix-darwin/users/henri.vandersleyen/configuration.nix index 2867a3db..6ecac12c 100644 --- a/nix-darwin/users/henri.vandersleyen/configuration.nix +++ b/nix-darwin/users/henri.vandersleyen/configuration.nix @@ -62,11 +62,11 @@ casks = [ "rectangle" "iterm2" - "nikitabobko/tap/aerospace" + # "nikitabobko/tap/aerospace" # not vetted on work laptop ]; brews = [ - "koekeishiya/formulae/yabai" - "koekeishiya/formulae/skhd" + # "koekeishiya/formulae/yabai" + # "koekeishiya/formulae/skhd" ]; }; } diff --git a/nix-darwin/users/henri.vandersleyen/home.nix b/nix-darwin/users/henri.vandersleyen/home.nix index c141dd2b..5609c002 100644 --- a/nix-darwin/users/henri.vandersleyen/home.nix +++ b/nix-darwin/users/henri.vandersleyen/home.nix @@ -45,7 +45,7 @@ ]; # wm wm.aerospace = { - enable = true; + enable = false; configPath = Users/${username}/Documents/dotfiles/.config/aerospace; }; # languages From 5f5dce1da413763da440455479398b16bb35df21 Mon Sep 17 00:00:00 2001 From: vanderscycle Date: Fri, 3 Jan 2025 12:27:58 -0800 Subject: [PATCH 2/2] added alacritty --- .../home-modules/programs/alacritty.nix | 38 +++++++++++++++++++ nix-darwin/home-modules/programs/default.nix | 1 + 2 files changed, 39 insertions(+) create mode 100644 nix-darwin/home-modules/programs/alacritty.nix diff --git a/nix-darwin/home-modules/programs/alacritty.nix b/nix-darwin/home-modules/programs/alacritty.nix new file mode 100644 index 00000000..0583b134 --- /dev/null +++ b/nix-darwin/home-modules/programs/alacritty.nix @@ -0,0 +1,38 @@ +{ + pkgs, + lib, + config, + ... +}: +{ + options = { + alacritty.enable = lib.mkOption { + type = lib.types.bool; + description = "Enables alacritty shell"; + default = false; + }; + }; + + config = lib.mkIf config.alacritty.enable { + # C-r history + # C-l clear + home = { + sessionVariables = { + TERMINAL = "alacritty"; + }; + }; + programs = { + alacritty = { + enable = true; + catppuccin.enable = true; + shellIntegration.enableFishIntegration = true; + shellIntegration.enableZshIntegration = true; + font = { + size = 16; + name = "JetBrainsMono"; + package = pkgs.nerd-fonts.jetbrains-mono; + }; + }; + }; + }; +} diff --git a/nix-darwin/home-modules/programs/default.nix b/nix-darwin/home-modules/programs/default.nix index 3be7be06..ca0b08c0 100644 --- a/nix-darwin/home-modules/programs/default.nix +++ b/nix-darwin/home-modules/programs/default.nix @@ -1,6 +1,7 @@ { lib, ... }: { imports = [ + ./alacritty.nix ./bat.nix ./btop.nix ./cloud.nix