From 9764834e7917a79d5bad961213f15a1885b7482a Mon Sep 17 00:00:00 2001
From: thek4n <thek4n@yandex.ru>
Date: Mon, 10 Jun 2024 08:27:31 +0300
Subject: [PATCH] aliases

---
 home/user/.config/bash/aliases                        | 3 ++-
 home/user/.config/git/config                          | 3 ++-
 home/user/.config/nvim/lua/core/mappings/mappings.lua | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/home/user/.config/bash/aliases b/home/user/.config/bash/aliases
index e724bb2..353474a 100644
--- a/home/user/.config/bash/aliases
+++ b/home/user/.config/bash/aliases
@@ -66,7 +66,8 @@ alias svi="sudo -E nvim"
 # net
 alias ports='ss -tlnp'
 alias wget='wget -c'
-alias myip='curl ipinfo.io/ip'
+# alias myip='curl ipinfo.io/ip'
+alias myip='dig +short myip.opendns.com @resolver1.opendns.com'
 alias sprunge='curl -F "sprunge=<-" http://sprunge.us 2>/dev/null'  # CLI pastebin
 alias weather='(curl -4 wttr.in/$(cat) 2>/dev/null | head -n -1) <<<'
 alias ip='ip -c'
diff --git a/home/user/.config/git/config b/home/user/.config/git/config
index 11c3a4e..1c19ab8 100644
--- a/home/user/.config/git/config
+++ b/home/user/.config/git/config
@@ -45,7 +45,7 @@
 
 [alias]
     a = "!git ls-files --exclude-standard -m --others -t | fzf -0 -m --bind load:last --preview 'git diff --color=always {2}' | cut -d' ' -f2 | xargs -r git add"
-    s = "!git diff --name-only --cached | fzf -0 -m --bind load:last --preview 'git diff --staged --color=always {1}' | xargs -r git restore --staged"
+    u = "!git diff --name-only --cached | fzf -0 -m --bind load:last --preview 'git diff --staged --color=always {1}' | xargs -r git restore --staged"
     d = diff
     di = diff
     ds = diff --staged
@@ -55,6 +55,7 @@
     ci = commit
     ps = "!git push origin $(git rev-parse --abbrev-ref HEAD)"
     pl = "!git pull origin $(git rev-parse --abbrev-ref HEAD)"
+    pr = "pull --rebase"
     st = status
     br = branch
     bm = branch --merged
diff --git a/home/user/.config/nvim/lua/core/mappings/mappings.lua b/home/user/.config/nvim/lua/core/mappings/mappings.lua
index 0f44ae8..dee4140 100644
--- a/home/user/.config/nvim/lua/core/mappings/mappings.lua
+++ b/home/user/.config/nvim/lua/core/mappings/mappings.lua
@@ -101,6 +101,7 @@ map("c", '%%', [[getcmdtype() == ':' ? expand('%:h').'/' : '%%']], {expr = true}
 
 -- Save from root
 vim.api.nvim_create_user_command('W', [[execute 'silent! write !SUDO_ASKPASS=vim_askpass_helper sudo -A tee % >/dev/null' <bar> edit!]], {})
+vim.api.nvim_create_user_command('X', [[execute 'silent! write !SUDO_ASKPASS=vim_askpass_helper sudo -A tee % >/dev/null' <bar> edit! | q]], {})
 vim.cmd([[autocmd FileChangedRO * set readonly!]])