Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

separate out completion ui from editing ui #10

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 55 additions & 0 deletions corgi-completion-ui/corgi-completion-ui.el
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
;;; corgi-completion-ui.el --- Interactive completion user interface configuration for Corgi -*- lexical-binding: t -*-
;;
;; Filename: corgi-completion-ui.el
;; Package-Requires: ((company) (counsel) (ivy) (ivy-prescient) (projectile) (swiper))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
;;; Code:

oxalorg marked this conversation as resolved.
Show resolved Hide resolved
(require 'use-package)

(use-package ivy
:defer 0.1
:diminish
:init
(setq ivy-use-virtual-buffers t)
:config
(ivy-mode)
(define-key ivy-minibuffer-map (kbd "C-j") #'ivy-next-line)
(define-key ivy-minibuffer-map (kbd "C-k") #'ivy-previous-line))

(use-package counsel
:after (ivy)
:diminish
:config
(counsel-mode)
;; This ensures that SPC f r (counsel-recentf, show recently opened files)
;; actually works
(recentf-mode 1))

(use-package ivy-prescient
:after (ivy)
:config
(ivy-prescient-mode 1)
(prescient-persist-mode 1))

(use-package swiper
:after (ivy)
:bind (("C-s" . swiper)))

(use-package projectile
:config
(projectile-mode)
(setq projectile-create-missing-test-files t))

(use-package company
:diminish company-mode
:hook (prog-mode . company-mode))

;; silence byte compiler
(require 'ivy)

(provide 'corgi-completion-ui)

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; corgi-completion-ui.el ends here
43 changes: 2 additions & 41 deletions corgi-editor/corgi-editor.el
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
;;; corgi-editor.el --- User interface configuration for Corgi -*- lexical-binding: t -*-
;;; corgi-editor.el --- Editing user interface configuration for Corgi -*- lexical-binding: t -*-
;;
;; Filename: corgi-editor.el
;; Package-Requires: ((use-package) (aggressive-indent) (avy) (company) (counsel) (diminish) (dumb-jump) (evil) (evil-cleverparens) (evil-collection) (evil-surround) (expand-region) (goto-last-change) (ivy) (ivy-prescient) (projectile) (rainbow-delimiters) (smartparens) (smex) (string-edit) (swiper) (undo-fu) (which-key) (winum) (xclip))
;; Package-Requires: ((use-package) (aggressive-indent) (avy) (diminish) (dumb-jump) (evil) (evil-cleverparens) (evil-collection) (evil-surround) (expand-region) (goto-last-change) (rainbow-delimiters) (smartparens) (smex) (string-edit) (undo-fu) (which-key) (winum) (xclip))
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
Expand All @@ -15,35 +15,6 @@
eldoc-mode
subword-mode)

(use-package ivy
:defer 0.1
:diminish
:init
(setq ivy-use-virtual-buffers t)
:config
(ivy-mode)
(define-key ivy-minibuffer-map (kbd "C-j") #'ivy-next-line)
(define-key ivy-minibuffer-map (kbd "C-k") #'ivy-previous-line))

(use-package counsel
:after (ivy)
:diminish
:config
(counsel-mode)
;; This ensures that SPC f r (counsel-recentf, show recently opened files)
;; actually works
(recentf-mode 1))

(use-package ivy-prescient
:after (ivy)
:config
(ivy-prescient-mode 1)
(prescient-persist-mode 1))

(use-package swiper
:after (ivy)
:bind (("C-s" . swiper)))

(use-package avy)

(use-package undo-fu)
Expand Down Expand Up @@ -116,15 +87,6 @@
inferior-emacs-lisp-mode)
. rainbow-delimiters-mode))

(use-package company
:diminish company-mode
:hook (prog-mode . company-mode))

(use-package projectile
:config
(projectile-mode)
(setq projectile-create-missing-test-files t))

(use-package dumb-jump)

(use-package goto-last-change)
Expand All @@ -138,7 +100,6 @@
(require 'evil-core)
(require 'winum)
(require 'evil-collection)
(require 'ivy)

(when (and (not (display-graphic-p))
(executable-find "xclip"))
Expand Down