diff --git a/emacs/.spacemacs b/emacs/.spacemacs index 1d064b3..35ce57e 100644 --- a/emacs/.spacemacs +++ b/emacs/.spacemacs @@ -33,6 +33,7 @@ values." org latex ocaml + haskell ;; bepo ;; (shell :variables ;; shell-default-height 30 @@ -290,6 +291,9 @@ you should place your code here." (setq TeX-view-program-list '(("Zathura" "zathura-sync %n:1:%b %o"))) (setq TeX-view-program-selection '((output-pdf "Zathura"))) + (setq load-path (cons "~/Compositions/tools/" load-path)) + (require 'tidal) + (setq tidal-interpreter "/home/eeva/.nix-profile/bin/ghci") ) ;; Do not write anything past this comment. This is where Emacs will @@ -301,7 +305,7 @@ you should place your code here." ;; If there is more than one, they won't work right. '(package-selected-packages (quote - (web-mode tagedit slim-mode scss-mode sass-mode pug-mode less-css-mode helm-css-scss haml-mode emmet-mode web-beautify livid-mode skewer-mode simple-httpd json-mode json-snatcher json-reformat js2-refactor yasnippet multiple-cursors js2-mode js-doc coffee-mode pcache hide-comnt uuidgen caml spinner org-projectile org org-download link-hint parent-mode epl request gitignore-mode git-link flx eyebrowse evil-visual-mark-mode evil-unimpaired magit-popup evil-ediff anzu undo-tree highlight dumb-jump f diminish column-enforce-mode bind-map bind-key packed dash avy popup async ws-butler spacemacs-theme spaceline persp-mode org-plus-contrib open-junk-file neotree leuven-theme indent-guide help-fns+ helm-themes helm-projectile helm-descbinds helm-ag google-translate evil-surround evil-search-highlight-persist evil-mc evil-matchit evil-iedit-state iedit auctex-latexmk auctex ace-link ace-jump-helm-line smartparens projectile helm helm-core markdown-mode s alert magit git-commit with-editor hydra package-build which-key evil window-numbering volatile-highlights vi-tilde-fringe utop use-package tuareg toc-org smooth-scrolling smeargle restart-emacs rainbow-delimiters quelpa powerline popwin pkg-info pcre2el paradox page-break-lines orgit org-repo-todo org-present org-pomodoro org-bullets ocp-indent move-text mmm-mode merlin markdown-toc magit-gitflow macrostep lorem-ipsum log4e linum-relative info+ ido-vertical-mode hungry-delete htmlize hl-todo highlight-parentheses highlight-numbers highlight-indentation helm-swoop helm-mode-manager helm-make helm-gitignore helm-flx goto-chg golden-ratio gnuplot gntp gitconfig-mode gitattributes-mode git-timemachine git-messenger gh-md flx-ido fill-column-indicator fancy-battery expand-region exec-path-from-shell evil-visualstar evil-tutor evil-numbers evil-nerd-commenter evil-magit evil-lisp-state evil-indent-plus evil-exchange evil-escape evil-args evil-anzu eval-sexp-fu elisp-slime-nav define-word color-theme-sanityinc-solarized clean-aindent-mode buffer-move bracketed-paste auto-highlight-symbol auto-compile aggressive-indent adaptive-wrap ace-window)))) + (visual-fill-column intero flycheck hlint-refactor hindent helm-hoogle haskell-snippets company-ghci company-ghc ghc company haskell-mode cmm-mode web-mode tagedit slim-mode scss-mode sass-mode pug-mode less-css-mode helm-css-scss haml-mode emmet-mode web-beautify livid-mode skewer-mode simple-httpd json-mode json-snatcher json-reformat js2-refactor yasnippet multiple-cursors js2-mode js-doc coffee-mode pcache hide-comnt uuidgen caml spinner org-projectile org org-download link-hint parent-mode epl request gitignore-mode git-link flx eyebrowse evil-visual-mark-mode evil-unimpaired magit-popup evil-ediff anzu undo-tree highlight dumb-jump f diminish column-enforce-mode bind-map bind-key packed dash avy popup async ws-butler spacemacs-theme spaceline persp-mode org-plus-contrib open-junk-file neotree leuven-theme indent-guide help-fns+ helm-themes helm-projectile helm-descbinds helm-ag google-translate evil-surround evil-search-highlight-persist evil-mc evil-matchit evil-iedit-state iedit auctex-latexmk auctex ace-link ace-jump-helm-line smartparens projectile helm helm-core markdown-mode s alert magit git-commit with-editor hydra package-build which-key evil window-numbering volatile-highlights vi-tilde-fringe utop use-package tuareg toc-org smooth-scrolling smeargle restart-emacs rainbow-delimiters quelpa powerline popwin pkg-info pcre2el paradox page-break-lines orgit org-repo-todo org-present org-pomodoro org-bullets ocp-indent move-text mmm-mode merlin markdown-toc magit-gitflow macrostep lorem-ipsum log4e linum-relative info+ ido-vertical-mode hungry-delete htmlize hl-todo highlight-parentheses highlight-numbers highlight-indentation helm-swoop helm-mode-manager helm-make helm-gitignore helm-flx goto-chg golden-ratio gnuplot gntp gitconfig-mode gitattributes-mode git-timemachine git-messenger gh-md flx-ido fill-column-indicator fancy-battery expand-region exec-path-from-shell evil-visualstar evil-tutor evil-numbers evil-nerd-commenter evil-magit evil-lisp-state evil-indent-plus evil-exchange evil-escape evil-args evil-anzu eval-sexp-fu elisp-slime-nav define-word color-theme-sanityinc-solarized clean-aindent-mode buffer-move bracketed-paste auto-highlight-symbol auto-compile aggressive-indent adaptive-wrap ace-window)))) (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/vim/.vim/bundle/VOoM b/vim/.vim/bundle/VOoM index 4a26ad1..68e1137 160000 --- a/vim/.vim/bundle/VOoM +++ b/vim/.vim/bundle/VOoM @@ -1 +1 @@ -Subproject commit 4a26ad12d4c4030bd6a1bffaed980e60e348251a +Subproject commit 68e1137061c7e97aa920d58a9eded5635675d1a1 diff --git a/vim/.vim/bundle/vim-better-whitespace b/vim/.vim/bundle/vim-better-whitespace index 7b3889c..7729bad 160000 --- a/vim/.vim/bundle/vim-better-whitespace +++ b/vim/.vim/bundle/vim-better-whitespace @@ -1 +1 @@ -Subproject commit 7b3889cd072847f952211693f9aaf0c4ccede0a4 +Subproject commit 7729bada7ad8d341b910367da8a900490bd15e86 diff --git a/vim/.vim/bundle/vim-fugitive b/vim/.vim/bundle/vim-fugitive index 58ed86e..f44845e 160000 --- a/vim/.vim/bundle/vim-fugitive +++ b/vim/.vim/bundle/vim-fugitive @@ -1 +1 @@ -Subproject commit 58ed86e434951319ff7d438fb1096f24a51e6458 +Subproject commit f44845e4408aae03e018e98afb7fbf0c2ee87dd5 diff --git a/vim/.vim/bundle/vim-systemd-syntax b/vim/.vim/bundle/vim-systemd-syntax index 3e8c310..36e8a13 160000 --- a/vim/.vim/bundle/vim-systemd-syntax +++ b/vim/.vim/bundle/vim-systemd-syntax @@ -1 +1 @@ -Subproject commit 3e8c31052cb2daf5ef7e42afe024b8ffd7e643e2 +Subproject commit 36e8a13a778d3fc4dcb51ad148ccb7605dab487b diff --git a/vim/.vim/bundle/vimtex b/vim/.vim/bundle/vimtex index c1dabd4..de61b31 160000 --- a/vim/.vim/bundle/vimtex +++ b/vim/.vim/bundle/vimtex @@ -1 +1 @@ -Subproject commit c1dabd446f2419d20d2a79e16b7abbba3d51ed82 +Subproject commit de61b31cf89b6fd4653dc812d779abcf21ed33d0 diff --git a/zsh/.zshrc b/zsh/.zshrc index 022ffa9..d6376b3 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -1,5 +1,5 @@ # Path to your oh-my-zsh installation. -export ZSH=$(nix-env -q --out-path oh-my-zsh | cut -d' ' -f 3)/share/oh-my-zsh +export ZSH=$(/home/eeva/.nix-profile/bin/nix-env -q --out-path oh-my-zsh | cut -d' ' -f 3)/share/oh-my-zsh # Default plugins (used everywhere) plugins=(git systemd rsync)