From c851b6354ccc5dd8a9069cb48b9c9154e4c38034 Mon Sep 17 00:00:00 2001 From: Barak Michener Date: Sun, 17 Jan 2016 15:58:25 -0500 Subject: [PATCH] upgrade --- .emacs.d/init.el | 6 ++---- .i3/config | 3 ++- .spacemacs | 3 ++- .xinitrc | 2 +- bin/i3-wrapper | 7 +++++++ 5 files changed, 14 insertions(+), 7 deletions(-) create mode 100755 bin/i3-wrapper diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 5c8d37b..7a20b6e 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -1,7 +1,6 @@ ;;; init.el --- Spacemacs Initialization File ;; -;; Copyright (c) 2012-2014 Sylvain Benner -;; Copyright (c) 2014-2015 Sylvain Benner & Contributors +;; Copyright (c) 2012-2016 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -14,7 +13,7 @@ ;; (package-initialize) (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.") (if (not (version<= spacemacs-emacs-min-version emacs-version)) @@ -22,7 +21,6 @@ "Spacemacs requires Emacs version %d or above.") emacs-version spacemacs-emacs-min-version) (load-file (concat user-emacs-directory "core/core-load-paths.el")) - (when init-file-debug (require 'core-debug)) (require 'core-spacemacs) (spacemacs/init) (spacemacs/maybe-install-dotfile) diff --git a/.i3/config b/.i3/config index 700ddb7..7c128c9 100644 --- a/.i3/config +++ b/.i3/config @@ -196,7 +196,8 @@ bindsym $mod+t mode "moveworkspace" # Start i3bar to display a workspace bar (plus the system information i3status # finds out, if available) bar { - status_command i3status +# status_command i3status + status_command i3-wrapper position top tray_output primary } diff --git a/.spacemacs b/.spacemacs index cd48ee0..44fdb66 100644 --- a/.spacemacs +++ b/.spacemacs @@ -22,7 +22,8 @@ values." ;; (Emacs style) to install them. ;; ---------------------------------------------------------------- (auto-completion :variables - auto-completion-enable-help-tooltip t) + auto-completion-enable-help-tooltip t + auto-completion-enable-snippets-in-popup t) ;; better-defaults emacs-lisp git diff --git a/.xinitrc b/.xinitrc index 7f22f3d..1d2fc26 100644 --- a/.xinitrc +++ b/.xinitrc @@ -18,7 +18,7 @@ synclient PalmDetect=1 /usr/lib/xfce4/notifyd/xfce4-notifyd & pulseaudio --start & blueman-applet & -wicd-gtk --tray & +#wicd-gtk --tray & if [ -f ~/.xrandrrc ]; then ~/.xrandrrc diff --git a/bin/i3-wrapper b/bin/i3-wrapper new file mode 100755 index 0000000..b2a99f9 --- /dev/null +++ b/bin/i3-wrapper @@ -0,0 +1,7 @@ +#!/bin/sh + +if [ -f ~/bin/go-i3 ]; then + ~/bin/go-i3 +else + i3status +fi