aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Odersky <jakob@driver.xyz>2018-06-29 17:56:06 -0700
committerJakob Odersky <jakob@odersky.com>2018-07-02 20:16:09 -0700
commitfc21d41f477c35ad1a2ea4c29258c2e55ef237e3 (patch)
tree9beb3455c36b3521e1fcc566406ab86a12f86e9c
parente457afccd30530153d075d0bbb41078fcecef669 (diff)
downloaddotfiles-fc21d41f477c35ad1a2ea4c29258c2e55ef237e3.tar.gz
dotfiles-fc21d41f477c35ad1a2ea4c29258c2e55ef237e3.tar.bz2
dotfiles-fc21d41f477c35ad1a2ea4c29258c2e55ef237e3.zip
Git and i3 tweaks
-rw-r--r--home/.config/i3/config4
-rw-r--r--home/.gitconfig1
-rw-r--r--home/.gitignore_global1
3 files changed, 6 insertions, 0 deletions
diff --git a/home/.config/i3/config b/home/.config/i3/config
index 32231ce..5f12e1a 100644
--- a/home/.config/i3/config
+++ b/home/.config/i3/config
@@ -132,6 +132,10 @@ set $term sakura
# move focus to the parent container
bindsym $mod+a focus parent
bindsym $mod+z focus child
+
+ # hide and show status bar
+ bindsym $mod+t bar mode toggle
+
#
# Scratchpad:
#
diff --git a/home/.gitconfig b/home/.gitconfig
index 686eef0..c8b324e 100644
--- a/home/.gitconfig
+++ b/home/.gitconfig
@@ -9,6 +9,7 @@
hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
lg = log --oneline --decorate --all --graph
pr = "!f() { git fetch ${2:-upstream} pull/$1/head:pr/$1; }; f"
+ graph = "!f() { echo 'digraph git { node [fontsize = 10.0, shape = box];' ; git log --pretty='format: %H -> { %P }' \"$@\" | sed 's/[0-9a-f]\\{40\\}/\"&\"/g' ; git log --pretty='format: \"%H\" [ label = \"%h - %an - %ar\\n%f\" ]' \"$@\" ; echo '}'; }; f"
[push]
default = simple
[core]
diff --git a/home/.gitignore_global b/home/.gitignore_global
index 6293962..ac8c11a 100644
--- a/home/.gitignore_global
+++ b/home/.gitignore_global
@@ -1,3 +1,4 @@
+.bloop/
.ensime_cache/
.ensime
.idea/