Reorder using Stow better

13 files changed, 41 insertions, 23 deletions

diff --git a/bash/.bash_aliases b/bash/dot-bash_aliases
index 55b8292..55b8292 100644
--- a/bash/.bash_aliases
+++ b/bash/dot-bash_aliases
diff --git a/bash/.bash_profile b/bash/dot-bash_profile
index 7d5f3c9..7d5f3c9 100644
--- a/bash/.bash_profile
+++ b/bash/dot-bash_profile
diff --git a/bash/.bashrc b/bash/dot-bashrc
index df74698..df74698 100644
--- a/bash/.bashrc
+++ b/bash/dot-bashrc
diff --git a/git/.git-prompt.sh b/git/dot-git-prompt.sh
index 64219e6..64219e6 100644
--- a/git/.git-prompt.sh
+++ b/git/dot-git-prompt.sh
diff --git a/git/.gitconfig b/git/dot-gitconfig
index e293ba4..86dcce2 100644
--- a/git/.gitconfig
+++ b/git/dot-gitconfig
@@ -13,3 +13,5 @@
 	default = simple
 [alias]
 	lg = log --graph --oneline --decorate --all
+[pull]
+	ff = only
diff --git a/i3/config b/i3/i3/config
index ca89d6e..b599bdd 100644
--- a/i3/config
+++ b/i3/i3/config
@@ -34,12 +34,12 @@ exec --no-startup-id nm-applet
 set $refresh_i3status killall -SIGUSR1 i3status
 bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status
 bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status
-bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
-bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
+bindsym XF86AudioMute        exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
+bindsym XF86AudioMicMute     exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
 
 # Brightness control
-bindsym XF86MonBrightnessUp exec light -A 10 # increase screen brightness
-bindsym XF86MonBrightnessDown exec light -U 10 # decrease screen brightness
+bindsym XF86MonBrightnessUp   exec light -A 5  # increase screen brightness
+bindsym XF86MonBrightnessDown exec light -U 5  # decrease screen brightness
 
 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod
@@ -70,10 +70,10 @@ bindsym $mod+Up focus up
 bindsym $mod+Right focus right
 
 # move focused window
-bindsym $mod+Shift+j move left
-bindsym $mod+Shift+k move down
-bindsym $mod+Shift+l move up
-bindsym $mod+Shift+ntilde move right
+bindsym $mod+Shift+h move left
+bindsym $mod+Shift+j move down
+bindsym $mod+Shift+k move up
+bindsym $mod+Shift+l move right
 
 # alternatively, you can use the cursor keys:
 bindsym $mod+Shift+Left move left
@@ -82,10 +82,10 @@ bindsym $mod+Shift+Up move up
 bindsym $mod+Shift+Right move right
 
 # split in horizontal orientation
-bindsym $mod+Shift+h split h
+bindsym $mod+Control+h split h
 
 # split in vertical orientation
-bindsym $mod+Shift+v split v
+bindsym $mod+Control+v split v
 
 # enter fullscreen mode for the focused container
 bindsym $mod+f fullscreen toggle
