git.fiddlerwoaroof.com
Browse code

various updates...

fiddlerwoaroof authored on 14/08/2017 00:22:09
Showing 12 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1 @@
1
+/.stack-work
0 2
new file mode 100644
... ...
@@ -0,0 +1,35 @@
1
+# For more information, see: http://docs.haskellstack.org/en/stable/yaml_configuration.html
2
+
3
+# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
4
+resolver: lts-4.0
5
+
6
+# Local packages, usually specified by relative directory name
7
+packages:
8
+- '.'
9
+
10
+# Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)
11
+extra-deps: []
12
+
13
+# Override default flag values for local packages and extra-deps
14
+flags: {}
15
+
16
+# Extra package databases containing global packages
17
+extra-package-dbs: []
18
+
19
+# Control whether we use the GHC we find on the path
20
+# system-ghc: true
21
+
22
+# Require a specific version of stack, using version ranges
23
+# require-stack-version: -any # Default
24
+# require-stack-version: >= 1.0.0
25
+
26
+# Override the architecture used by stack, especially useful on Windows
27
+# arch: i386
28
+# arch: x86_64
29
+
30
+# Extra directories used by stack for building
31
+# extra-include-dirs: [/path/to/dir]
32
+# extra-lib-dirs: [/path/to/dir]
33
+
34
+# Allow a newer minor version of GHC than the snapshot specifies
35
+# compiler-check: newer-minor
0 36
new file mode 100644
... ...
@@ -0,0 +1,41 @@
1
+name:                xmonad-ed
2
+version:             0.1.0.0
3
+synopsis:            Initial project template from stack
4
+description:         Please see README.md
5
+homepage:            http://github.com/githubuser/xmonad-ed#readme
6
+license:             BSD3
7
+license-file:        LICENSE
8
+author:              Author name here
9
+maintainer:          example@example.com
10
+copyright:           2016 Author Here
11
+category:            Web
12
+build-type:          Simple
13
+-- extra-source-files:
14
+cabal-version:       >=1.10
15
+
16
+library
17
+  hs-source-dirs:      src
18
+  exposed-modules:     Lib
19
+  build-depends:       base >= 4.7 && < 5
20
+  default-language:    Haskell2010
21
+
22
+executable xmonad-exe
23
+  hs-source-dirs:      app
24
+  main-is:             Main.hs
25
+  ghc-options:         -threaded -rtsopts -with-rtsopts=-N
26
+  build-depends:       base
27
+                     , xmonad-ed
28
+  default-language:    Haskell2010
29
+
30
+test-suite xmonad-test
31
+  type:                exitcode-stdio-1.0
32
+  hs-source-dirs:      test
33
+  main-is:             Spec.hs
34
+  build-depends:       base
35
+                     , xmonad-ed
36
+  ghc-options:         -threaded -rtsopts -with-rtsopts=-N
37
+  default-language:    Haskell2010
38
+
39
+source-repository head
40
+  type:     git
41
+  location: https://github.com/githubuser/xmonad
... ...
@@ -29,6 +29,7 @@
29 29
 (use-package evil
30 30
   :ensure t
31 31
   :config
32
+
32 33
   (define-key evil-normal-state-map " o" 'slime-selector)
33 34
   (define-key evil-insert-state-map (kbd "TAB") 'company-complete)
34 35
 
... ...
@@ -82,10 +83,18 @@
82 83
 
83 84
 ;;;;; }}}
84 85
 
