diff options
| -rw-r--r-- | .config/terminator/config | 15 | ||||
| -rw-r--r-- | .emacs | 163 | ||||
| -rw-r--r-- | .spacemacs | 1 | ||||
| -rw-r--r-- | .zshrc | 6 |
4 files changed, 15 insertions, 170 deletions
diff --git a/.config/terminator/config b/.config/terminator/config index 968b85b..97052ad 100644 --- a/.config/terminator/config +++ b/.config/terminator/config @@ -16,21 +16,23 @@ [plugins] [profiles] [[default]] - background_color = "#102313" - background_darkness = 0.92 + background_darkness = 0.0 + background_image = None background_type = transparent cursor_color = "#ffffff" - custom_command = TERM=xterm-256color tmux - font = xos4 Terminus 10 + custom_command = zsh + font = Terminus 10 foreground_color = "#ffffff" - palette = "#050505:#b81109:#1cb228:#baa407:#2c5fad:#e35682:#16a085:#ffffff:#1c1b19:#e8160c:#24e534:#fcdf09:#408afc:#e02c6d:#1abc9c:#ebe3e3" + palette = "#000000:#cc0000:#4e9a06:#c4a000:#3465a4:#75507b:#06989a:#d3d7cf:#555753:#ef2929:#8ae234:#fce94f:#729fcf:#ad7fa8:#34e2e2:#eeeeec" scrollback_infinite = True scrollbar_position = hidden show_titlebar = False + use_custom_command = True use_system_font = False [[Old]] background_color = "#100935" background_darkness = 0.49 + background_image = None background_type = transparent custom_command = tmux font = Terminus 10 @@ -42,6 +44,7 @@ [[auto]] background_color = "#032c36" background_darkness = 0.82 + background_image = None background_type = transparent font = Terminus 10 foreground_color = "#e8dfd6" @@ -52,6 +55,7 @@ [[custom]] background_color = "#032c36" background_darkness = 0.77 + background_image = None background_type = transparent cursor_color = "#e8dfd6" font = Terminus 12 @@ -62,6 +66,7 @@ use_system_font = False [[souceror]] background_color = "#151515" + background_image = None cursor_color = "#c2c2b0" foreground_color = "#c2c2b0" palette = "#151515:#aa4450:#719611:#ff9800:#6688aa:#8f6f8f:#528b8b:#d3d3d3:#272822:#ff6a6a:#b1d631:#87875f:#90b0d1:#8181a6:#87ceeb:#c1cdc1" @@ -1,163 +0,0 @@ -(add-to-list 'custom-theme-load-path "~/.emacs.d/themes/") -(custom-set-variables - ;; custom-set-variables 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. - '(ansi-color-faces-vector - [default default default italic underline success warning error]) - '(ansi-color-names-vector - ["black" "#d55e00" "#009e73" "#f8ec59" "#0072b2" "#cc79a7" "#56b4e9" "white"]) - '(custom-enabled-themes (quote (tsdh-dark))) - '(global-auto-revert-mode t) - '(js-indent-level 2) - '(package-selected-packages - (quote - (relative-line-numbers multi-web-mode magit powerline-evil spaceline js2-mode jedi auto-complete undo-tree dashboard neotree))) - '(tab-stop-list (quote (2))) - '(tab-width 2) - '(xterm-mouse-mode t)) -(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. - ) -;;(global-linum-mode t) -(setq python-shell-interpreter "/usr/bin/python") - - -(when (>= emacs-major-version 24) - (require 'package) - (add-to-list - 'package-archives - '("melpa" . "http://melpa.org/packages/") - t) - (package-initialize)) - - - - (setq backup-directory-alist - `((".*" . ,temporary-file-directory))) - (setq auto-save-file-name-transforms - `((".*" ,temporary-file-directory t))) -(global-set-key (kbd "<C-up>") 'shrink-window) -(global-set-key (kbd "<C-down>") 'enlarge-window) -(global-set-key (kbd "<C-left>") 'shrink-window-horizontally) -(global-set-key (kbd "<C-right>") 'enlarge-window-horizontally) - - - -(global-unset-key "\C-z") -;;(global-set-key "\C-z" 'advertised-undo) -(global-unset-key "\C-v") -(global-set-key "\C-v" 'yank) - -(global-unset-key "\M-v") -(global-set-key "\M-v" 'yank-pop) -(global-set-key [mouse-5] - (lambda () (interactive) (next-line 3))) - -(global-set-key [mouse-4] - (lambda () (interactive) (previous-line 3))) - - - -(setq-default tab-width 2) - - -;; scroll one line at a time (less "jumpy" than defaults) - - (setq mouse-wheel-scroll-amount '(1 ((shift) . 1))) ;; one line at a time - - (setq mouse-wheel-progressive-speed nil) ;; don't accelerate scrolling - - (setq mouse-wheel-follow-mouse 't) ;; scroll window under mouse - - (setq scroll-step 1) ;; keyboard scroll one line at a time - - -(defun copy-line (arg) - "Copy lines (as many as prefix argument) in the kill ring" - (interactive "p") - (kill-ring-save (line-beginning-position) - (line-beginning-position (+ 1 arg))) - (message "%d line%s copied" arg (if (= 1 arg) "" "s"))) - - -(global-set-key "\C-c\C-k" 'copy-line) - - -(defun revert-all-buffers () - "Refreshes all open buffers from their respective files" - (interactive) - (let* ((list (buffer-list)) - (buffer (car list))) - (while buffer - (when (and (buffer-file-name buffer) - (not (buffer-modified-p buffer))) - (set-buffer buffer) - (revert-buffer t t t)) - (setq list (cdr list)) - (setq buffer (car list)))) - (message "Refreshed open files")) - - -(require 'dashboard) -(dashboard-setup-startup-hook) - -(require 'powerline) -(powerline-center-theme) - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; undo tree mode ;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;turn on everywhere -(global-undo-tree-mode 1) -;; make ctrl-z undo -(global-set-key (kbd "C-z") 'undo) -;; make ctrl-Z redo -(defalias 'redo 'undo-tree-redo) -(global-set-key (kbd "C-S-z") 'redo) - - -(global-set-key (kbd "C-x C-b") 'bs-show) - - - - - -(when (fboundp 'winner-mode) - (winner-mode 1)) - - - -(global-set-key(kbd "C-M-<next>") 'scroll-other-window-down) - - -(global-relative-line-numbers-mode) - -(ac-config-default) - -(global-auto-complete-mode t) - - -;; Julians cool keybindings -(global-unset-key (kbd "C-d")) -(global-set-key (kbd "C-d u") 'undo-tree-visualize) -(global-set-key (kbd "C-d r") '(lambda() (interactive) (load-file "~/.emacs"))) -(global-set-key (kbd "C-d i") 'indent-region) -(global-set-key (kbd "C-d e") 'eshell) -(global-set-key (kbd "C-d n") 'neotree) - - -(add-hook 'shell-mode-hook 'ansi-color-for-comint-mode-on) - - - - - -(display-time-mode 1) - - @@ -31,6 +31,7 @@ values." ;; List of configuration layers to load. dotspacemacs-configuration-layers '( + markdown html javascript auto-completion @@ -9,7 +9,7 @@ export TERM="xterm-256color" # Set name of the theme to load. Optionally, if you set this to "random" # it'll load a random theme each time that oh-my-zsh is loaded. # See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes -ZSH_THEME="cloud" +ZSH_THEME="lambda-mod" # Uncomment the following line to use case-sensitive completion. # CASE_SENSITIVE="true" @@ -53,7 +53,7 @@ ZSH_THEME="cloud" # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ # Example format: plugins=(rails git textmate ruby lighthouse) # Add wisely, as too many plugins slow down shell startup. -plugins=(git) +plugins=(git sudo) source $ZSH/oh-my-zsh.sh @@ -108,3 +108,5 @@ alias python="python3" alias pip="pip3" alias sudo="sudo " alias update="sudo apt update && sudo apt upgrade" +alias emacs="emacsclient -c" +alias cmacs="emacsclient -nw -c" |