Skip to content

Commit

Permalink
yasnippet fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
bitemyapp committed Aug 23, 2015
1 parent b5d7cdb commit 8580c17
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 9 deletions.
17 changes: 9 additions & 8 deletions .emacs
Expand Up @@ -49,7 +49,8 @@
undo-tree
virtualenv
warm-night-theme
yaml-mode))
yaml-mode
yasnippet))

;; rm -rf ~/.emacs.d/elpa to reload
(when (not package-archive-contents)
Expand Down Expand Up @@ -91,8 +92,8 @@
(require 'erlang)

;; flycheck
(require 'flycheck)
(add-hook 'after-init-hook #'global-flycheck-mode)
;; (require 'flycheck)
;; (add-hook 'after-init-hook #'global-flycheck-mode)

;; calls runhaskell which doesn't work
;; (eval-after-load 'flycheck
Expand Down Expand Up @@ -193,10 +194,10 @@
(add-to-list 'auto-mode-alist '("\\.yml\\'" . yaml-mode))

;; yasnippet
(add-to-list 'load-path "~/.emacs.d/yasnippet")
;; (add-to-list 'load-path "~/.emacs.d/yasnippet")
(setq yas-snippet-dirs '("~/.emacs.d/yasnippet/snippets"))
(require 'yasnippet)
;; (yas-global-mode 1)
(yas-global-mode 1)
;; (define-key yas-keymap (kbd "<return>") 'yas/exit-all-snippets)

(defun yas/goto-end-of-active-field ()
Expand All @@ -218,8 +219,8 @@
(define-key yas-keymap (kbd "C-e") 'yas/goto-end-of-active-field)
(define-key yas-keymap (kbd "C-a") 'yas/goto-start-of-active-field)
(setq yas-prompt-functions '(yas/ido-prompt yas/completing-prompt))
(setq yas-verbosity 1)
(setq yas-wrap-around-region t)
;; (setq yas-verbosity 1)
;; (setq yas-wrap-around-region t)

;; default browser
(setq browse-url-browser-function 'browse-url-generic
Expand Down Expand Up @@ -265,7 +266,7 @@
;; If there is more than one, they won't work right.
'(package-selected-packages
(quote
(yaml-mode warm-night-theme virtualenv undo-tree twittering-mode tabbar scss-mode rainbow-mode rainbow-delimiters python-mode pymacs puppet-mode protobuf-mode php-mode nix-mode monokai-theme markdown-mode magit json-mode js2-mode idris-mode ghc flycheck-haskell flycheck erlang dark-krystal-theme csv-mode company cider auto-complete))))
(yasnippet yaml-mode warm-night-theme virtualenv undo-tree twittering-mode tabbar scss-mode rainbow-mode rainbow-delimiters python-mode pymacs puppet-mode protobuf-mode php-mode nix-mode monokai-theme markdown-mode magit json-mode js2-mode idris-mode ghc flycheck-haskell erlang dark-krystal-theme csv-mode company cider auto-complete))))
(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -479,3 +479,4 @@ TAGS
.atom/compile-cache
.atom/storage
.atom/.apm
.xournal/
2 changes: 1 addition & 1 deletion .install.sh
Expand Up @@ -7,7 +7,7 @@ sudo add-apt-repository -y ppa:hvr/ghc

sudo apt-get update

sudo apt-get install -y xmonad xmobar texlive-full texlive-xetex git suckless-tools zsh xorg-dev emacs-snapshot emacs-snapshot-el xtrlock xbacklight stalonetray fdpowermon pasystray python-pygments mosh xorg-dev tmux xorg-dev screen htop
sudo apt-get install -y xmonad xmobar texlive-full texlive-xetex git suckless-tools zsh xorg-dev emacs-snapshot emacs-snapshot-el xtrlock xbacklight stalonetray fdpowermon pasystray python-pygments mosh xorg-dev tmux xorg-dev screen htop mumble

wget -q -O- https://s3.amazonaws.com/download.fpcomplete.com/ubuntu/fpco.key | sudo apt-key add -
echo 'deb http://download.fpcomplete.com/ubuntu/vivid stable main' | sudo tee /etc/apt/sources.list.d/fpco.list
Expand Down
2 changes: 2 additions & 0 deletions .irssi/config
Expand Up @@ -41,6 +41,8 @@ channels = (
{ name = "#lysa"; chatnet = "Freenode"; autojoin = "Yes"; },
{ name = "#haskell-validation"; chatnet = "Freenode"; autojoin = "Yes"; },
{ name = "#servant"; chatnet = "Freenode"; autojoin = "Yes"; },
{ name = "#haskell-in-depth"; chatnet = "Freenode"; autojoin = "Yes"; },
{ name = "#cabal"; chatnet = "Freenode"; autojoin = "Yes"; },
);

aliases = {
Expand Down
8 changes: 8 additions & 0 deletions .xmonad/xmonad.hs
Expand Up @@ -40,6 +40,13 @@ myManageHook = composeAll (
, resource =? "stalonetray" --> doIgnore
, className =? "Unity-2d-panel" --> doIgnore
, className =? "Unity-2d-launcher" --> doIgnore
, className =? "dota2" --> doIgnore
-- , className =? "DyingLightGame" --> doFloat doesn't work either way.
, className =? "Verdun.x86_64" --> doIgnore
, className =? "PillarsOfEternity" --> doIgnore
, className =? "hl2_linux" --> doIgnore
, className =? "eu4" --> doIgnore
, className =? "csgo_linux" --> doIgnore
, className =? "Gimp" --> doFloat
, className =? "Vncviewer" --> doFloat
, manageDocks
Expand Down Expand Up @@ -69,4 +76,5 @@ main = do
, modMask = mod4Mask
, keys = newKeys
, terminal = "gnome-terminal"
-- , handleEventHook = handleEventHook defaultConfig <+> fullscreenEventHook
}

0 comments on commit 8580c17

Please sign in to comment.