Skip to content

Commit

Permalink
second round..
Browse files Browse the repository at this point in the history
  • Loading branch information
yyr committed Apr 26, 2022
1 parent 5f03a63 commit d3e4ab8
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 26 deletions.
14 changes: 14 additions & 0 deletions init.el
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,20 @@
(load! "init-hippie-expand")
(load! "init-company")

;;; look
(load! "init-font")
(load! "init-point")

;;; window, frame
(load! "init-windows")
(load! "init-frame")

;;; help navigation
(load! "init-navigation")
(load! "init-imenu")
(load! "init-buffers")
(load! "init-recentf")

;; langs
(load! "init-lispy")
(load! "init-elisp")
Expand Down
5 changes: 0 additions & 5 deletions lisp/init-buffers.el
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,6 @@
(ibuffer-switch-to-saved-filter-groups "default")
(ibuffer-auto-mode 1)))

;;;
(el-get 'sync 'ibuffer-vc)
(global-set-key (kbd "C-S-b") #'ibuffer-vc-set-filter-groups-by-vc-root)
(global-set-key (kbd "C-b") 'backward-char)

;; Order the groups so the order is : [Default], [agenda], [emacs]
(defadvice ibuffer-generate-filter-groups (after reverse-ibuffer-groups ()
activate)
Expand Down
7 changes: 0 additions & 7 deletions lisp/init-editing.el

This file was deleted.

5 changes: 1 addition & 4 deletions lisp/init-frame.el
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
;; Author: Yagnesh Raghava Yakkala. http://yagnesh.org

;; full screen
(ensure-package-installed 'smart-mode-line)

;;; http://stackoverflow.com/a/7763907
(defun max-emacs-x-window (&optional f)
Expand All @@ -21,7 +22,6 @@
;; (set-frame-parameter (selected-frame) 'alpha '(100 95))
;; (add-to-list 'default-frame-alist '(alpha 100 95))

(el-get 'sync 'smart-mode-line)
(add-hook 'after-init-hook 'sml/setup)

(setq rm-blacklist
Expand All @@ -32,9 +32,6 @@
" zx" " Ref" " Outl"
" Ind" " Guide" " Compiling"))

;; (el-get 'sync '(jazz-theme
;; solarized-emacs))

;; (setq sml/show-client t)
;; (sml/apply-theme 'automatic)

Expand Down
2 changes: 1 addition & 1 deletion lisp/init-imenu.el
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
;;; init-imenu.el
;; Author: Yagnesh Raghava Yakkala. http://yagnesh.org

(el-get 'sync 'imenu-anywhere)
(ensure-package-installed 'imenu-anywhere)

(setq imenu-auto-rescan t)

Expand Down
5 changes: 4 additions & 1 deletion lisp/init-navigation.el
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
;; ace-jump-mode - navigation by searching
;; jump-char - char type navigation

(el-get 'sync '(ace-jump-mode))
(ensure-package-installed '(goto-chg ace-jump-mode))

(global-set-key (kbd "C-x C-/") 'goto-last-change)
(global-set-key (kbd "C-x C-?") 'goto-last-change-reverse)

(define-key global-map (kbd "M-l") 'ace-jump-mode) ; was downcase-word
(define-key global-map (kbd "M-L") 'downcase-word)
Expand Down
15 changes: 8 additions & 7 deletions lisp/init-windows.el
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,17 @@
;;----------------------------------------------------------------------------
(defun split-window-func-with-other-buffer (split-function)
"dont just dumb split window, change buffer as well"
(eval-when-compile (require 'cl))
(lexical-let ((s-f split-function))
(lambda ()
(interactive)
(funcall s-f)
(func all s-f)
(set-window-buffer (next-window) (other-buffer)))))

(global-set-key "\C-x2"
(split-window-func-with-other-buffer 'split-window-vertically))
(global-set-key "\C-x3"
(split-window-func-with-other-buffer 'split-window-horizontally))
;; (global-set-key "\C-x2"
;; (split-window-func-with-other-buffer 'split-window-vertically))
;; (global-set-key "\C-x3"
;; (split-window-func-with-other-buffer 'split-window-horizontally))


;;----------------------------------------------------------------------------
Expand All @@ -47,8 +48,8 @@
(global-set-key "\C-x|" 'split-window-horizontally-instead)
(global-set-key "\C-x_" 'split-window-vertically-instead)

(global-set-key [f2] (split-window-func-with-other-buffer 'split-window-horizontally))
(global-set-key (kbd "<S-f2>") 'delete-other-windows)
;; (global-set-key [f2] (split-window-func-with-other-buffer 'split-window-horizontally))
;; (global-set-key (kbd "<S-f2>") 'delete-other-windows)
(global-set-key (kbd "M-4") 'split-window-vertically) ; was digit-argument
(global-set-key (kbd "M-3") 'delete-other-windows) ; was digit-argument

Expand Down
1 change: 0 additions & 1 deletion lisp/init-yasnip.el
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
(eval-after-load "yasnippet"
`(progn
(add-to-list 'yas-snippet-dirs "~/.emacs.d/snippets/")
(add-to-list 'yas-snippet-dirs "~/.emacs.d/el-get/yasnippet-snippets/" t)
(yas-reload-all)))

;;; Stop blabbering
Expand Down

0 comments on commit d3e4ab8

Please sign in to comment.