From f8e6ad004abb6010d17898026e24bb8050d87457 Mon Sep 17 00:00:00 2001
From: pegasust <pegasucksgg@gmail.com>
Date: Fri, 11 Nov 2022 03:24:08 +0000
Subject: [PATCH] change ~/.tmux.conf -> ~/.config/tmux/tmux.conf, alternative
 path for tmux 3.1+

---
 home-nix/home.nix              | 3 ++-
 starship/starship.toml         | 9 +++++++++
 tmux/{.tmux.conf => tmux.conf} | 4 +++-
 3 files changed, 14 insertions(+), 2 deletions(-)
 rename tmux/{.tmux.conf => tmux.conf} (75%)

diff --git a/home-nix/home.nix b/home-nix/home.nix
index e453c44..57d13b4 100644
--- a/home-nix/home.nix
+++ b/home-nix/home.nix
@@ -24,6 +24,7 @@
     pkgs.stdenv.cc.cc.lib
     pkgs.yq
     pkgs.python39Full
+    pkgs.xorg.xclock
     # pkgs.python310
     # pkgs.python310.numpy
     # pkgs.python310Packages.tensorflow
@@ -53,7 +54,7 @@
   };
   programs.tmux = {
     enable = true;
-    extraConfig = builtins.readFile ../tmux/.tmux.conf;
+    extraConfig = builtins.readFile ../tmux/tmux.conf;
   };
   programs.exa = {
     enable = true;
diff --git a/starship/starship.toml b/starship/starship.toml
index 15a352a..14eaf5c 100644
--- a/starship/starship.toml
+++ b/starship/starship.toml
@@ -86,4 +86,13 @@ format = 'via [$symbol]($style)'
 [git_status]
 disabled = true
 
+[shell]
+zsh_indicator = "%"
+fish_indicator = ""
+powershell_indicator = "_"
+unknown_indicator = "mystery shell"
+style = "cyan bold"
+disabled = false
 
+[username]
+show_always=true
diff --git a/tmux/.tmux.conf b/tmux/tmux.conf
similarity index 75%
rename from tmux/.tmux.conf
rename to tmux/tmux.conf
index c324075..0fb24b6 100644
--- a/tmux/.tmux.conf
+++ b/tmux/tmux.conf
@@ -8,7 +8,7 @@ set -g display-time 1500
 unbind C-b
 set -g prefix C-a
 
-bind r source-file ~/.tmux.conf \; display "tmux.conf reloaded at ~/.tmux.conf"
+bind r source-file ~/.config/tmux/tmux.conf \; display "tmux.conf reloaded at ~/.tmux.conf"
 set -g base-index 1 # rebind to start from 0
 setw -g pane-base-index 1
 set-option -g renumber-windows on
@@ -16,3 +16,5 @@ set-option -g renumber-windows on
 # status bar
 set -g status-style 'bg=#333333 fg=#5eacd3'
 
+# Keybinds
+set-window-option -g mode-keys vi