update

7 files changed, 42 insertions, 12 deletions

diff --git a/.emacs.d/auto-save-list/.saves-12850-steve~ b/.emacs.d/auto-save-list/.saves-12850-steve~
new file mode 100644
index 0000000..94b5090
--- /dev/null
+++ b/.emacs.d/auto-save-list/.saves-12850-steve~
@@ -0,0 +1,2 @@
+/home/steve/Dropbox/Courses/Computer Networks/lab/lab-1-wireshark.txt
+/home/steve/Dropbox/Courses/Computer Networks/lab/#lab-1-wireshark.txt#
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 8f985d7..c846e4e 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -10,7 +10,7 @@
 (scroll-bar-mode -1)
 (blink-cursor-mode -1)
 ;; Line number
-(setq global-linum-mode t)
+;; (global-linum-mode 1)
 ;; Highlight current line
 (when window-system
   (global-hl-line-mode))
@@ -42,7 +42,7 @@
  '(inhibit-startup-screen t)
  '(package-selected-packages
    (quote
-	(helm expand-region window-numbering flycheck company oceanic-theme forest-blue-theme org ## evil))))
+	(scala-mode helm expand-region window-numbering flycheck company oceanic-theme forest-blue-theme org ## evil))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/.emacs.d/init.el~ b/.emacs.d/init.el~
index 9085cb4..21e091f 100644
--- a/.emacs.d/init.el~
+++ b/.emacs.d/init.el~
@@ -10,7 +10,7 @@
 (scroll-bar-mode -1)
 (blink-cursor-mode -1)
 ;; Line number
-(setq global-linum-mode t)
+(global-linum-mode 1)
 ;; Highlight current line
 (when window-system
   (global-hl-line-mode))
@@ -42,7 +42,7 @@
  '(inhibit-startup-screen t)
  '(package-selected-packages
    (quote
-	(helm expand-region window-numbering flycheck company oceanic-theme forest-blue-theme org ## evil))))
+	(scala-mode helm expand-region window-numbering flycheck company oceanic-theme forest-blue-theme org ## evil))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
@@ -54,7 +54,7 @@
 (add-to-list 'load-path (expand-file-name "~/.emacs.d/lisp"))
 
 ;; Theme
-(load-theme 'oceanic t)
+;; (load-theme 'oceanic t)
 ;; Make highlight color differ from the highlight line
 (set-face-attribute 'region nil :background "#213")
 
@@ -65,6 +65,7 @@
   (require 'init-company)
   (require 'init-flycheck)
   (require 'init-expand-region)
+  (require 'init-helm)
   (require 'init-window-numbering))
 
 (provide 'init)
diff --git a/.emacs.d/lisp/init-evil.el b/.emacs.d/lisp/init-evil.el
index 956f8c9..2b2a745 100644
--- a/.emacs.d/lisp/init-evil.el
+++ b/.emacs.d/lisp/init-evil.el
@@ -5,13 +5,13 @@
 ;;; Code:
 
 (package-install 'evil)
+;; Evil leader, more evil
+(global-evil-leader-mode)
 (require 'evil)
 (evil-mode 1)
 
 ;; todo function and keybinding to open file in new window
 
-;; Evil leader, more evil
-(global-evil-leader-mode)
 (evil-leader/set-leader ";")
 (evil-leader/set-key
   "s" 'save-buffer
diff --git a/.emacs.d/lisp/init-evil.el~ b/.emacs.d/lisp/init-evil.el~
index 30878ee..7c21575 100644
--- a/.emacs.d/lisp/init-evil.el~
+++ b/.emacs.d/lisp/init-evil.el~
@@ -5,23 +5,24 @@
 ;;; Code:
 
 (package-install 'evil)
+;; Evil leader, more evil
+(global-evil-leader-mode)
 (require 'evil)
 (evil-mode 1)
 
 ;; todo function and keybinding to open file in new window
 
-;; Evil leader, more evil
-(global-evil-leader-mode)
 (evil-leader/set-leader ";")
 (evil-leader/set-key
+  "aa" 'google-search
+  "a" 'save-buffer
   "s" 'save-buffer
   "c" 'execute-c-program
   "e" 'find-file
   "b" 'switch-to-buffer
   "q" 'quit-window
   "e" 'er/expand-region
-  "f" 'helm-find-files
-  "ff" 'google-search
+  "f" 'google-search
   "t" 'test-function
 
   ;; switch window
diff --git a/.emacs.d/lisp/init-org.el b/.emacs.d/lisp/init-org.el
index 189cf79..1234db2 100644
--- a/.emacs.d/lisp/init-org.el
+++ b/.emacs.d/lisp/init-org.el
@@ -5,6 +5,12 @@
 
 ;;; Code:
 
+;; active Babel languages
+(org-babel-do-load-languages
+ 'org-babel-load-languages
+ '((sql . t)))
+;; add additional languages with '((language . t)))
+
 (setq org-latex-classes
       '(("article"
          "
@@ -40,5 +46,7 @@
         "xelatex -interaction nonstopmode -output-directory %o %f"
         "xelatex -interaction nonstopmode -output-directory %o %f"))
 
+(setq org-log-done t)
+(setq org-agenda-files (list "~/42/Personal/Plan/plan.org"))
 (provide 'init-org)
 ;;; init-org ends here
diff --git a/.emacs.d/lisp/init-org.el~ b/.emacs.d/lisp/init-org.el~
index b162f12..bc818e9 100644
--- a/.emacs.d/lisp/init-org.el~
+++ b/.emacs.d/lisp/init-org.el~
@@ -1,4 +1,16 @@
-;; org-mode pdf outpuf
+;;; org --- All configuration of org-mode
+
+;;; Commentary:
+;; Mostly the pdf export configuration
+
+;;; Code:
+
+;; active Babel languages
+(org-babel-do-load-languages
+ 'org-babel-load-languages
+ '((sql . t)))
+;; add additional languages with '((language . t)))
+
 (setq org-latex-classes
       '(("article"
          "
@@ -34,4 +46,10 @@
         "xelatex -interaction nonstopmode -output-directory %o %f"
         "xelatex -interaction nonstopmode -output-directory %o %f"))
 
+(setq org-log-done t)
+(setq org-agenda-files (list "~/org/work.org"
+							 "~/org/school.org"
+							 "~/org/home.org"
+							 "~/42/Personal/Plan/plan.org"))
 (provide 'init-org)
+;;; init-org ends here