diff --git a/home-manager/dell.nix b/home-manager/dell.nix index 6ac13c6..8bcee4c 100644 --- a/home-manager/dell.nix +++ b/home-manager/dell.nix @@ -17,7 +17,7 @@ ]; home.packages = with pkgs; [ - ripgrep + silver-searcher fd subversionClient tig @@ -34,7 +34,6 @@ 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 70b391f..b218f38 100644 --- a/home-manager/modules/git.nix +++ b/home-manager/modules/git.nix @@ -10,7 +10,6 @@ "*.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 e065981..b453d96 100644 --- a/home-manager/modules/tmux.nix +++ b/home-manager/modules/tmux.nix @@ -15,16 +15,6 @@ 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 4f69133..cd92958 100644 --- a/home-manager/modules/zsh.nix +++ b/home-manager/modules/zsh.nix @@ -21,11 +21,9 @@ "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 @@ -37,13 +35,8 @@ 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='$(secret_sesion) $(is_ssh) $(get_k8s_info)' + RPS1='$(is_ssh) $(get_k8s_info)' export EDITOR="nvim"; export PATH="$PATH:$HOME/.krew/bin:$HOME/bin:$HOME/go/bin"; source <(kubectl completion zsh)