diff --git a/git/gitconfig b/git/gitconfig index 02239cf..8294b1d 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -1,7 +1,7 @@ [user] name = Tine Jozelj email = tine@tjo.space - signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICXAlzwziqfUUb2qmFwNF/nrBYc5MNT1MMOx81ohBmB+ + signingkey = /home/tine/.ssh/id_ecdsa.pub [commit] gpgsign = true @@ -9,15 +9,12 @@ [init] defaultBranch = main -[filter "lfs"] - smudge = git-lfs smudge -- %f - process = git-lfs filter-process - required = true - clean = git-lfs clean -- %f - [diff] external = difft +[push] + autoSetupRemote = true + [pull] ff = only @@ -26,3 +23,10 @@ [gpg "ssh"] allowedSignersFile = /home/tine/.ssh/allowed_signers + +[filter "lfs"] + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f + process = git-lfs filter-process + required = true + diff --git a/nvim/init.vim b/nvim/init.vim index 3477b4b..d56f3d1 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -29,6 +29,7 @@ Plug 'vim-scripts/gitignore' " Coding helpers Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} Plug 'neoclide/coc.nvim', {'branch': 'release'} +Plug 'github/copilot.vim' call plug#end() diff --git a/starship/starship.toml b/starship/starship.toml index 7e6a585..52e9dd8 100644 --- a/starship/starship.toml +++ b/starship/starship.toml @@ -46,6 +46,12 @@ disabled = true [buf] disabled = true +[git_metrics] +disabled = true + +[git_state] +disabled = false + ##################### [kubernetes] @@ -68,18 +74,12 @@ disabled = false symbol = " " [git_commit] -disabled = false +disabled = true commit_hash_length = 7 tag_symbol = "🔖 " tag_disabled = false only_detached = false -[git_metrics] -disabled = false - -[git_state] -disabled = false - [character] success_symbol = "❯" vicmd_symbol = "❮" diff --git a/zsh/zshrc b/zsh/zshrc index 3c48c71..cf8413a 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -6,8 +6,6 @@ if ! zplug check; then zplug install fi zplug "plugins/git", from:oh-my-zsh -zplug "plugins/gitfast", from:oh-my-zsh -zplug "plugins/git-extras", from:oh-my-zsh zplug "plugins/kubectl", from:oh-my-zsh zplug "lukechilds/zsh-nvm" zplug "plugins/terraform", from:oh-my-zsh