File tree 2 files changed +31
-3
lines changed 2 files changed +31
-3
lines changed Original file line number Diff line number Diff line change 5
5
(server-start ))
6
6
(setq visible-bell 1 )))
7
7
8
+ ; ; nix-shell
9
+ (defun in-nix-shell ()
10
+ (let (x (getenv " IN_NIX_SHELL" ))
11
+ (or (string-equal x " impure" )
12
+ (string-equal x " pure" ))))
13
+
8
14
; ; *scratch*
9
15
(setq initial-major-mode 'org-mode )
10
16
88
94
'(lambda () (flycheck-add-next-checker 'haskell-dante
89
95
'(warning . haskell-hlint))))))
90
96
97
+ ; ; ocaml
98
+ (setq ngyj/merlin-site-elisp (getenv " MERLIN_SITE_LISP" ))
99
+ (setq ngyj/utop-site-elisp (getenv " UTOP_SITE_LISP" ))
100
+ (setq ngyj/ocp-site-elisp (getenv " OCP_INDENT_SITE_LISP" ))
101
+
102
+ (use-package merlin
103
+ :if (and ngyj/merlin-site-elisp
104
+ (in-nix-shell))
105
+ :load-path ngyj/merlin-site-elisp
106
+ :hook
107
+ (tuareg-mode . merlin-mode)
108
+ (merlin-mode . company-mode)
109
+ :custom
110
+ (merlin-command " ocamlmerlin" ))
111
+ (use-package utop
112
+ :if (and ngyj/utop-site-elisp
113
+ (in-nix-shell))
114
+ :load-path ngyj/utop-site-elisp
115
+ :hook
116
+ (tuareg-mode . utop-minor-mode))
117
+ (use-package ocp-indent
118
+ :if (and ngyj/ocp-site-elisp
119
+ (in-nix-shell))
120
+ :load-path ngyj/ocp-site-elisp)
121
+
91
122
; ; nix
92
123
(use-package nix-mode
93
124
:mode " \\ .nix\\ '" )
Original file line number Diff line number Diff line change @@ -12,9 +12,6 @@ export PATH=$PATH:$HOME/.cabal/bin:$HOME/.local/bin
12
12
# cargo
13
13
export PATH=$PATH:$HOME/.cargo/bin
14
14
15
- # opam
16
- eval `opam config env`
17
-
18
15
# rakudo
19
16
#export PATH=$PATH:~/build/rakudo/rakudo-star-2018.04/install/bin/:~/build/rakudo/rakudo-star-2018.04/install/share/perl6/site/bin
20
17
# }}}
You can’t perform that action at this time.
0 commit comments