Skip to content

Commit

Permalink
Merge pull request #115 from kotct/release/v0.2.0
Browse files Browse the repository at this point in the history
Release v0.2.0 to stable
  • Loading branch information
rye authored Jul 15, 2018
2 parents 6b9e2e4 + 8e17ab5 commit ca08acf
Show file tree
Hide file tree
Showing 27 changed files with 583 additions and 83 deletions.
1 change: 1 addition & 0 deletions .emacs.d/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ network-security.data
session.*
recentf
custom.el
eshell/

# packages
elpa/
Expand Down
3 changes: 3 additions & 0 deletions .emacs.d/init.el
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
;;; dot/.emacs

;; load any absolute must-have code
(load "~/.emacs-preload" 'noerror 'nomessage 'nosuffix)

;; Initialize the package repository.
(package-initialize)

Expand Down
15 changes: 6 additions & 9 deletions .emacs.d/lisp/behavior/pane-management.el
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,12 @@ or if passed an argument, but just current frame if otherwise."
(condition-case nil
(let ((frame-list (frame-list)))
(if (or (= (length frame-list) 1) arg)
(if (not (boundp 'server-process))
(if (y-or-n-p "Kill Emacs?")
(kill-emacs)
(message "Didn't do anything, promise!"))
(if (y-or-n-p "Kill Emacs?")
(kill-emacs)
(if (y-or-n-p "Delete current frame?")
(delete-frame)
(message "Didn't do anything, promise!"))))
(if (y-or-n-p "Kill Emacs?")
(save-buffers-kill-emacs)
(if (and (boundp 'server-process)
(y-or-n-p "Delete current frame?"))
(delete-frame)
(message "Didn't do anything, promise!")))
(delete-frame)))
(error (kill-emacs))))

Expand Down
10 changes: 5 additions & 5 deletions .emacs.d/lisp/behavior/text.el
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@

(require 'cl)

;;; ace jump mode
(global-set-key (kbd "C-c SPC") #'ace-jump-mode)
;;; avy jump mode
(global-set-key (kbd "C-c SPC") #'avy-goto-word-1)
(global-set-key (kbd "C-c '") #'avy-goto-char)

;; save zapped chars to kill ring
(setf ajz/zap-function #'kill-region)
(global-set-key (kbd "M-z") #'ace-jump-zap-to-char)

(setf avy-zap-function #'kill-region)
(global-set-key (kbd "M-z") #'avy-zap-to-char-dwim)

;;; jump to line
(global-set-key (kbd "C-x g") #'goto-line)
Expand Down
11 changes: 11 additions & 0 deletions .emacs.d/lisp/code/languages/fish.el
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
(require 'fish-mode)

(smart-tabs-add-language-support fish fish-mode-hook
((fish-indent-line . standard-indent)
(fish-indent-region . standard-indent)))

(smart-tabs-insinuate 'fish)

(add-hook 'fish-mode-hook (lambda () (setf indent-tabs-mode t)))

(provide 'fish)
7 changes: 7 additions & 0 deletions .emacs.d/lisp/code/languages/go.el
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
(add-hook 'go-mode-hook (lambda ()
(local-set-key (kbd "M-.") 'godef-jump)))

(with-eval-after-load 'go-mode
(require 'go-autocomplete))

(provide 'go)
6 changes: 5 additions & 1 deletion .emacs.d/lisp/code/languages/language-hub.el
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@
'(c
elisp
elixir
fish
ruby
rust
java
web-c)
sh
web-c
go
tex)
"A list of packages configured by the language-hub.")

(let ((to-compile ()))
Expand Down
16 changes: 16 additions & 0 deletions .emacs.d/lisp/code/languages/sh.el
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
(require 'indentation)

;; Synchronize `sh-basic-offset' and `sh-indentation' to the global tab size
(kotct/setf-tab sh-basic-offset)
(kotct/setf-tab sh-indentation)

;; Always use indent-tabs-mode in sh-mode
(add-hook 'sh-mode-hook (lambda () (setf indent-tabs-mode t)))

;; Indent case labels at the same level as the case statement
(setf sh-indent-for-case-label 0)

;; Indent case alts to +
(setf sh-indent-for-case-alt '+)

(provide 'sh)
7 changes: 7 additions & 0 deletions .emacs.d/lisp/code/languages/tex.el
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
(add-hook 'tex-mode-hook (lambda ()
(visual-line-mode +1)
(require 'ispell)
(if (executable-find ispell-program-name)
(flyspell-mode +1))))

(provide 'tex)
2 changes: 1 addition & 1 deletion .emacs.d/lisp/file/file-content.el
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;; make sure files always have a LF at EOF when saving
;; if you don't want this for a particular file, do
;; M-x set-variable RET require-final-newline RET nil RET
(setf require-final-newline t)
(setq-default require-final-newline t)

(provide 'file-content)
2 changes: 1 addition & 1 deletion .emacs.d/lisp/file/recentf-c.el
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
(setf recentf-max-saved-items 200)

;; Set timer to save `recentf-list' every 5 minutes.
(run-at-time t (* 5 60) #'recentf-save-list)
(run-at-time (* 5 60) (* 5 60) #'recentf-save-list)

;; recentf completion using `ido-mode'
;;
Expand Down
4 changes: 0 additions & 4 deletions .emacs.d/lisp/file/tramp-c.el
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
;;; C-c C-f: find the current file as sudo

;; ssh is faster than the default scp
(with-eval-after-load 'tramp
(setf tramp-default-method "ssh"))

(defun kotct/sudo-edit (&optional arg)
"Edit currently visited file as root.
With a prefix ARG prompt for a file to visit.
Expand Down
16 changes: 14 additions & 2 deletions .emacs.d/lisp/package/dependencies.el
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,31 @@
auto-complete ;; code autocompletion
markdown-mode ;; major mode for markdown
smart-tabs-mode ;; indentation with tabs and spaces
ace-jump-mode ;; immediately jump to any visible character
ace-jump-zap ;; zap-to-char but harnessing ace-jump
avy ;; immediately jump to any visible character
avy-zap ;; zap-to-char but harnessing avy
editorconfig ;; editorconfig plugin
hl-todo ;; highlight TODO, FIXME, FAIL, etc.
highlight-symbol ;; navigate between and highlight symbols
web-mode ;; for editing web files
elixir-mode ;; for editing Elixir code
rust-mode ;; for editing Rust code
yaml-mode ;; for editing YAML files
buttercup ;; for tests
smartparens ;; for dealing with paired control flow symbols
gitignore-mode ;; for editing .gitignore files
gitattributes-mode ;; for editing .gitattributes files
gitconfig-mode ;; for editing .git/config files
fish-mode ;; for editing fish shell configuration files
go-mode ;; for editing go code
go-autocomplete ;; AC support for go

;; THEMES
solarized-theme)
"A list of all packages required for operation.")

(with-eval-after-load 'package
(setf package-pinned-packages
'(;; stable highlight-symbol is very old and VERY LOUD
(highlight-symbol . "melpa"))))

(provide 'dependencies)
Loading

0 comments on commit ca08acf

Please sign in to comment.