From fd5372535b8c0f4a493f36245766a3a72ed23025 Mon Sep 17 00:00:00 2001
From: TheK4n <djvlad967891@gmail.com>
Date: Sun, 5 Mar 2023 00:06:21 +0300
Subject: [PATCH] some fix

---
 sub/bash/export     | 2 +-
 sub/git/gitconfig   | 1 +
 sub/i3/config       | 1 -
 sub/i3/xinitrc      | 1 +
 sub/zsh/zfunc/_nvim | 2 +-
 5 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/sub/bash/export b/sub/bash/export
index d4600d2..5008337 100644
--- a/sub/bash/export
+++ b/sub/bash/export
@@ -4,7 +4,7 @@ umask 0077
 export EDITOR="nvim"
 export VISUAL="nvim"
 export PAGER="less -R"
-export CDPATH=:..:~:~/code
+export CDPATH=:~:~/code
 
 export HISTSIZE=10000
 export HISTFILESIZE=10000
diff --git a/sub/git/gitconfig b/sub/git/gitconfig
index d804346..3fd0f1a 100644
--- a/sub/git/gitconfig
+++ b/sub/git/gitconfig
@@ -24,6 +24,7 @@
 [alias]
     a = "!git status --short | peco | awk '{print $2}' | xargs git add"
     d = "!git diff --color=always | less -R"
+    ds = "!git diff --staged --color=always | less -R"
     co = checkout
     ci = commit
     ps = "!git push origin $(git rev-parse --abbrev-ref HEAD)"
diff --git a/sub/i3/config b/sub/i3/config
index 0eef904..4ebd832 100644
--- a/sub/i3/config
+++ b/sub/i3/config
@@ -22,7 +22,6 @@ set $mod Mod4
 exec --no-startup-id xset s off
 exec --no-startup-id xset dpms 0 0 0
 exec --no-startup-id xset r rate 250 100
-exec setxkbmap -layout us -option caps:escape
 exec --no-startup-id setxkbmap -model pc105 -layout us,ru -option grp:win_space_toggle
 exec --no-startup-id xdg-mime default firefox.desktop x-scheme-handler/https x-scheme-handler/http
 
diff --git a/sub/i3/xinitrc b/sub/i3/xinitrc
index a875d3f..7abdf71 100644
--- a/sub/i3/xinitrc
+++ b/sub/i3/xinitrc
@@ -1,2 +1,3 @@
 localectl set-x11-keymap us
+setxkbmap -layout us -option caps:escape
 exec i3
diff --git a/sub/zsh/zfunc/_nvim b/sub/zsh/zfunc/_nvim
index 58d124b..34a4236 100644
--- a/sub/zsh/zfunc/_nvim
+++ b/sub/zsh/zfunc/_nvim
@@ -7,8 +7,8 @@ _nvim() {
     if [[ -z "$subcmds" ]]; then
         _files
     else
-        _values -C 'modified files' $subcmds
         _files
+        _values -C 'modified files' $subcmds
     fi
 
 }