From f2458c846c0f909113f7d4178265f37500db025e Mon Sep 17 00:00:00 2001
From: Maciej Szlosarczyk <maciej@sosek.net>
Date: Sat, 6 Mar 2021 14:02:07 +0200
Subject: [PATCH] Add terminal

---
 init.el                      |  1 +
 pkg/hydra.el                 |  3 +++
 pkg/keys-mode.el             |  6 ------
 pkg/sys-specific.el          | 14 ++++----------
 pkg/term.el                  | 25 +++++++++++++++++++++++++
 straight/versions/default.el |  1 +
 6 files changed, 34 insertions(+), 16 deletions(-)
 create mode 100644 pkg/term.el

diff --git a/init.el b/init.el
index ced8b08..999da65 100644
--- a/init.el
+++ b/init.el
@@ -45,6 +45,7 @@
 (require 'icejam-pkg-dashboard "$HOME/.emacs.d/pkg/dashboard.el")
 (require 'icejam-pkg-undo-tree "$HOME/.emacs.d/pkg/undo-tree.el")
 (require 'icejam-pkg-avy "$HOME/.emacs.d/pkg/avy.el")
+(require 'icejam-pkg-term "$HOME/.emacs.d/pkg/term.el")
 
 ;; Themes
 (require 'icejam-themes "$HOME/.emacs.d/themes/themes.el")
diff --git a/pkg/hydra.el b/pkg/hydra.el
index 97829b7..dc09a00 100644
--- a/pkg/hydra.el
+++ b/pkg/hydra.el
@@ -2,6 +2,9 @@
 ;;; Commentary:
 ;;; Global hydra definitions.
 ;;; Code:
+
+(require 'icejam-pkg-avy "$HOME/.emacs.d/pkg/avy.el")
+
 (use-package hydra
   :straight t
   :defer t
diff --git a/pkg/keys-mode.el b/pkg/keys-mode.el
index abe58d9..51294c2 100644
--- a/pkg/keys-mode.el
+++ b/pkg/keys-mode.el
@@ -49,12 +49,6 @@
 ;; List buffers
 (define-key icejam-keys-mode-map (kbd "C-c b") 'ibuffer)
 
-;; Create new terminal
-(defun start-zsh-term ()
-  "Start ZSH terminal session."
-  (ansi-term "/bin/zsh" "Zsh"))
-(define-key icejam-keys-mode-map (kbd "<f12>") 'start-zsh-term)
-
 ;; Revert without asking
 (defun revert-buffer-no-confirm ()
   "Revert buffer without confirmation."
diff --git a/pkg/sys-specific.el b/pkg/sys-specific.el
index 3d98517..0202777 100644
--- a/pkg/sys-specific.el
+++ b/pkg/sys-specific.el
@@ -51,18 +51,12 @@
 
 ;;;;;;;;; Mac-specific config ;;;;;;;;;;;;;;;;;;;;;
 (if IS-GNU
-      ;;;;;;;;; Linux Ego bindings (fix) ;;;;;;;;;;;;;;;;;;
+    (progn
+      ;;;;;;;;; Linux Ergo bindings (fix) ;;;;;;;;;;;;;;;;;;
       (define-key icejam-keys-mode-map (kbd "C-<right>") 'end-of-line)
       (define-key icejam-keys-mode-map (kbd "C-<left>") 'beginning-of-line)
       (define-key icejam-keys-mode-map (kbd "C-<up>") 'scroll-down) ; WTF is this reverse, I dunno
-      (define-key icejam-keys-mode-map (kbd "C-<down>") 'scroll-up)
-      (define-key icejam-keys-mode-map (kbd "C-a") 'mark-whole-buffer)
-      (define-key icejam-keys-mode-map (kbd "C-v") 'yank)
-      (define-key icejam-keys-mode-map (kbd "C-x") 'kill-region)
-      (define-key icejam-keys-mode-map (kbd "C-c") 'kill-ring-save)
-      (define-key icejam-keys-mode-map (kbd "C-s") 'save-buffer)
-      (define-key icejam-keys-mode-map (kbd "C-l") 'goto-line)
-      (define-key icejam-keys-mode-map (kbd "C-z") 'undo))
+      (define-key icejam-keys-mode-map (kbd "C-<down>") 'scroll-up)))
 
 ;;;;;;;;; BSD-specific config ;;;;;;;;;;;;;;;;;;;;;
 (if IS-BSD
@@ -80,7 +74,7 @@
       (define-key icejam-keys-mode-map (kbd "A-l") 'goto-line)
       (define-key icejam-keys-mode-map (kbd "A-w" 'icejam-delete-window)
       (define-key icejam-keys-mode-map (kbd "A-z") 'undo)
-      (define-key icejam-keys-mode-map (kbd "A-q") 'kill-emacs)))
+      (define-key icejam-keys-mode-map (kbd "A-q") 'kill-emacs))))
 
 (provide 'icejam-pkg-sys-specific)
 ;;; sys-specific.el ends here
diff --git a/pkg/term.el b/pkg/term.el
new file mode 100644
index 0000000..6b1f4a4
--- /dev/null
+++ b/pkg/term.el
@@ -0,0 +1,25 @@
+;;; term.el --- summary
+
+;; Author: Maciej Szlosarczyk
+;; Maintainer: Maciej Szlosarczyk
+;; Version: 0.1-snapshot
+
+;;; Commentary:
+
+;; Proper terminal in Emacs
+
+;;; Code:
+(require 'icejam-pkg-keys-mode "$HOME/.emacs.d/pkg/keys-mode.el")
+
+(use-package vterm :straight t :defer t)
+
+;; Create new terminal
+(defun start-term ()
+  "Start ZSH terminal session."
+  (interactive)
+  (vterm))
+
+(define-key icejam-keys-mode-map (kbd "<f12>") 'start-term)
+
+(provide 'icejam-pkg-term)
+;;; term.el ends here
diff --git a/straight/versions/default.el b/straight/versions/default.el
index 8fc5bd9..2499091 100644
--- a/straight/versions/default.el
+++ b/straight/versions/default.el
@@ -27,6 +27,7 @@
  ("emacs-elixir" . "9de08c17d54e190d220aa03cca58bd41497f44b6")
  ("emacs-fsharp-mode" . "78898a1535878394d83643c383f4320e7b5fcefd")
  ("emacs-hcl-mode" . "e12b1df2ca28d2b06c471cd709c038a2dc0bcdbd")
+ ("emacs-libvterm" . "a86a1a9a92620a26edf5275f43ce0bf40f3b792f")
  ("emacs-planet-theme" . "b0a310ff36565fe22224c407cf59569986698a32")
  ("emacs-racer" . "f17f9d73c74ac86001a19d08735e6b966d6c5609")
  ("emacs-which-key" . "c0608e812a8d1bc7aefeacdfaeb56a7272eabf44")