From dc3a3660943e18d93d0f7d925ec9ca3b12f2fd19 Mon Sep 17 00:00:00 2001
From: Ruslan Kamashev <rynffoll@gmail.com>
Date: Sat, 8 Sep 2018 03:51:37 +0300
Subject: [PATCH] Fix bindings

---
 modules/config/default/+bindings.el |  5 ++++-
 modules/tools/docker/config.el      | 18 ++++--------------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/modules/config/default/+bindings.el b/modules/config/default/+bindings.el
index df7258d15..ebfbfbd42 100644
--- a/modules/config/default/+bindings.el
+++ b/modules/config/default/+bindings.el
@@ -729,7 +729,10 @@
           :desc "Send to Transmit"          :n "u" #'+macos/send-to-transmit
           :desc "Send project to Transmit"  :n "U" #'+macos/send-project-to-transmit
           :desc "Send to Launchbar"         :n "l" #'+macos/send-to-launchbar
-          :desc "Send project to Launchbar" :n "L" #'+macos/send-project-to-launchbar))
+          :desc "Send project to Launchbar" :n "L" #'+macos/send-project-to-launchbar)
+
+        (:when (featurep! :tools docker)
+          :desc "Docker"                    :n "D" #'docker))
 
       (:desc "project" :prefix "p"
         :desc "Browse project"          :n  "." #'+default/browse-project
diff --git a/modules/tools/docker/config.el b/modules/tools/docker/config.el
index d17963fa8..9178c41bb 100644
--- a/modules/tools/docker/config.el
+++ b/modules/tools/docker/config.el
@@ -1,22 +1,12 @@
 ;;; tools/docker/config.el -*- lexical-binding: t; -*-
 
-(def-package! docker)
-(def-package! docker-tramp)
-(def-package! dockerfile-mode)
-
-(after! docker
+(def-package! docker
+  :config
   (set-evil-initial-state! 'docker-container-mode 'emacs)
   (set-evil-initial-state! 'docker-image-mode 'emacs)
   (set-evil-initial-state! 'docker-network-mode 'emacs)
   (set-evil-initial-state! 'docker-volume-mode 'emacs)
   (set-evil-initial-state! 'docker-machine-mode 'emacs))
 
-(map!
- (:leader
-   (:prefix "d"
-     :desc "Docker":n            "." #'docker
-     :desc "Docker Containers":n "c" #'docker-containers
-     :desc "Docker Images":n     "i" #'docker-images
-     :desc "Docker Networks":n   "n" #'docker-networks
-     :desc "Docker Volumes":n    "v" #'docker-volumes
-     :desc "Docker Machines":n   "m" #'docker-machines)))
+(def-package! docker-tramp)
+(def-package! dockerfile-mode)