 (setq inhibit-splash-screen t)
 ;; power line
 (require 'powerline)
-(custom-set-faces
- ;; custom-set-faces was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- '(mode-line ((t (:foreground "#030303" :background "#2d5565" :box nil))))
- '(mode-line-inactive ((t (:foreground "#f9f9f9" :background "#666666" :box nil)))))
+;; (custom-set-faces
+;;  ;; custom-set-faces was added by Custom.
+;;  ;; If you edit it by hand, you could mess it up, so be careful.
+;;  ;; Your init file should contain only one such instance.
+;;  ;; If there is more than one, they won't work right.
+;;  '(mode-line ((t (:foreground "#030303" :background "#2d5565" :box nil))))
+;;  '(mode-line-inactive ((t (:foreground "#f9f9f9" :background "#666666" :box nil)))))
 
 ;; shows current selected region
 (setq-default transient-mark-mode t)
 (set-scroll-bar-mode 'right)
+(setq frame-title-format "%b - emacs")
+(set-fringe-mode '(0 . 1))
 
 ;; text stuff
 (setq default-major-mode 'org-mode)

;;       (cons '("\\.m$" . octave-mode) auto-mode-alist))

(load-library "matlab-load")
(custom-set-variables
 '(matlab-shell-command-switches '("-nodesktop -nosplash")))
(add-hook 'matlab-mode
          (lambda ()
            (auto-complete-mode 1)


;; ;; python ;;
;; ;; ipython as shell
;; (setq
;;  python-shell-interpreter "ipython"
;;  python-shell-interpreter-args ""
;;  python-shell-prompt-regexp "In \\[[0-9]+\\]: "
;;  python-shell-prompt-output-regexp "Out\\[[0-9]+\\]: "
;;  python-shell-completion-setup-code
;;  "from IPython.core.completerlib import module_completion"
;;  python-shell-completion-module-string-code
;;  "';'.join(module_completion('''%s'''))\n"
;;  python-shell-completion-string-code
;;  "';'.join(get_ipython().Completer.all_completions('''%s'''))\n")

(elpy-enable)
(elpy-use-ipython)
(elpy-clean-modeline)

;; python-mode
;; (require 'python-mode)
(autoload 'python-mode "python-mode" "Python editing mode." t)
;; jedi completion
(add-hook 'python-mode-hook 'auto-complete-mode)
(add-hook 'python-mode-hook 'jedi:setup)
(add-hook 'python-mode-hook 'linum-mode)

;; Sometimes you have to
(require 'php-mode)

