diff --git a/home/modules/alacritty.nix b/home/modules/alacritty.nix index e5f7e06..792d828 100644 --- a/home/modules/alacritty.nix +++ b/home/modules/alacritty.nix @@ -6,7 +6,7 @@ in { options.snowhawk.alacritty = { enable = lib.mkEnableOption "alacritty home-manager module"; - macOs = lib.mkEnableOption "macos specific tweaks"; + macos = lib.mkEnableOption "macos specific tweaks"; }; config = lib.mkIf cfg.enable { @@ -15,8 +15,8 @@ in settings = { window = { opacity = 0.98; - decorations = lib.mkIf cfg.macOs "buttonless"; - option_as_alt = lib.mkIf cfg.macOs "Both"; + decorations = lib.mkIf cfg.macos "buttonless"; + option_as_alt = lib.mkIf cfg.macos "Both"; }; colors = { primary.background = "#050505"; diff --git a/home/modules/fish.nix b/home/modules/fish.nix index 3bfd0d6..13ddb99 100644 --- a/home/modules/fish.nix +++ b/home/modules/fish.nix @@ -6,10 +6,12 @@ in { options.snowhawk.fish = { enable = lib.mkEnableOption "fish"; + + macos = lib.mkEnableOption "macos specific tweaks"; }; config = lib.mkIf cfg.enable { - programs.bash = { + programs.bash = lib.mkIf (!cfg.macos) { enable = true; initExtra = '' if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]] @@ -20,6 +22,18 @@ in ''; }; + programs.zsh = lib.mkIf cfg.macos { + enable = true; + initExtra = '' + if [[ $(${pkgs.procps}/bin/ps $(${pkgs.procps}/bin/ps -p $$ -co "ppid=") -co "comm=") != "fish" && -z ''${BASH_EXECUTION_STRING} ]] + then + # shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION="" + # exec ${pkgs.fish}/bin/fish $LOGIN_OPTION + exec ${pkgs.fish}/bin/fish + fi + ''; + }; + programs.fish = { enable = true; shellAbbrs = { diff --git a/hosts/little-lightning/home.nix b/hosts/little-lightning/home.nix index 826ef80..9430b6b 100644 --- a/hosts/little-lightning/home.nix +++ b/hosts/little-lightning/home.nix @@ -15,8 +15,9 @@ }; snowhawk.alacritty = { enable = true; - macOs = true; + macos = true; }; + snowhawk.fish.macos = true; programs.alacritty.settings = { font.size = lib.mkForce 16.0;