diff --git a/emmathorpe/home-manager-module.nix b/emmathorpe/home-manager-module.nix deleted file mode 100644 index a31777c..0000000 --- a/emmathorpe/home-manager-module.nix +++ /dev/null @@ -1,14 +0,0 @@ -{config, pkgs, lib, ...}: - -{ - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - -lib.mkIf ( profile == "work" ) { - home-manager.users.emmathorpe.imports = [ ./home.nix ../system/modules/work/default.nix ]; -}; -lib.mkIf ( profile == "home" ) { - home-manager.users.emmathorpe.imports = [ ./home.nix ]; -}; - -} diff --git a/emmathorpe/home.nix b/emmathorpe/home.nix index 7b4da57..056344f 100644 --- a/emmathorpe/home.nix +++ b/emmathorpe/home.nix @@ -32,10 +32,9 @@ terminal = "tmux-direct"; newSession = true; keyMode = "vi"; - historyLimit = 50000; + historyLimit = 50000; + mouse = true; extraConfig = '' - # Enable mouse support - set -g mouse on # Set pane navigation bind -n M-Left select-pane -L bind -n M-Right select-pane -R @@ -79,5 +78,13 @@ enable = true; package = pkgs.gitFull; userName = "Emma Thorpe"; + extraConfig = { + push = { + autoSetupRemote = true; + }; + }; + delta = { + enable = true; + }; }; } diff --git a/system/modules/work/default.nix b/system/modules/work/default.nix index 45a3f39..791ad55 100644 --- a/system/modules/work/default.nix +++ b/system/modules/work/default.nix @@ -12,4 +12,9 @@ pkgs.kubelogin pkgs.curl ]; + programs.tmux = { + extraConfig = '' + set -g status-right "#(/run/current-system/sw/bin/bash $HOME/code/kube-tmux/kube.tmux 250 red black)" +''; + }; }