diff --git a/config.el b/config.el index da75d06..dad4746 100644 --- a/config.el +++ b/config.el @@ -66,7 +66,8 @@ (spaceline-spacemacs-theme) :config (spaceline-toggle-buffer-size-off) - (setq powerline-default-seperator (quote arrow))) + ;;This isn't set in :custom because it breaks the arrow. + (setq powerline-default-seperator 'arrow)) (use-package dashboard :diminish (dashboard-mode page-break-lines-mode) @@ -173,10 +174,6 @@ (add-hook 'org-mode-hook (local-keybind "C-c C-l" manx/org-insert-link)) -(definteractive manx/kill-word () - (backward-word) - (kill-word 1)) - (definteractive manx/kill-line() (move-beginning-of-line nil) (kill-whole-line)) @@ -185,12 +182,15 @@ (save-excursion (indent-region (point-min) (point-max) nil))) -(global-set-key (kbd "") 'forward-whitespace) -(global-set-key (kbd "C-c r b") 'revert-buffer) -(global-set-key (kbd "C-c k w") 'manx/kill-word) (global-set-key (kbd "C-c k l") 'manx/kill-line) (global-set-key (kbd "s-i") 'manx/format-whole-buffer) +(global-set-key (kbd "C-c r b") 'revert-buffer) +(definteractive manx/scratch-buffer () + (switch-to-buffer (get-buffer-create "*scratch*")) + (lisp-interaction-mode)) + +(global-set-key (kbd "C-c s b") 'manx/scratch-buffer) (global-set-key (kbd "C-x k") (lambdainteractive () (kill-buffer (current-buffer)))) (global-set-key (kbd "C-M-s-k") (lambdainteractive () (mapc 'kill-buffer (buffer-list)))) @@ -231,12 +231,8 @@ (column-number-mode 1) (display-battery-mode 1) (show-paren-mode 1) -(electric-pair-mode t) -(global-hl-line-mode t) - -(tool-bar-mode -1) -(menu-bar-mode -1) -(scroll-bar-mode -1) +(electric-pair-mode 1) +(global-hl-line-mode 1) (defalias 'yes-or-no-p 'y-or-n-p) @@ -247,6 +243,9 @@ (setq backup-directory-alist `(("." . ,(concat user-emacs-directory "autosaves")))) +(tool-bar-mode -1) +(menu-bar-mode -1) +(scroll-bar-mode -1) (global-unset-key (kbd "C-z")) ;; Fuck unix (setq-default tab-width 2 diff --git a/config.org b/config.org index 0fdd2b0..4d3df04 100644 --- a/config.org +++ b/config.org @@ -95,13 +95,14 @@ sbcl is in a werid place on Gentoo. #+END_SRC ** spaceline #+BEGIN_SRC emacs-lisp - (use-package spaceline - :init - (require 'spaceline-config) - (spaceline-spacemacs-theme) - :config - (spaceline-toggle-buffer-size-off) - (setq powerline-default-seperator (quote arrow))) +(use-package spaceline + :init + (require 'spaceline-config) + (spaceline-spacemacs-theme) + :config + (spaceline-toggle-buffer-size-off) + ;;This isn't set in :custom because it breaks the arrow. + (setq powerline-default-seperator 'arrow)) #+END_SRC ** dashboard #+BEGIN_SRC emacs-lisp @@ -223,11 +224,11 @@ Also saves config if open. #+END_SRC ** Links #+BEGIN_SRC emacs-lisp - (definteractive manx/delete-org-link () - (when (org-in-regexp org-bracket-link-regexp 1) - (apply 'delete-region (list (match-beginning 0) (match-end 0))))) +(definteractive manx/delete-org-link () + (when (org-in-regexp org-bracket-link-regexp 1) + (apply 'delete-region (list (match-beginning 0) (match-end 0))))) - (add-hook 'org-mode-hook (local-keybind "C-c o l" manx/delete-org-link)) +(add-hook 'org-mode-hook (local-keybind "C-c o l" manx/delete-org-link)) #+END_SRC *** Inline Images #+BEGIN_SRC emacs-lisp @@ -241,29 +242,29 @@ Also saves config if open. #+END_SRC * functions ** text +*** kill #+BEGIN_SRC emacs-lisp - (definteractive manx/kill-word () - (backward-word) - (kill-word 1)) - - (definteractive manx/kill-line() - (move-beginning-of-line nil) - (kill-whole-line)) +(definteractive manx/kill-line() + (move-beginning-of-line nil) + (kill-whole-line)) - (definteractive manx/format-whole-buffer() - (save-excursion - (indent-region (point-min) (point-max) nil))) +(definteractive manx/format-whole-buffer() + (save-excursion + (indent-region (point-min) (point-max) nil))) - (global-set-key (kbd "") 'forward-whitespace) - (global-set-key (kbd "C-c r b") 'revert-buffer) - (global-set-key (kbd "C-c k w") 'manx/kill-word) - (global-set-key (kbd "C-c k l") 'manx/kill-line) - (global-set-key (kbd "s-i") 'manx/format-whole-buffer) - #+END_SRC +(global-set-key (kbd "C-c k l") 'manx/kill-line) +(global-set-key (kbd "s-i") 'manx/format-whole-buffer) +(global-set-key (kbd "C-c r b") 'revert-buffer) +#+END_SRC ** buffers #+BEGIN_SRC emacs-lisp - (global-set-key (kbd "C-x k") (lambdainteractive () (kill-buffer (current-buffer)))) - (global-set-key (kbd "C-M-s-k") (lambdainteractive () (mapc 'kill-buffer (buffer-list)))) +(definteractive manx/scratch-buffer () + (switch-to-buffer (get-buffer-create "*scratch*")) + (lisp-interaction-mode)) + +(global-set-key (kbd "C-c s b") 'manx/scratch-buffer) +(global-set-key (kbd "C-x k") (lambdainteractive () (kill-buffer (current-buffer)))) +(global-set-key (kbd "C-M-s-k") (lambdainteractive () (mapc 'kill-buffer (buffer-list)))) #+END_SRC ** frames *** transpose-frame @@ -311,28 +312,30 @@ Also saves config if open. ** minor things Things for GUI and basic config, like electric pairs and highlighting parens. +*** set #+BEGIN_SRC emacs-lisp - (line-number-mode 1) - (column-number-mode 1) - (display-battery-mode 1) - (show-paren-mode 1) - (electric-pair-mode t) - (global-hl-line-mode t) - - (tool-bar-mode -1) - (menu-bar-mode -1) - (scroll-bar-mode -1) - - (defalias 'yes-or-no-p 'y-or-n-p) +(line-number-mode 1) +(column-number-mode 1) +(display-battery-mode 1) +(show-paren-mode 1) +(electric-pair-mode 1) +(global-hl-line-mode 1) - (setq scroll-conservatively 100 - select-enable-clipboard t - vc-follow-symlinks t) +(defalias 'yes-or-no-p 'y-or-n-p) - (setq backup-directory-alist - `(("." . ,(concat user-emacs-directory "autosaves")))) +(setq scroll-conservatively 100 + select-enable-clipboard t + vc-follow-symlinks t) - (global-unset-key (kbd "C-z")) ;; Fuck unix +(setq backup-directory-alist + `(("." . ,(concat user-emacs-directory "autosaves")))) +#+END_SRC +*** unset +#+BEGIN_SRC emacs-lisp +(tool-bar-mode -1) +(menu-bar-mode -1) +(scroll-bar-mode -1) +(global-unset-key (kbd "C-z")) ;; Fuck unix #+END_SRC ** indentation tabs > spaces. Except in Lisp. diff --git a/snippets/csharp-mode/get-set b/snippets/csharp-mode/get-set deleted file mode 100644 index 04789d2..0000000 --- a/snippets/csharp-mode/get-set +++ /dev/null @@ -1,5 +0,0 @@ -# -*- mode: snippet -*- -# name: getset -# key: gs -# -- -{ get; set; }$0 diff --git a/snippets/html-mode/css b/snippets/html-mode/css index 1fa91b8..4ff0320 100644 --- a/snippets/html-mode/css +++ b/snippets/html-mode/css @@ -1,5 +1,6 @@ # -*- mode: snippet -*- -# name: css +# name: # -- $0 \ No newline at end of file diff --git a/snippets/html-mode/html5 b/snippets/html-mode/html5 index c7b4984..24ea072 100644 --- a/snippets/html-mode/html5 +++ b/snippets/html-mode/html5 @@ -1,5 +1,6 @@ # -*- mode: snippet -*- -# name: DOCTYPE html +# name: # key: 5 +# contributor : Manx # -- \ No newline at end of file diff --git a/snippets/latex-mode/figure b/snippets/latex-mode/figure deleted file mode 100644 index 447593c..0000000 --- a/snippets/latex-mode/figure +++ /dev/null @@ -1,9 +0,0 @@ -# -*- mode: snippet -*- -# name: figure -# key: fig -# -- -\begin{figure}[H] - \centering - \includegraphics[width=${1:1}\textwidth]{${2:path}} - \caption{\label{fig:${3:label}}$0} -\end{figure} diff --git a/snippets/latex-mode/hline b/snippets/latex-mode/hline deleted file mode 100644 index d175dde..0000000 --- a/snippets/latex-mode/hline +++ /dev/null @@ -1,5 +0,0 @@ -# -*- mode: snippet -*- -# name: hline -# key: hl -# -- -\hline $0 \ No newline at end of file diff --git a/snippets/latex-mode/italic b/snippets/latex-mode/italic deleted file mode 100644 index cf59093..0000000 --- a/snippets/latex-mode/italic +++ /dev/null @@ -1,5 +0,0 @@ -# -*- mode: snippet -*- -# name: italic -# key: i -# -- -\textit{$1}$0 diff --git a/snippets/latex-mode/item b/snippets/latex-mode/item deleted file mode 100644 index 1354eb9..0000000 --- a/snippets/latex-mode/item +++ /dev/null @@ -1,5 +0,0 @@ -# -*- mode: snippet -*- -# name: item -# key: - -# -- -\item {$0} \ No newline at end of file diff --git a/snippets/latex-mode/itemize b/snippets/latex-mode/itemize deleted file mode 100644 index 4c618cf..0000000 --- a/snippets/latex-mode/itemize +++ /dev/null @@ -1,7 +0,0 @@ -# -*- mode: snippet -*- -# name: itemize -# key: it -# -- -\begin{itemize} - \item $0 -\end{itemize} \ No newline at end of file diff --git a/snippets/latex-mode/subfigure b/snippets/latex-mode/subfigure deleted file mode 100644 index 02851e9..0000000 --- a/snippets/latex-mode/subfigure +++ /dev/null @@ -1,14 +0,0 @@ -# -*- mode: snippet -*- -# name: subfigure -# key: sfig2 -# -- -\begin{figure}[H] - \centering - \begin{subfigure}{${1:0.45}\textwidth} - \includegraphics[width=${2:1}\textwidth]{${3:path}} - \end{subfigure} - \begin{subfigure}{$1\textwidth} - \includegraphics[width=$2\textwidth]{${4:path}} - \end{subfigure} -\end{figure} -$0 \ No newline at end of file diff --git a/snippets/latex-mode/tabularx b/snippets/latex-mode/tabularx deleted file mode 100644 index db6190f..0000000 --- a/snippets/latex-mode/tabularx +++ /dev/null @@ -1,9 +0,0 @@ -# -*- mode: snippet -*- -# name: tabularx -# key: tabx -# -- -\begin{tabularx}{\textwidth}{${1:|c|}} - \hline - $0 - \hline -\end{tabularx} \ No newline at end of file diff --git a/snippets/lisp-mode/defignore b/snippets/lisp-mode/defignore deleted file mode 100644 index c39b5d6..0000000 --- a/snippets/lisp-mode/defignore +++ /dev/null @@ -1,7 +0,0 @@ -# -*- mode: snippet -*- -# name: defignore -# key: defignore -# -- -(defignore ${1} (${2}) - ${3}) -$0 \ No newline at end of file diff --git a/snippets/lisp-mode/wah b/snippets/lisp-mode/wah deleted file mode 100644 index 437f156..0000000 --- a/snippets/lisp-mode/wah +++ /dev/null @@ -1,5 +0,0 @@ -# -*- mode: snippet -*- -# name: wah -# key: w -# -- -(wah $0) \ No newline at end of file diff --git a/snippets/omnisharp-mode/get-set b/snippets/omnisharp-mode/get-set deleted file mode 100644 index 622786a..0000000 --- a/snippets/omnisharp-mode/get-set +++ /dev/null @@ -1,5 +0,0 @@ -# -*- mode: snippet -*- -# name: get-set -# key: gs -# -- -{ get; set; }$0