Переглянути джерело

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

+ 3 - 1
.xinitrc

@@ -2,4 +2,6 @@
 
 
 sh ~/.xsessionrc
 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
 ~/.i3/generatei3Config.sh
 
 
-numlockx
+if which numlockx > /dev/null 2> /dev/null; then
+    numlockx
+fi
 
 
 #exec xautolock -time 15 -locker '/usr/local/bin/suspend' &
 #exec xautolock -time 15 -locker '/usr/local/bin/suspend' &