@@ -159,10 +159,10 @@ mode "resize" {
         # Pressing right will grow the window’s width.
         # Pressing up will shrink the window’s height.
         # Pressing down will grow the window’s height.
-        bindsym j resize shrink width 10 px or 10 ppt
-        bindsym k resize grow height 10 px or 10 ppt
-        bindsym l resize shrink height 10 px or 10 ppt
-        bindsym ntilde resize grow width 10 px or 10 ppt
+        bindsym h resize shrink width 10 px or 10 ppt
+        bindsym j resize grow height 10 px or 10 ppt
+        bindsym k resize shrink height 10 px or 10 ppt
+        bindsym l resize grow width 10 px or 10 ppt
 
         # same bindings, but for the arrow keys
         bindsym Left resize shrink width 10 px or 10 ppt
@@ -183,3 +183,19 @@ bindsym $mod+r mode "resize"
 bar {
         status_command i3status
 }
+
+
+## Clipboard Screenshots
+bindsym Print       exec --no-startup-id maim | xclip -selection clipboard -t image/png
+bindsym Shift+Print exec --no-startup-id maim --select | xclip -selection clipboard -t image/png
+
+
+# TODO:
+#bindsym XF86TouchpadToggle       exec xinput --disable 12
+#bindsym XF86TouchpadToggle       exec xinput --enable  12
+bindsym $mod+Shift+t exec xinput --enable  12
+bindsym $mod+t       exec xinput --disable  12
+
+
+# Keyboard layout change
+# bindsym $mod+x exec setxkbmap ru
diff --git a/i3status/config b/i3status/i3status/config
index 4583ca8..4583ca8 100644
--- a/i3status/config
+++ b/i3status/i3status/config
diff --git a/install.sh b/install.sh
index 2cd6510..a76a6bc 100644
--- a/install.sh
+++ b/install.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Link at home folder
-stow -Rt ~ bash tmux git
+stow --dotfiles -Rt ~ bash tmux git
 
 # Link at XDG_CONFIG_HOME if set, if not to $HOME/.config (they should be the same)
 stow -Rt ${XDG_CONFIG_HOME:=$HOME/.config} nvim
@@ -10,14 +10,14 @@ stow -Rt ${XDG_CONFIG_HOME:=$HOME/.config} nvim
 # stow -Rt "${XDG_CONFIG_HOME:=$HOME/.config}/konsole" konsole
 
 # kitty
-stow -Rt "${XDG_CONFIG_HOME:=$HOME/.config}/kitty" kitty
+stow -Rt ${XDG_CONFIG_HOME:=$HOME/.config} kitty
 
 # Guix channels
 stow -Rt "${XDG_CONFIG_HOME:=$HOME/.config}/guix" guix
 
 # i3
-stow -Rt "${XDG_CONFIG_HOME:=$HOME/.config}/i3" i3
-stow -Rt "${XDG_CONFIG_HOME:=$HOME/.config}/i3status" i3status
+stow -Rt ${XDG_CONFIG_HOME:=$HOME/.config} i3
+stow -Rt ${XDG_CONFIG_HOME:=$HOME/.config} i3status
 # Plasma session environment variables
 #stow -Rt "${XDG_CONFIG_HOME:=$HOME/.config}/plasma-workspace/env" plasma-env
 
diff --git a/kitty/dracula.conf b/kitty/kitty/dracula.conf
index f517731..f517731 100644
--- a/kitty/dracula.conf
+++ b/kitty/kitty/dracula.conf
diff --git a/kitty/greyscale.conf b/kitty/kitty/greyscale.conf
index 02cc41a..02cc41a 100644
--- a/kitty/greyscale.conf
+++ b/kitty/kitty/greyscale.conf
diff --git a/kitty/kitty.conf b/kitty/kitty/kitty.conf
index 4b8a0c1..4b8a0c1 100644
--- a/kitty/kitty.conf
+++ b/kitty/kitty/kitty.conf
diff --git a/tmux/.tmux.conf b/tmux/dot-tmux.conf
index dfa24d7..dfa24d7 100644
--- a/tmux/.tmux.conf
+++ b/tmux/dot-tmux.conf
diff --git a/uninstall.sh b/uninstall.sh
index 3c1e99b..fc3c2c6 100644
--- a/uninstall.sh
+++ b/uninstall.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 
 # Link at home folder
-stow -Dt ~ bash tmux git
+stow --dotfiles -Dt ~ bash tmux git
 
 # Link at XDG_CONFIG_HOME if set, if not to $HOME/.config (they should be the same)
 
 # NeoVim
-stow -Dt ${XDG_CONFIG_HOME:=$HOME/.config} -D nvim
+stow -Dt ${XDG_CONFIG_HOME:=$HOME/.config} nvim
 
 # Shepherd
 stow -Dt ${XDG_CONFIG_HOME:=$HOME/.config} shepherd
@@ -15,13 +15,13 @@ stow -Dt ${XDG_CONFIG_HOME:=$HOME/.config} shepherd
 # stow -Rt "${XDG_CONFIG_HOME:=$HOME/.config}/konsole" konsole
 
 # kitty
-stow -Dt "${XDG_CONFIG_HOME:=$HOME/.config}/kitty" kitty
+stow -Dt ${XDG_CONFIG_HOME:=$HOME/.config} kitty
 
 # Guix channels
 stow -Dt "${XDG_CONFIG_HOME:=$HOME/.config}/guix" guix
 
 # i3
-stow -Dt "${XDG_CONFIG_HOME:=$HOME/.config}/i3" i3
-stow -Dt "${XDG_CONFIG_HOME:=$HOME/.config}/i3status" i3status
+stow -Dt ${XDG_CONFIG_HOME:=$HOME/.config} i3
+stow -Dt ${XDG_CONFIG_HOME:=$HOME/.config} i3status
 # Plasma session environment variables
 #stow -Rt "${XDG_CONFIG_HOME:=$HOME/.config}/plasma-workspace/env" plasma-env