                         'ace-link))
 
 ;; Docker
-(use-package docker :straight t
-  :defer t)
+(use-package docker
+  :straight t
+  :defer t
+  :commands (docker))
 
 ;; Kubernetes
 (use-package kubel
   :straight t
   :defer t
-  :config (progn
-            (setq kubel-use-namespace-list t)
-            (use-package kubel-evil
-              :straight t
-              :config (add-hook 'kubel-mode 'kubel-evil-mode))))
+  :commands (kubel):config
+  (progn
+    (setq kubel-use-namespace-list t)
+    (use-package kubel-evil
+      :straight t
+      :config (add-hook 'kubel-mode 'kubel-evil-mode))))
 
 ;; Window layout changer
 (use-package rotate

(global-set-key (kbd "M-J")
                'enlarge-window)

;; File manipulation mappings
(evil-leader/set-key "<SPC>" 'save-buffer)

;; Easier C-c C-c
(evil-leader/set-key "i"
  '(lambda ()

(global-set-key (kbd "M-u")
                'universal-argument)

;; Window mappings (not using meain/with-alternate as I need functions)
(defun meain/move-swap-right (&optional swap)
  "Move to window on right or move window to right if SWAP."
  (interactive "P")
