From ae548c612e4b488198892321d58a134607c8d698 Mon Sep 17 00:00:00 2001
From: sloane <git@sloanelybutsurely.com>
Date: Sat, 15 Feb 2025 16:01:20 -0500
Subject: [PATCH] fix tmux default shell
https://github.com/nix-community/home-manager/issues/5952
---
home-manager/default.nix | 11 ++++++++++-
home-manager/nixvim/default.nix | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/home-manager/default.nix b/home-manager/default.nix
index ff0d6f9..2bf6906 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -32,6 +32,13 @@
enable = true;
interactiveShellInit = ''
fish_vi_key_bindings
+
+ # start or attach to default tmux session
+ if not set -q TMUX
+ set -g TMUX tmux new-session -d -s default
+ eval $TMUX
+ tmux attach-session -d -t default
+ end
'';
shellAbbrs = {
j = "jj";
@@ -57,7 +64,6 @@
prefix = "C-a";
sensibleOnTop = true;
plugins = with pkgs.tmuxPlugins; [
- sensible
prefix-highlight
vim-tmux-navigator
catppuccin
@@ -68,6 +74,9 @@
bind c new-window -c "#{pane_current_path}"
bind '"' split-window -c "#{pane_current_path}"
bind % split-window -h -c "#{pane_current_path}"
+
+ set -gu default-command
+ set -g default-shell "$SHELL"
'';
};
diff --git a/home-manager/nixvim/default.nix b/home-manager/nixvim/default.nix
index d8d8f71..a972fcc 100644
--- a/home-manager/nixvim/default.nix
+++ b/home-manager/nixvim/default.nix
@@ -7,7 +7,7 @@
mapleader = " ";
};
- globalOpts = {
+ opts = {
number = true;
relativenumber = true;
shiftwidth = 2;