diff --git a/home-manager/dell.nix b/home-manager/dell.nix index 8bcee4c..6ac13c6 100644 --- a/home-manager/dell.nix +++ b/home-manager/dell.nix @@ -17,7 +17,7 @@ ]; home.packages = with pkgs; [ - silver-searcher + ripgrep fd subversionClient tig @@ -34,6 +34,7 @@ google-cloud-sdk navi glab + gitlab-ci-local # for zsh-fzf plugin fzf diff --git a/home-manager/modules/git.nix b/home-manager/modules/git.nix index b218f38..70b391f 100644 --- a/home-manager/modules/git.nix +++ b/home-manager/modules/git.nix @@ -10,6 +10,7 @@ "*.sql.zst" ".direnv/" ".venv/" + ".gitlab-ci-local/" ]; userName = "fleaz"; userEmail = "mail@felixbreidenstein.de"; diff --git a/home-manager/modules/tmux.nix b/home-manager/modules/tmux.nix index b453d96..e065981 100644 --- a/home-manager/modules/tmux.nix +++ b/home-manager/modules/tmux.nix @@ -15,6 +15,16 @@ bind -n M-l select-pane -R bind -n M-k select-pane -U bind -n M-j select-pane -D + + # Better marking of active windo + set-option -g pane-active-border-style fg=purple + set-option -g pane-border-lines double + + # Synchonized panes + set -g @inactive_bg '#012938' + bind-key S setw synchronize-panes + bind-key e select-pane -e -P "bg=off" + bind-key d select-pane -d -P "bg=#{@inactive_bg}" ''; }; diff --git a/home-manager/modules/zsh.nix b/home-manager/modules/zsh.nix index cd92958..4f69133 100644 --- a/home-manager/modules/zsh.nix +++ b/home-manager/modules/zsh.nix @@ -21,9 +21,11 @@ "watch" = "watch "; # https://unix.stackexchange.com/a/25329 "kge" = "kubectl get events --sort-by='.lastTimestamp'"; "devcontainer" = "docker compose -f docker-compose.yml -f .devcontainer/docker-compose.yml"; # Poor mans devcontainer + "k9s" = "k9s -c pods --splashless --logoless"; }; initExtra = '' setopt APPEND_HISTORY # Append history to global histfile on exit + setopt HIST_IGNORE_SPACE # dont save commands starting with a whitespace autoload -U colors && colors @@ -35,8 +37,13 @@ function get_k8s_info(){ kubectl config get-contexts| grep "*" | awk '{print $3"/"$5}' } + function secret_sesion(){ + if ! test -v HISTFILE; then + echo %{$fg[red]%}NOHIST%{$reset_color%} + fi + } - RPS1='$(is_ssh) $(get_k8s_info)' + RPS1='$(secret_sesion) $(is_ssh) $(get_k8s_info)' export EDITOR="nvim"; export PATH="$PATH:$HOME/.krew/bin:$HOME/bin:$HOME/go/bin"; source <(kubectl completion zsh)