barak/dotfiles
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

upgrade

Browse source
This commit is contained in:
Barak Michener 2016-01-17 15:58:25 -05:00
parent 96e8a1d428
commit c851b6354c
5 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.emacs.d/init.el
View file

@ -1,7 +1,6 @@
;;; init.el --- Spacemacs Initialization File ;;; init.el --- Spacemacs Initialization File
;; ;;
;; Copyright (c) 2012-2014 Sylvain Benner ;; Copyright (c) 2012-2016 Sylvain Benner & Contributors
;; Copyright (c) 2014-2015 Sylvain Benner & Contributors
;; ;;
;; Author: Sylvain Benner <sylvain.benner@gmail.com> ;; Author: Sylvain Benner <sylvain.benner@gmail.com>
;; URL: https://github.com/syl20bnr/spacemacs ;; URL: https://github.com/syl20bnr/spacemacs
@ -14,7 +13,7 @@
;; (package-initialize) ;; (package-initialize)
(setq gc-cons-threshold 100000000) (setq gc-cons-threshold 100000000)
(defconst spacemacs-version "0.105.2" "Spacemacs version.") (defconst spacemacs-version "0.105.8" "Spacemacs version.")
(defconst spacemacs-emacs-min-version "24.3" "Minimal version of Emacs.") (defconst spacemacs-emacs-min-version "24.3" "Minimal version of Emacs.")
(if (not (version<= spacemacs-emacs-min-version emacs-version)) (if (not (version<= spacemacs-emacs-min-version emacs-version))
@ -22,7 +21,6 @@
"Spacemacs requires Emacs version %d or above.") "Spacemacs requires Emacs version %d or above.")
emacs-version spacemacs-emacs-min-version) emacs-version spacemacs-emacs-min-version)
(load-file (concat user-emacs-directory "core/core-load-paths.el")) (load-file (concat user-emacs-directory "core/core-load-paths.el"))
(when init-file-debug (require 'core-debug))
(require 'core-spacemacs) (require 'core-spacemacs)
(spacemacs/init) (spacemacs/init)
(spacemacs/maybe-install-dotfile) (spacemacs/maybe-install-dotfile)

3
.i3/config
View file

@ -196,7 +196,8 @@ bindsym $mod+t mode "moveworkspace"
# Start i3bar to display a workspace bar (plus the system information i3status # Start i3bar to display a workspace bar (plus the system information i3status
# finds out, if available) # finds out, if available)
bar { bar {
status_command i3status # status_command i3status
status_command i3-wrapper
position top position top
tray_output primary tray_output primary
} }

3
.spacemacs
View file

@ -22,7 +22,8 @@ values."
;; <M-m f e R> (Emacs style) to install them. ;; <M-m f e R> (Emacs style) to install them.
;; ---------------------------------------------------------------- ;; ----------------------------------------------------------------
(auto-completion :variables (auto-completion :variables
auto-completion-enable-help-tooltip t) auto-completion-enable-help-tooltip t
auto-completion-enable-snippets-in-popup t)
;; better-defaults ;; better-defaults
emacs-lisp emacs-lisp
git git

2
.xinitrc
View file

@ -18,7 +18,7 @@ synclient PalmDetect=1
/usr/lib/xfce4/notifyd/xfce4-notifyd & /usr/lib/xfce4/notifyd/xfce4-notifyd &
pulseaudio --start & pulseaudio --start &
blueman-applet & blueman-applet &
wicd-gtk --tray & #wicd-gtk --tray &
if [ -f ~/.xrandrrc ]; then if [ -f ~/.xrandrrc ]; then
~/.xrandrrc ~/.xrandrrc

7
bin/i3-wrapper Executable file
View file

@ -0,0 +1,7 @@
#!/bin/sh
if [ -f ~/bin/go-i3 ]; then
~/bin/go-i3
else
i3status
fi