Browse Source

gradle stuff

master
Taylor Bockman 6 years ago
parent
commit
26d1293ef7
  1. 11
      dotfiles/Xmodmap
  2. 43
      dotfiles/emacs.d/init.el
  3. 1
      dotfiles/emacs.d/package.el
  4. 4
      dotfiles/zshrc

11
dotfiles/Xmodmap

@ -1,9 +1,6 @@
! !
! Swap Caps_Lock and Control_R ! Remove caps lock and assign the left control to it.
! !
remove Lock = Caps_Lock keycode 66 = Control_L
remove Control = Control_R clear Lock
keysym Control_R = Caps_Lock add Control = Control_L
keysym Caps_Lock = Control_R
add Lock = Caps_Lock
add Control = Control_R

43
dotfiles/emacs.d/init.el

@ -106,6 +106,8 @@
;; Dev has groups for all languages you program in ;; Dev has groups for all languages you program in
("Dev" (or (mode . cc-mode) ("Dev" (or (mode . cc-mode)
(filename . ".c") (filename . ".c")
(filename . ".cpp")
(filename . ".hpp")
(filename . ".h") (filename . ".h")
(filename . ".java") (filename . ".java")
(filename . ".properties") (filename . ".properties")
@ -192,24 +194,9 @@
;; Add new line if using C-n navigates to the end of the buffer ;; Add new line if using C-n navigates to the end of the buffer
(setq next-line-add-newlines t) (setq next-line-add-newlines t)
;;-------------------------------------------------------------------------------------- (require 'whitespace)
;; Fill column indicator (currently set to 120 characters) (setq whitespace-style '(face lines-tail))
;;-------------------------------------------------------------------------------------- (add-hook 'prog-mode-hook 'whitespace-mode)
(require 'fill-column-indicator)
(setq fci-rule-color "red")
(setq fci-rule-column 120)
(setq fci-rule-width 1)
(setq fci-rule-character ?\u2503) ; Solid line unicode character
;; A hack to work around FCI wanting to put itself everywhere
(define-globalized-minor-mode global-fci-mode fci-mode
(lambda ()
(unless buffer-read-only
(fci-mode t))))
(global-fci-mode t)
;;-------------------------------------------------------------------------------------- ;;--------------------------------------------------------------------------------------
;; If python.el is loaded, change the rule column to 80 characters. ;; If python.el is loaded, change the rule column to 80 characters.
@ -217,7 +204,7 @@
(eval-after-load "python" (eval-after-load "python"
'(progn '(progn
(setq fci-rule-column 80))) (setq whitespace-line-column 80)))
;;-------------------------------------------------------------------------------------- ;;--------------------------------------------------------------------------------------
;; Expand region settings ;; Expand region settings
@ -344,19 +331,35 @@
;; Keep character limit to 80 ;; Keep character limit to 80
(eval-after-load "c-mode" (eval-after-load "c-mode"
'(progn '(progn
(setq fci-rule-column 80))) (setq whitespace-line-column 80)))
(eval-after-load "c++-mode"
'(progn
(setq whitespace-line-column 80)))
(setq-default c-basic-offset 4) ;; NASA Style Guide says 4 spaces is optimal (setq-default c-basic-offset 4) ;; NASA Style Guide says 4 spaces is optimal
(setq-default c++-basic-offset 4) ;;
(setq-default c-default-style "linux") ;; Use Linux code style (setq-default c-default-style "linux") ;; Use Linux code style
(setq-default c++-default-style "linux") ;;
(add-hook 'c-mode-hook 'irony-mode) (add-hook 'c-mode-hook 'irony-mode)
(add-hook 'c++-mode-hook 'irony-mode)
;; Backend for Company ;; Backend for Company
(defun my-c-mode-hook () (defun my-c-mode-hook ()
(eval-after-load 'company (eval-after-load 'company
'(add-to-list 'company-backends 'company-irony))) '(add-to-list 'company-backends 'company-irony)))
(defun my-c++-mode-hook ()
(eval-after-load 'company
'(add-to-list 'company-backends 'company-irony)))
(add-hook 'c-mode-hook 'my-c-mode-hook) (add-hook 'c-mode-hook 'my-c-mode-hook)
(add-hook 'c++-mode-hook 'my-c++-mode-hook)
;; I use meson mostly for C/C++ development so this hook lives here
(add-hook 'meson-mode-hook 'company-mode)
;;-------------------------------------------------------------------------------------- ;;--------------------------------------------------------------------------------------
;; Java Mode Setup ;; Java Mode Setup

1
dotfiles/emacs.d/package.el

@ -18,6 +18,7 @@
gitignore-mode gitignore-mode
feature-mode feature-mode
gradle-mode gradle-mode
meson-mode
paredit paredit
magit magit
;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;

4
dotfiles/zshrc

@ -137,3 +137,7 @@ if [ -f /home/$USER/.rvm/scripts/rvm ]; then
source /home/$USER/.rvm/scripts/rvm source /home/$USER/.rvm/scripts/rvm
fi fi
#THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!!
export SDKMAN_DIR="/home/taylor/.sdkman"
[[ -s "/home/taylor/.sdkman/bin/sdkman-init.sh" ]] && source "/home/taylor/.sdkman/bin/sdkman-init.sh"

Loading…
Cancel
Save