瀏覽代碼

Fixed issues brought to light on CP computers.

xinitrc and xsessionrc now checks that programs exist before calling them.

Xresources has configurations for gnome shell.

Fixed issues in emacs config that causes modes to load improperly.
Tom Flucke 8 年之前
父節點
當前提交
3850675c6a
共有 4 個文件被更改,包括 20 次插入12 次删除
  1. 4 1
      .Xresources
  2. 10 9
      .emacs.d/init.el
  3. 3 1
      .xinitrc
  4. 3 1
      .xsessionrc

+ 4 - 1
.Xresources

@@ -3,4 +3,7 @@
 XTerm*metaSendsEscape: true
 XTerm*eightBitInput: false
 XTerm*Background: black
-XTerm*Foreground: green
+XTerm*Foreground: green
+
+Gnome-terminal*Background: black
+Gnome-terminal*Foreground: green

+ 10 - 9
.emacs.d/init.el

@@ -98,7 +98,8 @@
 ;; * Refactoring
 ;; * Error detection
 (use-package scala-mode
-  :mode "\\.scala\\'")
+  :commands (scala-mode))
+;  :mode "\\.scala\\'"
 
 (use-package ensime
   :disabled
@@ -107,8 +108,8 @@
 
 ; --------- C Syntax checker ---------
 (use-package flycheck-irony
-  :hook c-mode
-  :mode ("\\.c\\'" "\\.h\\'"))
+  :hook c-mode)
+;  :mode ("\\.c\\'" "\\.h\\'")
 
 ;; ------------ Web Mode ------------
 (use-package multi-web-mode
@@ -128,8 +129,8 @@
     :bind ("C-x g" . magit-status)))
 
 ;; ----------- Rust Mode ------------
-(use-package rust-mode
-  :mode ("\\.rs\\'"))
+(use-package rust-mode)
+;  :mode ("\\.rs\\'")
 (use-package rust-playground
   :requires rust-mode)
 (use-package cargo
@@ -147,13 +148,13 @@
 
 ;; ---------- C# Mode -------------
 (use-package csharp-mode
-  :if (version<= "24.4" emacs-version)
-  :mode ("\\.cs\\'"))
+  :if (version<= "24.4" emacs-version))
+;  :mode ("\\.cs\\'")
 
 ;; ------- Markdown Mode ----------
 (when (version<= "24.4" emacs-version)
-  (use-package markdown-mode
-    :mode ("\\.markdown\\'" "\\.md\\'")))
+  (use-package markdown-mode))
+;    :mode ("\\.markdown\\'" "\\.md\\'")
 
 ;; ---- StackOverflow Client ------
 (use-package sx

+ 3 - 1
.xinitrc

@@ -2,4 +2,6 @@
 
 sh ~/.xsessionrc
 
-exec /usr/bin/i3
+if [ -f /usr/bin/i3 ]; then
+    exec /usr/bin/i3
+fi

+ 3 - 1
.xsessionrc

@@ -2,6 +2,8 @@
 
 ~/.i3/generatei3Config.sh
 
-numlockx
+if which numlockx > /dev/null 2> /dev/null; then
+    numlockx
+fi
 
 #exec xautolock -time 15 -locker '/usr/local/bin/suspend' &