86
+(setq browse-url-browser-function
87
+      'eww-browse-url)
88
+
85 89
 ;;;;; SLIME SETUP {{{
86 90
 (progn ;slime isn't loaded via use-package because quicklisp-helper keeps it uptodate
87 91
   (load (expand-file-name "~/quicklisp/slime-helper.el"))
88 92
 
93
+  (when (and (boundp 'common-lisp-hyperspec-root)
94
+             (string-prefix-p "/" common-lisp-hyperspec-root))
95
+    (setq common-lisp-hyperspec-root
96
+          (concat "file://" common-lisp-hyperspec-root)))
97
+
89 98
   ;; Replace "sbcl" with the path to your implementation
90 99
   (setq inferior-lisp-program "~/sbcl/bin/sbcl")
91 100
 
... ...
@@ -334,7 +343,10 @@
334 343
   :ensure t)
335 344
 
336 345
 (use-package emmet-mode
337
-  :ensure t)
346
+  :ensure t
347
+  :config
348
+  (define-key evil-insert-state-map (kbd "C-c ,") 'emmet-expand-line)
349
+  )
338 350
 
339 351
 (use-package project-explorer
340 352
   :ensure t
... ...
@@ -421,13 +433,6 @@
421 433
   (normal-top-level-add-subdirs-to-load-path))
422 434
 
423 435
 
424
-(custom-set-faces
425
- ;; custom-set-faces was added by Custom.
426
- ;; If you edit it by hand, you could mess it up, so be careful.
427
- ;; Your init file should contain only one such instance.
428
- ;; If there is more than one, they won't work right.
429
- '(default ((t (:family "Source Code Pro" :foundry "adobe" :slant normal :weight semi-bold :height 113 :width normal)))))
430
- 
431 436
 
432 437
 (setq erc-hide-list '("JOIN" "PART" "QUIT"))
433 438
 
... ...
@@ -544,4 +549,4 @@
544 549
 (global-ede-mode)
545 550
 
546 551
 (setq custom-file "~/.emacs.d/custom.el")
547
-
552
+(load-file custom-file)
548 553
new file mode 160000
... ...
@@ -0,0 +1 @@
1
+Subproject commit 38527d12ccad82253de92c49e951814c48f43c60
0 2
new file mode 100644
... ...
@@ -0,0 +1,46 @@
1
+# -*- mode: sh; sh-shell: zsh;-*-
2
+#zmodload zsh/zprof
3
+PLUGIN_DIR="${PLUGIN_DIR:-$HOME/.zsh.d}"
4
+
5
+local script_depends loaded_depends
6
+typeset -A script_depends
7
+typeset -A loaded_depends
8
+get_depends() {
9
+    awk -F: '$0=="###" || $1 != "#" { exit } $1="depends-on" {print $3}' "$1"
10
+}
11
+
12
+build_depends() {
13
+    local -a depends
14
+    depends=${(@f)$(get_depends "$1")}
15
+    for depend in $depends; do
16
+	script_depends[$1]+="$depend:"
17
+    done
18
+}
19
+
20
+load_depends() {
21
+    for depend in ${(s<:>)script_depends[$1]}; do
22
+	if [[ -z $loaded_depends[$depend] ]]; then
23
+	  local fn="$PLUGIN_DIR/dependencies/$depend.zsh"
24
+	  if [[ -f $fn ]]; then
25
+	    if [[ -z $script_depends[$fn] ]]; then
26
+	      build_depends "$fn"
27
+	    fi
28
+	    load_depends "$fn"
29
+	    source $fn
30
+	  else
31
+	      echo "$fn missing for $1"
32
+	  fi
33
+	  loaded_depends[$depend]=1
34
+	else
35
+	fi
36
+    done
37
+}
38
+
39
+init_scripts=( $PLUGIN_DIR/*.{,z}sh(N) ) 
40
+
41
+PATH="<<<:$PATH:>>>"
42
+for x in $init_scripts; do
43
+    build_depends "$x"
44
+    load_depends "$x"
45
+    source "$x"
46
+done
... ...
@@ -423,6 +423,7 @@ command -nargs=+ Gadd Git add <q-args>
423 423
 " set runtimepath+=/Applications/LilyPond.app/Contents/Resources/share/lilypond/current/vim
424 424
 au BufNewFile,BufRead *.phn set filetype=clojure
425 425
 
426
+if has('python')
426 427
 python << EOF
427 428
 import os
428 429
 import sys
... ...
@@ -431,5 +432,14 @@ for p in sys.path:
431 432
     if os.path.isdir(p):
432 433
         vim.command(r"set path+=%s" % (p.replace(" ", r"\ ")))
433 434
 EOF
434
-
435
-
435
+endif
436
+if has('python3')
437
+python3 << EOF
438
+import os
439
+import sys
440
+import vim
441
+for p in sys.path:
442
+    if os.path.isdir(p):
443
+        vim.command(r"set path+=%s" % (p.replace(" ", r"\ ")))
444
+EOF
445
+endif
436 446
new file mode 100644
... ...
@@ -0,0 +1,30 @@
1
+Copyright Author name here (c) 2016
2
+
3
+All rights reserved.
4
+
5
+Redistribution and use in source and binary forms, with or without
6
+modification, are permitted provided that the following conditions are met:
7
+
8
+    * Redistributions of source code must retain the above copyright
9
+      notice, this list of conditions and the following disclaimer.
10
+
11
+    * Redistributions in binary form must reproduce the above
12
+      copyright notice, this list of conditions and the following
13
+      disclaimer in the documentation and/or other materials provided
14
+      with the distribution.
15
+
16
+    * Neither the name of Author name here nor the names of other
17
+      contributors may be used to endorse or promote products derived
18
+      from this software without specific prior written permission.
19
+
20
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
21
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
22
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
23
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
24
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
25
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
26
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
27
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
28
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
29
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
30
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
0 31
\ No newline at end of file
1 32
new file mode 100644
... ...
@@ -0,0 +1,2 @@
1
+import Distribution.Simple
2
+main = defaultMain
0 3
new file mode 100644
... ...
@@ -0,0 +1,6 @@
1
+module Main where
2
+
3
+import Lib
4
+
5
+main :: IO ()
6
+main = someFunc
0 7
new file mode 100644
... ...
@@ -0,0 +1,6 @@
1
+module Lib
2
+    ( someFunc
3
+    ) where
4
+
5
+someFunc :: IO ()
6
+someFunc = putStrLn "someFunc"
0 7
new file mode 100644
... ...
@@ -0,0 +1,2 @@
1
+main :: IO ()
2
+main = putStrLn "Test suite not yet implemented"