Compare commits

..

No commits in common. "e9a587588818b3aa2bda90d4a15bd3504baddbd3" and "479b68d90c5324d4b8ba575023cb015ee5ccd4b5" have entirely different histories.

5 changed files with 4 additions and 10 deletions

View File

@ -207,7 +207,7 @@ local handlers = {
-- Use a loop to conveniently call 'setup' on multiple servers and -- Use a loop to conveniently call 'setup' on multiple servers and
-- map buffer local keybindings when the language server attaches -- map buffer local keybindings when the language server attaches
local servers = { 'pyright', 'bashls', 'yamlls', 'ansiblels', 'gopls', 'solargraph', 'terraformls', 'tflint', 'marksman', 'rust_analyzer' } local servers = { 'pyright', 'bashls', 'yamlls', 'ansiblels', 'gopls', 'solargraph', 'terraformls', 'tflint', 'marksman' }
for _, lsp in pairs(servers) do for _, lsp in pairs(servers) do
require('lspconfig')[lsp].setup { require('lspconfig')[lsp].setup {
on_attach = on_attach, on_attach = on_attach,
@ -340,8 +340,6 @@ require("nvim-tree").setup({
require'treesitter-context'.setup{} require'treesitter-context'.setup{}
require("nvim-autopairs").setup {} require("nvim-autopairs").setup {}
require'lspconfig'.rust_analyzer.setup {}
EOF EOF
" Added popout window to see diagnostic " Added popout window to see diagnostic

View File

@ -4,7 +4,6 @@
[commit] [commit]
gpgsign = true gpgsign = true
verbose = true verbose = true
[pull] [pull]
rebase = false rebase = false
@ -19,7 +18,6 @@
co = checkout co = checkout
cp = cherry-pick cp = cherry-pick
df = !git --no-pager diff df = !git --no-pager diff
br = !git branch | cat
dfh = !git --no-pager diff dfh = !git --no-pager diff
diffh = !git --no-pager diff diffh = !git --no-pager diff
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an - %ae>%Creset' --abbrev-commit --branches lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an - %ae>%Creset' --abbrev-commit --branches
@ -28,9 +26,10 @@
squash-all = "!f(){ git reset $(git commit-tree HEAD^{tree} \"$@\");};f" squash-all = "!f(){ git reset $(git commit-tree HEAD^{tree} \"$@\");};f"
st = status --ignore-submodules=dirty -s st = status --ignore-submodules=dirty -s
untrack-file = !git update-index --assume-unchanged untrack-file = !git update-index --assume-unchanged
exclude-file = !git update-index --assume-unchanged
c = commit --author='Marcin Woźniak <y0rune@aol.com> -s' c = commit --author='Marcin Woźniak <y0rune@aol.com> -s'
cw = commit --author='Marcin Woźniak <marcin.wozniak@wundermanthompson.com> -s' cw = commit --author='Marcin Woźniak <marcin.wozniak@wundermanthompson.com> -s'
pullwork = GIT_SSH_COMMAND='ssh -i ~/.ssh/work/id_rsa' git pull
[url "git@github.com:"] [url "git@github.com:"]
insteadOf = "https://github.com/" insteadOf = "https://github.com/"

View File

@ -296,7 +296,6 @@ function install_kubernetes() {
function install_rust() { function install_rust() {
if command_exists rustc; then if command_exists rustc; then
rustup update rustup update
rustup component add rust-analyzer
else else
curl --proto '=https' --tlsv1.2 https://sh.rustup.rs -sSf | sh curl --proto '=https' --tlsv1.2 https://sh.rustup.rs -sSf | sh
fi fi

View File

@ -1,2 +1,2 @@
#!/bin/bash #!/bin/bash
yt-dlp "$@" yt-dlp $1

View File

@ -1,2 +0,0 @@
#!/bin/bash
yt-dlp --external-downloader ffmpeg --external-downloader-args "ffmpeg_i:-ss $1 -to $2" "${@:3}"