From 8580c17483c4626a5b25ba51c9c1749257bd7e25 Mon Sep 17 00:00:00 2001 From: Chris Allen Date: Sun, 23 Aug 2015 16:01:02 -0500 Subject: [PATCH] yasnippet fixed --- .emacs | 17 +++++++++-------- .gitignore | 1 + .install.sh | 2 +- .irssi/config | 2 ++ .xmonad/xmonad.hs | 8 ++++++++ 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/.emacs b/.emacs index 51c2216f..167d9521 100644 --- a/.emacs +++ b/.emacs @@ -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) @@ -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 @@ -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 "") 'yas/exit-all-snippets) (defun yas/goto-end-of-active-field () @@ -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 @@ -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. diff --git a/.gitignore b/.gitignore index 25fe8d57..a9f8f027 100644 --- a/.gitignore +++ b/.gitignore @@ -479,3 +479,4 @@ TAGS .atom/compile-cache .atom/storage .atom/.apm +.xournal/ diff --git a/.install.sh b/.install.sh index 0ea7b926..82564274 100755 --- a/.install.sh +++ b/.install.sh @@ -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 diff --git a/.irssi/config b/.irssi/config index 10d4abf1..d12c9e1d 100644 --- a/.irssi/config +++ b/.irssi/config @@ -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 = { diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs index 219970ce..d36973bd 100644 --- a/.xmonad/xmonad.hs +++ b/.xmonad/xmonad.hs @@ -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 @@ -69,4 +76,5 @@ main = do , modMask = mod4Mask , keys = newKeys , terminal = "gnome-terminal" + -- , handleEventHook = handleEventHook defaultConfig <+> fullscreenEventHook }