From 02500dc4e953c6f54fc33781e8f5950b6374a9f5 Mon Sep 17 00:00:00 2001 From: samontea Date: Sat, 6 Jun 2020 00:03:47 -0400 Subject: [PATCH] remove indentation configuration, smart parens --- .emacs.d/lisp/code/code-hub.el | 1 - .emacs.d/lisp/code/languages/c.el | 6 ------ .emacs.d/lisp/code/languages/fish.el | 8 -------- .emacs.d/lisp/code/languages/java.el | 2 -- .emacs.d/lisp/code/languages/ruby.el | 15 --------------- .emacs.d/lisp/code/languages/rust.el | 13 ------------- .emacs.d/lisp/code/languages/sh.el | 7 ------- .emacs.d/lisp/code/languages/web-c.el | 2 -- .emacs.d/lisp/code/smartparens-c.el | 5 ----- .emacs.d/lisp/package/dependencies.el | 1 - 10 files changed, 60 deletions(-) delete mode 100644 .emacs.d/lisp/code/smartparens-c.el diff --git a/.emacs.d/lisp/code/code-hub.el b/.emacs.d/lisp/code/code-hub.el index 54e6a76..b56fd08 100644 --- a/.emacs.d/lisp/code/code-hub.el +++ b/.emacs.d/lisp/code/code-hub.el @@ -1,7 +1,6 @@ (kotct/hub "code" (editorconfig-c magit-c - smartparens-c indentation code-navigation)) diff --git a/.emacs.d/lisp/code/languages/c.el b/.emacs.d/lisp/code/languages/c.el index 9ca9bd7..4737c8b 100644 --- a/.emacs.d/lisp/code/languages/c.el +++ b/.emacs.d/lisp/code/languages/c.el @@ -3,10 +3,4 @@ ;; set style to linux (setf c-default-style "linux") -;; use tab-width for indentation -(kotct/setf-tab c-basic-offset) - -;; use smart tabs -(smart-tabs-insinuate 'c) - (provide 'c) diff --git a/.emacs.d/lisp/code/languages/fish.el b/.emacs.d/lisp/code/languages/fish.el index 5c6c742..bd8187f 100644 --- a/.emacs.d/lisp/code/languages/fish.el +++ b/.emacs.d/lisp/code/languages/fish.el @@ -1,11 +1,3 @@ (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) diff --git a/.emacs.d/lisp/code/languages/java.el b/.emacs.d/lisp/code/languages/java.el index d4d330e..edf8446 100644 --- a/.emacs.d/lisp/code/languages/java.el +++ b/.emacs.d/lisp/code/languages/java.el @@ -1,5 +1,3 @@ ;; TODO: implement IDE-like java editing -(smart-tabs-insinuate 'java) - (provide 'java) diff --git a/.emacs.d/lisp/code/languages/ruby.el b/.emacs.d/lisp/code/languages/ruby.el index 760be20..e0eff61 100644 --- a/.emacs.d/lisp/code/languages/ruby.el +++ b/.emacs.d/lisp/code/languages/ruby.el @@ -1,20 +1,5 @@ (require 'indentation) -;; Set ruby-indent-level to global-tab-width -(kotct/setq-default-tab ruby-indent-level) - -;; Add Smart Tabs language support for Ruby using the -;; `smart-tabs-add-language-support' macro. -(smart-tabs-add-language-support ruby ruby-mode-hook - ((ruby-indent-line . ruby-indent-level) - (ruby-indent-level . ruby-indent-level))) - -;; Apply Ruby language support to Smart Tabs. -(smart-tabs-insinuate 'ruby) - -;; Use tabs mode in Ruby by default. -(setf ruby-indent-tabs-mode t) - ;; Don't use SMIE because SMIE sucks. (setf ruby-use-smie nil) diff --git a/.emacs.d/lisp/code/languages/rust.el b/.emacs.d/lisp/code/languages/rust.el index d2df13b..0c6d820 100644 --- a/.emacs.d/lisp/code/languages/rust.el +++ b/.emacs.d/lisp/code/languages/rust.el @@ -1,18 +1,5 @@ (require 'indentation) -;; Set `rust-indent-offset' to the `global-tab-width' value. -(kotct/setq-default-tab rust-indent-offset) - -;; Add language support for Rust. -(smart-tabs-add-language-support rust rust-mode-hook - ((rust-mode-indent-line . rust-indent-offset))) - -;; Use `indent-tabs-mode' in `rust-mode' -(add-hook 'rust-mode-hook (lambda () (setf indent-tabs-mode t))) - -;; Turn on Rust support in Smart Tabs. -(smart-tabs-insinuate 'rust) - ;; Don't indent `where' clauses in Rust. (setf rust-indent-where-clause nil) diff --git a/.emacs.d/lisp/code/languages/sh.el b/.emacs.d/lisp/code/languages/sh.el index 250e03d..b48eae3 100644 --- a/.emacs.d/lisp/code/languages/sh.el +++ b/.emacs.d/lisp/code/languages/sh.el @@ -1,12 +1,5 @@ (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) diff --git a/.emacs.d/lisp/code/languages/web-c.el b/.emacs.d/lisp/code/languages/web-c.el index c9ff96a..9d8960f 100644 --- a/.emacs.d/lisp/code/languages/web-c.el +++ b/.emacs.d/lisp/code/languages/web-c.el @@ -19,6 +19,4 @@ (setf web-mode-enable-control-block-indentation nil) (setf web-mode-script-padding 0) -(add-hook 'web-mode-hook (lambda () (setf indent-tabs-mode t))) - (provide 'web-c) diff --git a/.emacs.d/lisp/code/smartparens-c.el b/.emacs.d/lisp/code/smartparens-c.el deleted file mode 100644 index 1d66cf9..0000000 --- a/.emacs.d/lisp/code/smartparens-c.el +++ /dev/null @@ -1,5 +0,0 @@ -(require 'smartparens-config) - -(smartparens-global-mode t) - -(provide 'smartparens-c) diff --git a/.emacs.d/lisp/package/dependencies.el b/.emacs.d/lisp/package/dependencies.el index d648d9b..09dca26 100644 --- a/.emacs.d/lisp/package/dependencies.el +++ b/.emacs.d/lisp/package/dependencies.el @@ -21,7 +21,6 @@ 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