From 51276d05fbbb4bcd95420bea660b5b258764ec46 Mon Sep 17 00:00:00 2001 From: albert Date: Mon, 8 Apr 2024 21:45:56 +0900 Subject: [PATCH] Updates --- home-manager/common/desktops/hyprland/default.nix | 5 ++++- home-manager/common/software/cli/bash.nix | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/home-manager/common/desktops/hyprland/default.nix b/home-manager/common/desktops/hyprland/default.nix index af3308dc..dbdfb29a 100644 --- a/home-manager/common/desktops/hyprland/default.nix +++ b/home-manager/common/desktops/hyprland/default.nix @@ -1,4 +1,4 @@ -{ pkgs, inputs, theme, lib, ... }: { +{ pkgs, theme, lib, ... }: { imports = [ ./components ./assets/waybar/scripts.nix @@ -11,6 +11,9 @@ }; gtk.enable = true; + + # Disable tmux on Hyprland + programs.bash.sessionVariables = { ENABLE_TMUX = "false"; }; stylix = { image = lib.mkForce /etc/nixos/git/wallpapers/${theme}/wallpaper1.png; diff --git a/home-manager/common/software/cli/bash.nix b/home-manager/common/software/cli/bash.nix index d1b773c2..30ba1b5d 100644 --- a/home-manager/common/software/cli/bash.nix +++ b/home-manager/common/software/cli/bash.nix @@ -37,7 +37,7 @@ GPG_TTY=$(tty) EDITOR=vim ssh-add > /dev/null &> /dev/null - [ -z "$TMUX" ] && { tmux attach || exec tmux new-session && exit;} + [[ -z "$TMUX" && "$ENABLE_TMUX" == "false" ]] && { tmux attach || exec tmux new-session && exit;} ''; sessionVariables = { # Set the GTK Theme