From 57715094e126336799464cd886d59fdc52ba0da0 Mon Sep 17 00:00:00 2001 From: fleaz Date: Wed, 2 Apr 2025 21:24:03 +0200 Subject: [PATCH 1/6] modules/git: Fix typo --- home-manager/modules/git.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/modules/git.nix b/home-manager/modules/git.nix index 0209d61..d94dcf5 100644 --- a/home-manager/modules/git.nix +++ b/home-manager/modules/git.nix @@ -37,7 +37,7 @@ sort = "version:refname"; }; "help" = { - autocorrect = "promt"; + autocorrect = "prompt"; }; "core" = { pager = "less -F -X"; From 9902b4715c23ff9d5b629d82dfa70b7a7a7657fa Mon Sep 17 00:00:00 2001 From: fleaz Date: Wed, 2 Apr 2025 21:26:49 +0200 Subject: [PATCH 2/6] modules/tmux: enable mouse support --- home-manager/modules/tmux.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/modules/tmux.nix b/home-manager/modules/tmux.nix index 0f018bd..b453d96 100644 --- a/home-manager/modules/tmux.nix +++ b/home-manager/modules/tmux.nix @@ -2,6 +2,7 @@ programs.tmux = { enable = true; keyMode = "vi"; + mouse = true; escapeTime = 0; plugins = [ pkgs.tmuxPlugins.gruvbox @@ -14,7 +15,6 @@ bind -n M-l select-pane -R bind -n M-k select-pane -U bind -n M-j select-pane -D - ''; }; From 93e9736e445cbb899c56f812d0a55eecbb131ef2 Mon Sep 17 00:00:00 2001 From: fleaz Date: Wed, 2 Apr 2025 21:27:01 +0200 Subject: [PATCH 3/6] modules/zsh: more aliases. fix history. enable private go support --- home-manager/modules/zsh.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/home-manager/modules/zsh.nix b/home-manager/modules/zsh.nix index ce1ce75..bb7d0be 100644 --- a/home-manager/modules/zsh.nix +++ b/home-manager/modules/zsh.nix @@ -7,20 +7,26 @@ theme = "kolo"; }; history = { - share = false; # every terminal has it's own history + share = false; # every terminal has it's own history durring runtime extended = true; size = 10000; }; shellAliases = { "k" = "kubectl"; "kx" = "kubectx"; + "kn" = "kubechn"; + "kc" = "kubechc"; "dl" = "ls -lhtr --color=always ~/Downloads | tail -n 10"; # Show the 10 newest Downloads "buzzer" = "ssh -i Nextcloud/Privat/id_door door@door.cccda.de buzzer"; "beep" = "paplay /usr/share/sounds/freedesktop/stereo/complete.oga"; # play "ding" for long running jobs "dig" = "dig +short"; "cat" = "bat --theme=TwoDark --style=plain"; + "watch" = "watch "; # https://unix.stackexchange.com/a/25329 + "kge" = "kubectl get events --sort-by='.lastTimestamp'"; }; initExtra = '' + setopt APPEND_HISTORY # Append history to global histfile on exit + autoload -U colors && colors function is_ssh(){ @@ -28,10 +34,19 @@ echo %{$fg[red]%}SSH-Session on $(hostname -s)%{$reset_color%} fi } - RPS1='$(is_ssh) $(kubectx_prompt_info)' + function get_k8s_info(){ + kubectl config get-contexts| grep "*" | awk '{print $3"/"$5}' + } + + RPS1='$(is_ssh) $(get_k8s_info)' export EDITOR="nvim"; export PATH="$PATH:$HOME/.krew/bin:$HOME/bin:$HOME/go/bin"; source <(kubectl completion zsh) + source ~/repos/kubech/kubech + + export GOPRIVATE=gitlab.com + export GOAUTH=netrc + eval "$(direnv hook zsh)" ''; }; From b75873b0f4919254578bce19e5d617833b24f660 Mon Sep 17 00:00:00 2001 From: fleaz Date: Wed, 2 Apr 2025 21:28:43 +0200 Subject: [PATCH 4/6] modules/neovim: add nvim-tree, disable netrw, add airline hotfix --- home-manager/modules/neovim.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/home-manager/modules/neovim.nix b/home-manager/modules/neovim.nix index 76667da..741a5d9 100644 --- a/home-manager/modules/neovim.nix +++ b/home-manager/modules/neovim.nix @@ -28,10 +28,8 @@ # Colorscheme papercolor-theme - # Better support for netrw - vim-vinegar - netrw-nvim - nvim-web-devicons + # Filebrowser + nvim-tree-lua # Bar at the top for all open buffers bufferline-nvim @@ -157,6 +155,11 @@ let g:go_highlight_operators = 1 let g:go_highlight_build_constraints = 1 + " Bug with whitespaces. TODO: Remove this line after nvim 0.11 + " https://github.com/vim-airline/vim-airline/issues/2704 + let g:airline#extensions#whitespace#enabled = 0 + + " Don't use gopls from vim-go let g:go_gopls_enabled = 0 @@ -180,12 +183,12 @@ local hooks = require "ibl.hooks" hooks.register(hooks.type.WHITESPACE, hooks.builtin.hide_first_space_indent_level) hooks.register(hooks.type.WHITESPACE, hooks.builtin.hide_first_tab_indent_level) - require'netrw'.setup{} require("auto-session").setup { auto_save_enabled = true; auto_restore_enabled = true; } require("bufferline").setup{} + require("nvim-tree").setup() require('lspconfig').gopls.setup{} require('lspconfig').pyright.setup{} From 8ed3f7e34f5c348bd197ff1c3fb93f49fe90aaf2 Mon Sep 17 00:00:00 2001 From: fleaz Date: Wed, 2 Apr 2025 21:32:06 +0200 Subject: [PATCH 5/6] home-manager: install/uninstall more tools --- home-manager/default.nix | 7 ++++++- home-manager/dell.nix | 9 ++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/home-manager/default.nix b/home-manager/default.nix index 49aa561..f92a6d9 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -66,6 +66,7 @@ in pavucontrol playerctl jq + yq psmisc zip nmap @@ -76,6 +77,7 @@ in strace usbutils pciutils + navi brightnessctl wl-clipboard @@ -119,7 +121,10 @@ in # kubernetes stuff kubectl krew - kubectx + kubernetes-helm + k9s + stern + kubecrypt ] ++ lib.optionals (config.my.isLaptop) [ networkmanager diff --git a/home-manager/dell.nix b/home-manager/dell.nix index 750c380..e36c084 100644 --- a/home-manager/dell.nix +++ b/home-manager/dell.nix @@ -27,20 +27,27 @@ ripgrep devenv bat + jless + jq + yq + vault + google-cloud-sdk + navi # for zsh-fzf plugin fzf # denic tooling from overlay gohome + kubecrypt # kubernetes stuff kubectl krew - kubectx kubernetes-helm k9s stern + ]; home.username = "felix"; From 9ce4b859c790dd446e05b53080121c9637d29a6e Mon Sep 17 00:00:00 2001 From: fleaz Date: Wed, 2 Apr 2025 21:33:31 +0200 Subject: [PATCH 6/6] update submodules --- overlay | 2 +- secrets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/overlay b/overlay index 7fc5447..62209bc 160000 --- a/overlay +++ b/overlay @@ -1 +1 @@ -Subproject commit 7fc544758f1004ca7e193acc4a8d0ee784e585a9 +Subproject commit 62209bcff29f6d2d1a643870b643d6c9d2577d5f diff --git a/secrets b/secrets index 0073a1e..b5be703 160000 --- a/secrets +++ b/secrets @@ -1 +1 @@ -Subproject commit 0073a1ebe983e942b7a9513ef33ad29c6ac8d6ac +Subproject commit b5be7037c16f25899be906029de9dc9cb6f79ff8