summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dotfiles/.emacs.d/init.el23
-rw-r--r--dotfiles/.ssh/config25
2 files changed, 1 insertions, 47 deletions
diff --git a/dotfiles/.emacs.d/init.el b/dotfiles/.emacs.d/init.el
index afdb6b4..e504d96 100644
--- a/dotfiles/.emacs.d/init.el
+++ b/dotfiles/.emacs.d/init.el
@@ -42,10 +42,6 @@
;;; Look and Feel
;;;
-(defun font-exists-p (font)
- "Return 't' if FONT exists."
- (not (null (x-list-fonts font))))
-
;; Use Inconsolata font.
(add-to-list 'default-frame-alist '(font . "Inconsolata-12"))
@@ -351,9 +347,6 @@ indentation."
(add-to-list 'auto-mode-alist '("Rakefile$" . ruby-mode))
(add-to-list 'auto-mode-alist '("Gemfile$" . ruby-mode))
-(use-package ruby-test-mode
- :hook ruby-mode)
-
;;;
;;; SQL
@@ -389,19 +382,6 @@ indentation."
;;;
-;;; RSS
-;;;
-
-(use-package elfeed
- :bind (("C-c f" . elfeed))
- :custom (elfeed-feeds
- '("http://planet.gnu.org/rss20.xml"
- "http://cs.worcester.edu/blog/feed/"
- "https://hacks.mozilla.org/feed/"
- "http://ebb.org/bkuhn/blog/rss.xml")))
-
-
-;;;
;;; GPG
;;;
@@ -423,7 +403,7 @@ indentation."
(erc-kill-server-buffer-on-quit t)
(erc-server-coding-system '(utf-8 . utf-8))
(erc-autojoin-channels-alist
- '(("freenode.net" "#guile" "#guix" "#lispgames")))
+ '(("freenode.net" "#gnuassembly" "#guile" "#guix" "#lispgames")))
;; Don't open channel buffers in place of the current
;; buffer because that drives me fucking crazy.
(erc-join-buffer 'bury)
@@ -471,7 +451,6 @@ indentation."
;;;
(global-set-key (kbd "RET") 'newline-and-indent)
-(global-set-key (kbd "C-c p") 'package-list-packages)
(global-set-key (kbd "C-c C-f") 'ff-find-other-file)
(global-set-key (kbd "M-%") 'query-replace-regexp)
;; No more minimizing Emacs by accident.
diff --git a/dotfiles/.ssh/config b/dotfiles/.ssh/config
index 8a7d9fe..98c6f19 100644
--- a/dotfiles/.ssh/config
+++ b/dotfiles/.ssh/config
@@ -6,31 +6,10 @@
# Host 172.*
# ProxyCommand ssh cygnus -W %h:667
-Host dthompson
- HostName dthompson.us
- User dave
-
-Host aigis
- HostName 192.168.1.222
- User dave
-
Host takemi
HostName dthompson.us
User dave
-Host vhl
- User dthompson
- ProxyCommand ssh dthompson@hydra.vistahl.com -W 7VWJD42.vhl.dom:22
-
-Host vhltunnel
- HostName localhost
- Port 1234
- User dthompson
- ForwardAgent yes
-
-Host gitlab.vhlcentral.com
- ProxyCommand ssh hydra -W 38.88.209.21:22
-
Host aws-prod
HostName virginia-bastion.maestro.vhlcentral.com
ForwardAgent yes
@@ -88,9 +67,5 @@ Host 10.61.*
ProxyCommand ssh aws-mumbai-dev -W %h:22
ForwardAgent yes
-Host 10.63.*
- ProxyCommand ssh aws-qa -W %h:22
- ForwardAgent yes
-
Host 10.41.*
ProxyCommand ssh aws-store -W %h:22