From d53dede33c77b9fe1847b3ac80d59a123da9eff2 Mon Sep 17 00:00:00 2001 From: Lukas Leeb Date: Thu, 31 Oct 2024 10:39:46 +0100 Subject: [PATCH] Setup tmux --- home/lukas/development.nix | 9 ++++++++- home/lukas/terminal.nix | 16 ++++++++++++++++ hosts/base/unspecific/users.nix | 3 ++- hosts/specific/sirius/default.nix | 5 ----- 4 files changed, 26 insertions(+), 7 deletions(-) diff --git a/home/lukas/development.nix b/home/lukas/development.nix index ef570cf..00d4466 100644 --- a/home/lukas/development.nix +++ b/home/lukas/development.nix @@ -17,6 +17,14 @@ enableZshIntegration = true; }; + programs.tmux = { + enable = true; + extraConfig = '' + set -g default-terminal "alacritty" + set-option -sa terminal-overrides ",alacritty*:Tc" + ''; + }; + home.packages = [ # nix-related pkgs.nixd @@ -76,7 +84,6 @@ pkgs-unstable.ocamlPackages.lsp pkgs-unstable.ocamlPackages.ocamlformat pkgs-unstable.ocamlPackages.utop - pkgs-unstable.ocamlPackages.dune # miscellaneous pkgs.d2 diff --git a/home/lukas/terminal.nix b/home/lukas/terminal.nix index edf34cc..4bb77c7 100644 --- a/home/lukas/terminal.nix +++ b/home/lukas/terminal.nix @@ -1,4 +1,12 @@ +{ pkgs, ... }: + { + # shell: + # program: /bin/zsh + # args: + # - -l + # - -c + # - "tmux attach || tmux" programs.alacritty = { enable = true; settings = { @@ -8,6 +16,14 @@ y = 8; }; }; + shell = { + program = "${pkgs.zsh}/bin/zsh"; + args = [ + "-l" + "-c" + "tmux attach || tmux" + ]; + }; }; }; } diff --git a/hosts/base/unspecific/users.nix b/hosts/base/unspecific/users.nix index fd4a168..e811296 100644 --- a/hosts/base/unspecific/users.nix +++ b/hosts/base/unspecific/users.nix @@ -3,6 +3,7 @@ { users.users = { root = { + shell = pkgs.zsh; openssh.authorizedKeys.keys = [ (builtins.readFile ../../../dots/ssh/id_ed25519.pub) ]; }; @@ -15,7 +16,7 @@ "wheel" "docker" ]; - shell = pkgs.nushell; + shell = pkgs.zsh; openssh.authorizedKeys.keys = [ (builtins.readFile ../../../dots/ssh/id_ed25519.pub) ]; }; }; diff --git a/hosts/specific/sirius/default.nix b/hosts/specific/sirius/default.nix index 1f4735c..84745f9 100644 --- a/hosts/specific/sirius/default.nix +++ b/hosts/specific/sirius/default.nix @@ -22,9 +22,4 @@ virtualisation.oci-containers = { backend = "docker"; }; - - users.users = { - root.shell = lib.mkForce pkgs.zsh; - lukas.shell = lib.mkForce pkgs.zsh; - }; }