From e818539e60de3e1799eb8f6b91149c3e658af2ba Mon Sep 17 00:00:00 2001
From: CramMK <ma_tho@web.de>
Date: Mon, 10 Feb 2020 15:57:19 +0100
Subject: [PATCH] minor things, add tmuxconf

---
 README.md                             | 11 ++++++++---
 config.yaml                           | 16 ++++++++++------
 dotdrop                               |  2 +-
 dotfiles/picom.conf                   |  9 +++++++++
 dotfiles/tmux.conf                    | 18 ++++++++++++++++++
 dotfiles/vimrc                        |  2 ++
 dotfiles/zsh.themes/the-one.zsh-theme |  2 +-
 dotfiles/zshrc                        |  6 ++++--
 8 files changed, 53 insertions(+), 13 deletions(-)
 create mode 100644 dotfiles/tmux.conf

diff --git a/README.md b/README.md
index 55ce3bc..bf269a4 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,20 @@
 Dotfiles
 ========
 
-My personal configurations, managed with the 'dotdrop' submodule
-
+My personal configurations, managed with the 'dotdrop' submodule.
 
 | Usage | Name |
 | :--- | :--- |
-| OS | Fedora |
+| Distribution | Fedora 31 |
 | Shell | zsh with oh-my-zsh |
 | WM | i3 |
 | Terminal | xterm |
 | Font | Inconsolata |
+| VIM-Theme | OneDark |
+| VIM-Bar | lightline |
+| Bar | i3Bar |
 | Transparency | picom |
 | Wallpaper | teh |
+
+![xterm](LINK)
+![vim](LINK)
diff --git a/config.yaml b/config.yaml
index b22dca1..6085e0c 100644
--- a/config.yaml
+++ b/config.yaml
@@ -56,6 +56,9 @@ dotfiles:
   f_picom:
     src: picom.conf
     dst: ~/.config/picom.conf
+  f_tmux:
+    src: tmux.conf
+    dst: ~/.tmux.conf
 profiles:
   laptop:
     include:
@@ -65,6 +68,7 @@ profiles:
     - i3
     - font
     - picom
+    - tmux
     - gdb
   work:
     include:
@@ -74,17 +78,14 @@ profiles:
     - i3
     - font
     - picom
+    - tmux
     - gdb
-  dev-linux:
-    include:
-    - zsh
-    - vim
-  dev-obsd:
+  dev:
     include:
     - zsh
     - vim
 
-  # Packages to be used above
+ # Packages to be used above
   bash:
     dotfiles:
     - f_bashrc
@@ -114,3 +115,6 @@ profiles:
   picom:
     dotfiles:
     - f_picom
+  tmux:
+    dotfiles:
+    - f_tmux
diff --git a/dotdrop b/dotdrop
index d860c07..b56e8ea 160000
--- a/dotdrop
+++ b/dotdrop
@@ -1 +1 @@
-Subproject commit d860c07f64006d87814d85417e6b04fdbb25d268
+Subproject commit b56e8ea00b107705d8c4235f3fef471b4c753224
diff --git a/dotfiles/picom.conf b/dotfiles/picom.conf
index 116587b..afec842 100644
--- a/dotfiles/picom.conf
+++ b/dotfiles/picom.conf
@@ -1,7 +1,16 @@
+{%@@ if profile == "laptop" @@%}
 opacity-rule = [
     "85:class_g = 'XTerm' && !focused",
     "95:class_g = 'XTerm' && focused",
 ];
+{%@@ endif @@%}
+
+{%@@ if profile == "work" @@%}
+opacity-rule = [
+    "90:class_g = 'XTerm' && !focused",
+    "100:class_g = 'XTerm' && focused",
+];
+{%@@ endif @@%}
 
 wintypes: {
     dock = { opacity = 0.8; }
diff --git a/dotfiles/tmux.conf b/dotfiles/tmux.conf
new file mode 100644
index 0000000..7175e48
--- /dev/null
+++ b/dotfiles/tmux.conf
@@ -0,0 +1,18 @@
+set -g default-terminal "screen-256color"
+set-option -g default-shell /bin/zsh
+
+set -g history-limit 10000
+
+#some vi behaviour
+bind-key -r h select-pane -L
+bind-key -r j select-pane -D
+bind-key -r k select-pane -U
+bind-key -r l select-pane -R
+
+bind-key v split-window -h
+bind-key s split-window -v
+
+# colors
+set -g status-bg black
+set -g status-fg white
+set -g status-right '%Y.%m.%d %H:%M'
diff --git a/dotfiles/vimrc b/dotfiles/vimrc
index 802623c..35e3325 100644
--- a/dotfiles/vimrc
+++ b/dotfiles/vimrc
@@ -85,6 +85,7 @@ set encoding=utf-8
 set mouse=a
 set mouse=c
 set undolevels=1337
+set backspace=indent,eol,start
 
 " Indents
 set tabstop=4
@@ -112,6 +113,7 @@ cmap Wq wq
 cmap Q q
 cmap W w
 cmap q1 q!
+map <C-f> :Ex <CR>
 
 " go to line edited, when closed
 if has("autocmd")
diff --git a/dotfiles/zsh.themes/the-one.zsh-theme b/dotfiles/zsh.themes/the-one.zsh-theme
index d9fc419..f1dc2ee 100644
--- a/dotfiles/zsh.themes/the-one.zsh-theme
+++ b/dotfiles/zsh.themes/the-one.zsh-theme
@@ -11,7 +11,7 @@
 #
 # modded by Marc
 
-PROMPT='%{$fg_bold[green]%}➜ %{$fg_bold[green]%}%p %{$fg_bold[blue]%}%~ $(git_prompt_info)% %{$reset_color%}'
+PROMPT='%{$fg[yellow]%}[%m] %{$fg_bold[green]%}➜ %{$fg_bold[green]%}%p %{$fg_bold[blue]%}%~ $(git_prompt_info)% %{$reset_color%}'
 
 ZSH_THEME_GIT_PROMPT_CLEAN=") %{$fg_bold[green]%}✔ "
 ZSH_THEME_GIT_PROMPT_DIRTY=") %{$fg_bold[yellow]%}✗ "
diff --git a/dotfiles/zshrc b/dotfiles/zshrc
index d2a90bd..98a873e 100644
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@@ -29,10 +29,12 @@ alias vimrc="vim ~/.vimrc"
 
 alias dotdrop="~/dotfiles/dotdrop.sh" --cfg="~/dotfiles/config.yaml"
 
+alias screenshot="import ~/Downloads/Screenshot-$(date '+%Y%m%d-%H%M%S').png"
+
 alias fonts="/home/$USER/.local/share/fonts"
 alias listfonts="fc-list :scalable=true:spacing=mono: family"
 alias cachefonts="fc-cache -f -v"
 
-if [ -f ~/.zsh/zshaliases_local ]; then
-    source ~/.zsh/zshaliases_local
+if [ -f ~/.zshaliases_local ]; then
+    source ~/.zshaliases_local
 fi