commit 52c67ec2563cf5e945f6732fd3786b11dda5ce10 · hauleth.dev/dotfiles

-15

ctags/.ctags.d/elixir.ctags

···

       1
       1
       -
       --langdef=Elixir

     

       2
       2
       -
       --langmap=Elixir:.ex.exs

     

       3
       3
       -
       --regex-Elixir=/^[ \t]*def(p?)[ \t]+([a-z_][a-zA-Z0-9_?!]*)/\2/f,functions,functions (def ...)/

     

       4
       4
       -
       --regex-Elixir=/^[ \t]*defcallback[ \t]+([a-z_][a-zA-Z0-9_?!]*)/\1/c,callbacks,callbacks (defcallback ...)/

     

       5
       5
       -
       --regex-Elixir=/^[ \t]*defdelegate[ \t]+([a-z_][a-zA-Z0-9_?!]*)/\1/d,delegates,delegates (defdelegate ...)/

     

       6
       6
       -
       --regex-Elixir=/^[ \t]*defexception[ \t]+([A-Z][a-zA-Z0-9_]*\.)*([A-Z][a-zA-Z0-9_?!]*)/\2/e,exceptions,exceptions (defexception ...)/

     

       7
       7
       -
       --regex-Elixir=/^[ \t]*defimpl[ \t]+([A-Z][a-zA-Z0-9_]*\.)*([A-Z][a-zA-Z0-9_?!]*)/\2/i,implementations,implementations (defimpl ...)/

     

       8
       8
       -
       --regex-Elixir=/^[ \t]*defmacro(p?)[ \t]+([a-z_][a-zA-Z0-9_?!]*)\(/\2/a,macros,macros (defmacro ...)/

     

       9
       9
       -
       --regex-Elixir=/^[ \t]*defguard(p?)[ \t]+([a-z_][a-zA-Z0-9_?!]*)\(/\2/g,guards,guards (defguard ...)/

     

       10
       10
       -
       --regex-Elixir=/^[ \t]*defmacro(p?)[ \t]+([a-zA-Z0-9_?!]+)?[ \t]+([^ \tA-Za-z0-9_]+)[ \t]*[a-zA-Z0-9_!?!]/\3/o,operators,operators (e.g. "defmacro a <<< b")/

     

       11
       11
       -
       --regex-Elixir=/^[ \t]*defmodule[ \t]+([A-Z][a-zA-Z0-9_]*\.)*([A-Z][a-zA-Z0-9_?!]*)/\2/m,modules,modules (defmodule ...)/

     

       12
       12
       -
       --regex-Elixir=/^[ \t]*defprotocol[ \t]+([A-Z][a-zA-Z0-9_]*\.)*([A-Z][a-zA-Z0-9_?!]*)/\2/p,protocols,protocols (defprotocol...)/

     

       13
       13
       -
       --regex-Elixir=/^[ \t]*Record\.defrecord[ \t]+:([a-zA-Z0-9_]+)/\1/r,records,records (defrecord...)/

     

       14
       14
       -
       --regex-Elixir=/^[ \t]*test[ \t]+\"([a-z_][a-zA-Z0-9_?! ]*)\"*/\1/t,tests,tests (test ...)/

     

       15
       15
       -
       

     

       16
       1
        
       --exclude=_build

     

       17
       2
        
       --exclude=deps

     

       18
       3
        
       --exclude=.elixir_ls

+30 -3

fish/.config/fish/config.fish

···

       11
       11
        
       if not functions -q fundle

     

       12
       12
        
           eval (curl -sfL https://git.io/fundle-install)

     

       13
       13
        
       end

     

       14
       14
       -
       

     

       15
       14
        
       fundle plugin 'hauleth/agnoster'

     

       16
       16
       -
       

     

       17
       15
        
       fundle init

     

       18
       16
        
       

     

       19
       17
        
       ulimit -n 10480

     

       20
       18
        
       

     

       21
       19
        
       set fish_user_paths ~/bin ~/.nix-profile/bin /run/current-system/sw/bin

     

       22
       20
        
       

     

       21
       21
       +
       if type nix-locate ^/dev/null >/dev/null

     

       22
       22
       +
           function nix_locate_bin --on-event fish_command_not_found

     

       23
       23
       +
               if not test -t 1

     

       24
       24
       +
                   __fish_default_command_not_found_handler $argv[1]

     

       25
       25
       +
               end

     

       26
       26
       +
       

     

       27
       27
       +
               set -l cmd $argv[1]

     

       28
       28
       +
               set -l attrs (nix-locate --minimal --no-group --type x --type s --top-level --whole-name --at-root "/bin/$cmd")

     

       29
       29
       +
       

     

       30
       30
       +
               switch (count $attrs)

     

       31
       31
       +
                   case 0

     

       32
       32
       +
                       echo "$cmd: command not found" >&2

     

       33
       33
       +
                   case 1

     

       34
       34
       +
                       echo "Found one package with $cmd, trying to run in 1s" >&2

     

       35
       35
       +
                       sleep 1

     

       36
       36
       +
                       if nix-build --no-out-link -A $attrs "<nixpkgs>"

     

       37
       37
       +
                           nix-shell -p $attrs --run (printf "'%s' " $argv)

     

       38
       38
       +
                           return

     

       39
       39
       +
                       else

     

       40
       40
       +
                           echo "Failed to install nixpkgs.$attrs"

     

       41
       41
       +
                           echo "$cmd: command not found"

     

       42
       42
       +
                       end

     

       43
       43
       +
                   case '*'

     

       44
       44
       +
                       echo "$cmd is not installed. You can find it in:" >&2

     

       45
       45
       +
                       printf "\tnix-env -iA nixpkgs.%s\n" $attrs >&2

     

       46
       46
       +
               end

     

       47
       47
       +
           end

     

       48
       48
       +
       end

     

       49
       49
       +
       

     

       23
       50
        
       if status --is-interactive

     

       24
       24
       -
           env SHELL=fish keychain --eval --quiet -Q id_ed25519 | source

     

       51
       51
       +
           # env SHELL=fish keychain --eval --quiet -Q | source

     

       25
       52
        
       

     

       26
       53
        
           kitty + complete setup fish | source

     

       27
       54
        
       end

+1 -1

fish/.config/fish/functions/p.fish

···

       1
       1
        
       function p

     

       2
       2
       -
           pretty $argv

     

       2
       2
       +
           bat $argv

     

       3
       3
        
       end

+7

git/.config/git/attributes

···

       1
       1
       +
       # Elixir

     

       2
       2
       +
       *.ex diff=elixir

     

       3
       3
       +
       *.exs diff=elixir

     

       4
       4
       +
       

     

       5
       5
       +
       # Erlang

     

       6
       6
       +
       *.erl diff=erlang

     

       7
       7
       +
       *.hrl diff=erlang

+23 -3

git/.config/git/config

···

       1
       1
        
       [core]

     

       2
       2
        
       	commitGraph = true

     

       3
       3
       +
       	pager = "diff-so-fancy | less --tabs=4 -RFX"

     

       3
       4
        
       [gc]

     

       4
       5
        
       	writeCommitGraph = true

     

       5
       6
        
       [alias]

     
···

       19
       20
        
       	com = checkout master

     

       20
       21
        
       	ag = grep

     

       21
       22
        
       	rg = grep

     

       22
       22
       -
       	ver = tag --sort=version:refname

     

       23
       23
        
       	skip = update-index --skip-worktree

     

       24
       24
        
       	unskip = update-index --no-skip-worktree

     

       25
       25
        
       	publish = push -u hauleth

     

       26
       26
       -
       	cleaner = !git branch --merged master | grep -v '^[ *]*master$' | xargs -r git branch -d

     

       26
       26
       +
       	cleanup = "!git branch --format='%(refname:lstrip=2)' --no-contains HEAD --no-contains master --merged master | xargs -xn1 git branch -d"

     

       27
       27
        
       

     

       28
       28
        
       [mergetool]

     

       29
       29
        
       	keepBackup = false

     
···

       36
       36
        
       	autoSetupRebase = always

     

       37
       37
        
       [push]

     

       38
       38
        
       	default = simple

     

       39
       39
       +
       	followTags = true

     

       39
       40
        
       [pull]

     

       40
       41
        
       	ff = only

     

       41
       42
        
       [merge]

     
···

       53
       54
        
       # Automatically sign all tags and commits

     

       54
       55
        
       [tag]

     

       55
       56
        
       	forceSignAnnotated = true

     

       57
       57
       +
       	sort = version:refname

     

       56
       58
        
       [commit]

     

       57
       59
        
       	gpgsign = true

     

       58
       60
        
       	verbose = true

     
···

       71
       73
        
       	algorithm = histogram

     

       72
       74
        
       	mnemonicPrefix = true

     

       73
       75
        
       

     

       76
       76
       +
       [diff "elixir"]

     

       77
       77
       +
       	xfuncname = "^[ \t]*((def(macro|module|impl|guard|protocol)?p?|test)[ \t].*)$"

     

       78
       78
       +
       

     

       79
       79
       +
       [color]

     

       80
       80
       +
       	ui = true

     

       81
       81
       +
       

     

       74
       82
        
       [color.diff]

     

       75
       83
        
       	old = blue

     

       76
       84
        
       	new = yellow

     

       77
       85
        
       

     

       86
       86
       +
       [color.diff-highlight]

     

       87
       87
       +
       	oldNormal = "blue"

     

       88
       88
       +
       	oldHighlight = "blue ul"

     

       89
       89
       +
       	newNormal = "yellow"

     

       90
       90
       +
       	newHighlight = "yellow ul"

     

       91
       91
       +
       

     

       78
       92
        
       [pack]

     

       79
       93
        
       	useSparse = true

     

       80
       94
        
       

     

       81
       81
       -
       # vim: ft=gitconfig noexpandtab

     

       95
       95
       +
       [sendemail]

     

       96
       96
       +
       	annotate = true

     

       97
       97
       +
       	confirm = always

     

       98
       98
       +
       	thread = true

     

       99
       99
       +
       	supersscc = self

     

       100
       100
       +
       

     

       101
       101
       +
       # vim: ft=gitconfig noexpandtab sw=8

+1

git/.config/git/ignore

···

       69
       69
        
       .tool-versions-e

     

       70
       70
        
       # }}}

     

       71
       71
        
       .elixir_ls

     

       72
       72
       +
       /.direnv

+1 -1

kitty/.config/kitty/kitty.conf

···

       26
       26
        
       

     

       27
       27
        
       #: Font size (in pts)

     

       28
       28
        
       

     

       29
       29
       -
       # adjust_line_height  0

     

       29
       29
       +
       adjust_line_height  100%

     

       30
       30
        
       # adjust_column_width 0

     

       31
       31
        
       

     

       32
       32
        
       #: Change the size of each character cell kitty renders. You can use

+7 -7

misc/.dir_colors

···

       2
       2
        
       # Below are the color init strings for the basic file types. A color init

     

       3
       3
        
       # string consists of one or more of the following numeric codes:

     

       4
       4
        
       # Attribute codes:

     

       5
       5
       -
       # 00=none 01=bold 04=underscore 05=blink 07=reverse 08=concealed

     

       5
       5
       +
       # 00=none 01=bold 03=cursive 04=underscore 05=blink 07=reverse 08=concealed

     

       6
       6
        
       # Text color codes:

     

       7
       7
        
       # 30=black 31=red 32=green 33=yellow 34=blue 35=magenta 36=cyan 37=white

     

       8
       8
        
       # Background color codes:

     
···

       14
       14
        
       # Background 256 color coding:

     

       15
       15
        
       # 48;5;COLOR_NUMBER

     

       16
       16
        
       

     

       17
       17
       -
       NORMAL 00;38;5;01 # no color code at all

     

       17
       17
       +
       NORMAL 00;38;5;07 # no color code at all

     

       18
       18
        
       #FILE 00 # regular file: use no color at all

     

       19
       19
        
       RESET 0 # reset to "normal" color

     

       20
       20
        
       DIR 00;38;5;04 # directory 01;34

     
···

       100
       100
        
       .tex    01;38;5;01

     

       101
       101
        
       # }}}

     

       102
       102
        
       # "unimportant" files as logs and backups (base01) {{{

     

       103
       103
       -
       .log    00;38;5;18

     

       104
       104
       -
       .bak    00;38;5;18

     

       105
       105
       -
       .aux    00;38;5;18

     

       106
       106
       -
       .bbl    00;38;5;18

     

       107
       107
       -
       .blg    00;38;5;18

     

       103
       103
       +
       .log    00;38;5;5

     

       104
       104
       +
       .bak    00;38;5;5

     

       105
       105
       +
       .aux    00;38;5;5

     

       106
       106
       +
       .bbl    00;38;5;5

     

       107
       107
       +
       .blg    00;38;5;5

     

       108
       108
        
       # }}}

     

       109
       109
        
       # audio formats (orange) {{{

     

       110
       110
        
       .aac    00;38;5;06

+2

nix/.config/nix/nix.conf

···

       1
       1
       +
       keep-outputs = true

     

       2
       2
       +
       keep-derivations = true

+41 -25

nix/.config/nixpkgs/darwin/configuration.nix

···

       1
       1
        
       { config, pkgs, ... }:

     

       2
       2
        
       

     

       3
       3
       +
       let

     

       4
       4
       +
         gitFuller = pkgs.gitAndTools.gitFull.override { sendEmailSupport = true; };

     

       5
       5
       +
       in

     

       3
       6
        
       {

     

       4
       7
        
         system.defaults.dock.autohide = true;

     

       5
       8
        
       

     
···

       8
       11
        
       

     

       9
       12
        
         # List packages installed in system profile. To search by name, run:

     

       10
       13
        
         # $ nix-env -qaP | grep wget

     

       11
       11
       -
         environment.systemPackages = with pkgs;

     

       12
       12
       -
           [ neovim

     

       13
       13
       -
             neovim-remote

     

       14
       14
       -
             universal-ctags

     

       15
       15
       -
             ripgrep

     

       16
       16
       -
             fzy

     

       17
       17
       -
             jq

     

       18
       18
       -
             direnv

     

       19
       19
       -
             git

     

       20
       20
       -
             gitAndTools.hub

     

       21
       21
       -
             gitAndTools.git-imerge

     

       22
       22
       -
             gitAndTools.git-test

     

       23
       23
       -
             gitAndTools.tig

     

       24
       24
       -
             gnupg

     

       25
       25
       -
             keychain

     

       26
       26
       -
             noti

     

       27
       27
       -
             entr

     

       28
       28
       -
             httpie

     

       29
       29
       -
             dnsmasq

     

       30
       30
       -
           ];

     

       14
       14
       +
         environment.systemPackages = with pkgs; [

     

       15
       15
       +
           aerc

     

       16
       16
       +
           asciinema

     

       17
       17
       +
           bat

     

       18
       18
       +
           coreutils

     

       19
       19
       +
           direnv

     

       20
       20
       +
           dnsmasq

     

       21
       21
       +
           entr

     

       22
       22
       +
           fzy

     

       23
       23
       +
           gitAndTools.diff-so-fancy

     

       24
       24
       +
           gitAndTools.git-imerge

     

       25
       25
       +
           gitAndTools.git-test

     

       26
       26
       +
           gitAndTools.hub

     

       27
       27
       +
           gitAndTools.tig

     

       28
       28
       +
           gitFuller

     

       29
       29
       +
           git-lfs

     

       30
       30
       +
           gnupg

     

       31
       31
       +
           httpie

     

       32
       32
       +
           imagemagick

     

       33
       33
       +
           jq

     

       34
       34
       +
           neovim

     

       35
       35
       +
           neovim-remote

     

       36
       36
       +
           nix-index

     

       37
       37
       +
           noti

     

       38
       38
       +
           ripgrep

     

       39
       39
       +
           universal-ctags

     

       40
       40
       +
           weechat

     

       41
       41
       +
           w3m

     

       42
       42
       +
         ];

     

       31
       43
        
       

     

       32
       44
        
         environment.shells = [ pkgs.fish ];

     

       33
       45
        
       

     
···

       35
       47
        
         fonts.fonts = let

     

       36
       48
        
           iosevkaTerm = pkgs.iosevka.override {

     

       37
       49
        
             set = "term";

     

       38
       38
       -
             family = "Iosevka Term";

     

       39
       39
       -
             design = [ "ss10" "term" ];

     

       50
       50
       +
             privateBuildPlan = {

     

       51
       51
       +
               family = "Iosevka Term";

     

       52
       52
       +
               design = [ "ss10" "cv10" "cv38" "cv62" "term" ];

     

       53
       53
       +
             };

     

       40
       54
        
           };

     

       41
       55
        
           iosevka = pkgs.iosevka.override {

     

       42
       56
        
             set = "ss10";

     

       43
       43
       -
             family = null;

     

       44
       44
       -
             design = [ "ss10" "calt-logic" ];

     

       57
       57
       +
             privateBuildPlan = {

     

       58
       58
       +
               family = "Iosevka";

     

       59
       59
       +
               design = [ "ss10" "cv10" "cv38" "cv62" "calt-logic" ];

     

       60
       60
       +
             };

     

       45
       61
        
           };

     

       46
       62
        
         in [

     

       47
       63
        
           pkgs.lato

     
···

       67
       83
        
           enable = true;

     

       68
       84
        
           text = ''

     

       69
       85
        
             address=/localhost/127.0.0.1

     

       70
       70
       -
             '';

     

       86
       86
       +
           '';

     

       71
       87
        
         };

     

       72
       88
        
         environment.etc."resolver/localhost" = {

     

       73
       89
        
           enable = true;

+5 -10

nix/.config/nixpkgs/overlays/erlang.nix

···

       1
       1
        
       self: super:

     

       2
       2
        
       

     

       3
       3
       -
       with self;

     

       4
       4
       -
       

     

       5
       3
        
       let

     

       6
       6
       -
         fetchMixDeps = callPackage ./erlang/fetch-mix-deps.nix {};

     

       4
       4
       +
         fetchMixDeps = super.callPackage ./erlang/fetch-mix-deps.nix {};

     

       5
       5
       +
         packages = super.beam.packages.erlang;

     

       7
       6
        
       in

     

       8
       7
        
       {

     

       9
       8
        
         inherit fetchMixDeps;

     

       10
       9
        
       

     

       11
       11
       -
         erlangSourcer = callPackage ./erlang/sourcer.nix {

     

       12
       12
       -
           erlang = beam.packages.erlang;

     

       13
       13
       -
         };

     

       14
       14
       -
       

     

       15
       15
       -
         elixirLS = self.callPackage ./erlang/elixir-ls.nix {

     

       16
       16
       -
           erlang = beam.packages.erlang;

     

       17
       17
       -
         };

     

       10
       10
       +
         erlangSourcer = packages.callPackage ./erlang/sourcer.nix {};

     

       11
       11
       +
         erlangLS = packages.callPackage ./erlang/erlang-ls.nix {};

     

       12
       12
       +
         elixirLS = packages.callPackage ./erlang/elixir-ls.nix {};

     

       18
       13
        
       }

+6

nix/.config/nixpkgs/overlays/erlang/elixir-ls.json

···

       1
       1
       +
       {

     

       2
       2
       +
           "owner": "elixir-lsp",

     

       3
       3
       +
           "repo": "elixir-ls",

     

       4
       4
       +
           "rev": "ba1c9cb86545298c487cf77a166c203fc44ce8dd",

     

       5
       5
       +
           "sha256": "07i9hpgshl1i09id8gadi46p0z3j19z5pybmmasnky1jjnnqv7sk"

     

       6
       6
       +
       }

+7 -11

nix/.config/nixpkgs/overlays/erlang/elixir-ls.nix

···

       1
       1
       -
       { stdenv, erlang, fetchFromGitHub, fetchMixDeps, git }:

     

       1
       1
       +
       { stdenv, elixir, rebar3, hex, fetchFromGitHub, fetchMixDeps, gitMinimal }:

     

       2
       2
        
       

     

       3
       3
       -
       with erlang;

     

       4
       4
       -
       

     

       3
       3
       +
       let

     

       4
       4
       +
         json = builtins.fromJSON (builtins.readFile ./elixir-ls.json);

     

       5
       5
       +
       in

     

       5
       6
        
       stdenv.mkDerivation rec {

     

       6
       7
        
         name = "elixir-ls";

     

       7
       7
       -
         version = "unstable-2019-07-15";

     

       8
       8
       +
         version = json.rev;

     

       8
       9
        
       

     

       9
       9
       -
         nativeBuildInputs = [ elixir hex git ];

     

       10
       10
       +
         nativeBuildInputs = [ elixir hex gitMinimal deps ];

     

       10
       11
        
       

     

       11
       12
        
         deps = fetchMixDeps {

     

       12
       13
        
           inherit name version src;

     

       13
       14
        
         };

     

       14
       15
        
       

     

       15
       16
        
         # refresh: nix-prefetch-git https://github.com/elixir-lsp/elixir-ls.git [--rev branchName | --rev sha]

     

       16
       16
       -
         src = fetchFromGitHub {

     

       17
       17
       -
           rev = "95c021fdb8e279ae3e9ab0ae1af8624d5572fad3";

     

       18
       18
       -
           owner = "elixir-lsp";

     

       19
       19
       -
           repo = "elixir-ls";

     

       20
       20
       -
           sha256 = "0qkqra09rvw6hxa8pbdvxnvqlvgw0qyq2rlgd56hxjbxa280ba1c";

     

       21
       21
       -
         };

     

       17
       17
       +
         src = fetchFromGitHub json;

     

       22
       18
        
       

     

       23
       19
        
         dontStrip = true;

     

       24
       20

+6

nix/.config/nixpkgs/overlays/erlang/erlang-ls.json

···

       1
       1
       +
       {

     

       2
       2
       +
           "owner": "erlang-ls",

     

       3
       3
       +
           "repo": "erlang_ls",

     

       4
       4
       +
           "rev": "6a675ee5b43d53cf3ec393f225c61c7226c9da7b",

     

       5
       5
       +
           "sha256": "0n43b6g2k8d5cbgvgc00mlz5v8cmyjidlxsjx540xhn6ybyyz710"

     

       6
       6
       +
       }

+11

nix/.config/nixpkgs/overlays/erlang/erlang-ls.nix

···

       1
       1
       +
       { rebar3Relx, fetchFromGitHub, gitMinimal }:

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         json = builtins.fromJSON (builtins.readFile ./erlang-ls.json);

     

       5
       5
       +
       in rebar3Relx rec {

     

       6
       6
       +
         name = "erlang-ls";

     

       7
       7
       +
         version = json.rev;

     

       8
       8
       +
         releaseType = "escript";

     

       9
       9
       +
       

     

       10
       10
       +
         src = fetchFromGitHub json;

     

       11
       11
       +
       }

+2 -7

nix/.config/nixpkgs/overlays/erlang/fetch-mix-deps.nix

···

       1
       1
       -
       { stdenv, elixir, rebar3, git, cacert }:

     

       1
       1
       +
       { stdenv, elixir, rebar3, gitMinimal, cacert }:

     

       2
       2
        
       

     

       3
       3
        
       { name, version, sha256 ? null, src, env ? "prod" }:

     

       4
       4
        
       

     
···

       7
       7
        
       mkDerivation {

     

       8
       8
        
         name = "mix-deps-${name}-${version}";

     

       9
       9
        
       

     

       10
       10
       -
         nativeBuildInputs = [ elixir git cacert ];

     

       10
       10
       +
         nativeBuildInputs = [ elixir gitMinimal cacert ];

     

       11
       11
        
       

     

       12
       12
        
         phases = [ "downloadPhase" "installPhase" ];

     

       13
       13
        
       

     
···

       16
       16
        
           export MIX_HOME=$PWD

     

       17
       17
        
           export MIX_ENV=${env}

     

       18
       18
        
       

     

       19
       19
       -
           echo $HEX_HOME

     

       20
       20
       -
       

     

       21
       19
        
           cp -R ${src}/* .

     

       22
       20
        
       

     

       23
       21
        
           mix local.hex --force

     

       24
       22
        
           mix local.rebar rebar3 ${rebar3}/bin/rebar3

     

       25
       23
        
           mix deps.get

     

       26
       26
       -
       

     

       27
       27
       -
           ls -la deps

     

       28
       24
        
           '';

     

       29
       25
        
       

     

       30
       26
        
         installPhase = ''

     
···

       34
       30
        
       

     

       35
       31
        
         outputHashAlgo = "sha256";

     

       36
       32
        
         outputHashMode = "recursive";

     

       37
       37
       -
         # outputHash = sha256;

     

       38
       33
        
       

     

       39
       34
        
         impureEnvVars = lib.fetchers.proxyImpureEnvVars;

     

       40
       35
        
       }

+2 -2

nix/.config/nixpkgs/overlays/erlang/sourcer.json

···

       1
       1
        
       {

     

       2
       2
        
           "owner": "erlang",

     

       3
       3
        
           "repo": "sourcer",

     

       4
       4
       -
           "rev": "e598ec52ed2c62eb50e4556dc9cd5adb664de610",

     

       5
       5
       -
           "sha256": "1kq466vqcc5fwynl457xzqamj1ldfbbv03x7dg5m8167swdi93am"

     

       4
       4
       +
           "rev": "27ea9c63998b9e694eb7b654dd05b831b989e69e",

     

       5
       5
       +
           "sha256": "0v12ylryqfb0zm6zxv45v7jpqh3kbrvn0lzafnzp5vvmgd4g3qa5"

     

       6
       6
        
       }

+4 -4

nix/.config/nixpkgs/overlays/erlang/sourcer.nix

···

       1
       1
       -
       { erlang, fetchFromGitHub, gitMinimal }:

     

       1
       1
       +
       { rebar3Relx, fetchFromGitHub, gitMinimal }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         json = builtins.fromJSON (builtins.readFile ./sourcer.json);

     

       5
       5
       -
       in erlang.rebar3Relx rec {

     

       6
       6
       -
         name = "erlang-ls";

     

       7
       7
       -
         version = "unstable-2019-07-26";

     

       5
       5
       +
       in rebar3Relx rec {

     

       6
       6
       +
         name = "erlang-sourcer";

     

       7
       7
       +
         version = json.rev;

     

       8
       8
        
         releaseType = "escript";

     

       9
       9
        
       

     

       10
       10
        
         nativeBuildInputs = [ gitMinimal ];

+1 -1

nix/.config/nixpkgs/overlays/mongodb.nix

···

       1
       1
        
       self: super:

     

       2
       2
        
       

     

       3
       3
       -
       with self;

     

       3
       3
       +
       with super;

     

       4
       4
        
       

     

       5
       5
        
       {

     

       6
       6
        
         mongodb-4_0 = stdenv.mkDerivation rec {

+4 -2

nix/.config/nixpkgs/overlays/tokei.nix

···

       1
       1
        
       self: super:

     

       2
       2
        
       

     

       3
       3
       +
       with super;

     

       4
       4
       +
       

     

       3
       5
        
       {

     

       4
       4
       -
         tokei = self.tokei.overrideDerivation (cfg: {

     

       5
       5
       -
           buildInputs = self.stdenv.lib.optionals self.stdenv.isDarwin [

     

       6
       6
       +
         tokei = tokei.overrideDerivation (cfg: {

     

       7
       7
       +
           buildInputs = stdenv.lib.optionals stdenv.isDarwin [

     

       6
       8
        
             self.libiconv

     

       7
       9
        
             self.darwin.apple_sdk.frameworks.Security

     

       8
       10
        
           ];

+1

result

···

       1
       1
       +
       /nix/store/b802k22mffrw1p4dvkv3nq2w8c0sqyff-darwin-system-20.03pre199995.895874d2145+darwin3.0000000

+4

vim/.config/nvim/after/ftplugin/dhall.vim

···

       1
       1
       +
       setlocal shiftwidth=2

     

       2
       2
       +
       setlocal commentstring=--\ %s

     

       3
       3
       +
       

     

       4
       4
       +
       let b:undo_ftplugin = 'setl sw&'

+14 -8

vim/.config/nvim/autoload/plugins.vim

···

       1
       1
        
       " vi: foldmethod=marker foldlevel=0

     

       2
       2
        
       let s:current_file = expand('<sfile>')

     

       3
       3
       +
       let s:data_dir = exists('$XDG_DATA_HOME') ? $XDG_DATA_HOME : $HOME . '/.local/share'

     

       4
       4
       +
       

     

       5
       5
       +
       let s:dir = s:data_dir . '/nvim/site/pack/packager'

     

       3
       6
        
       

     

       4
       7
        
       if !exists('*plugins#reload')

     

       5
       8
        
           func! plugins#reload() abort

     
···

       11
       14
        
       

     

       12
       15
        
       func! plugins#spec() abort

     

       13
       16
        
           packadd vim-packager

     

       14
       14
       -
           call packager#init({'dir': '~/.local/share/nvim/site/pack/packager'})

     

       17
       17
       +
       

     

       18
       18
       +
           if !exists('g:packager')

     

       19
       19
       +
               call packager#init({'dir': s:dir})

     

       20
       20
       +
           endif

     

       21
       21
       +
       

     

       15
       22
        
           " Package manager {{{

     

       16
       23
        
           call packager#add('kristijanhusak/vim-packager', {'type': 'opt'})

     

       17
       24
        
           " }}}

     
···

       21
       28
        
           " }}}

     

       22
       29
        
           " Project navigation {{{

     

       23
       30
        
           call packager#add('tpope/vim-projectionist') " Requires access to VimEnter

     

       31
       31
       +
           call packager#add('srstevenson/vim-picker')

     

       32
       32
       +
           call packager#add('justinmk/vim-dirvish') " Required for opening directories

     

       33
       33
       +
           call packager#add('tpope/vim-eunuch')

     

       24
       34
        
           " }}}

     

       25
       35
        
           " Git {{{

     

       26
       36
        
           call packager#add('tpope/vim-fugitive', { 'type': 'opt' })

     
···

       38
       48
        
           call packager#add('tpope/vim-cucumber') " ftplugin

     

       39
       49
        
           call packager#add('tpope/vim-scriptease', {'type': 'opt'}) " ftplugin

     

       40
       50
        
           call packager#add('LnL7/vim-nix')

     

       41
       41
       -
           " }}}

     

       42
       42
       -
           " File manager {{{

     

       43
       43
       -
           call packager#add('justinmk/vim-dirvish') " Required for opening directories

     

       44
       44
       -
           call packager#add('tpope/vim-eunuch')

     

       45
       45
       -
           call packager#add('srstevenson/vim-picker')

     

       46
       51
        
           " }}}

     

       47
       52
        
           " Completion {{{

     

       48
       53
        
           call packager#add('prabirshrestha/async.vim') " autoload-only

     

       49
       54
        
           call packager#add('prabirshrestha/vim-lsp')

     

       50
       55
        
           call packager#add('Shougo/echodoc.vim')

     

       51
       56
        
           call packager#add('fcpg/vim-complimentary') " autoload-only

     

       52
       52
       -
           call packager#add('vim-erlang/vim-erlang-omnicomplete')

     

       53
       57
        
           " }}}

     

       54
       58
        
           " Code manipulation {{{

     

       55
       59
        
           call packager#add('AndrewRadev/splitjoin.vim')

     
···

       76
       80
        
           call packager#add('t9md/vim-choosewin')

     

       77
       81
        
           " }}}

     

       78
       82
        
           " Utils {{{

     

       83
       83
       +
           call packager#add('andymass/vim-matchup')

     

       79
       84
        
           call packager#add('tpope/vim-repeat') " autoload-only plugin

     

       80
       85
        
           call packager#add('tpope/vim-unimpaired', {'type': 'opt'})

     

       81
       86
        
           call packager#add('tpope/vim-rsi')

     

       82
       82
       -
           call packager#add('direnv/direnv.vim', {'type': 'opt'})

     

       87
       87
       +
           call packager#add('direnv/direnv.vim')

     

       83
       88
        
           call packager#add('sgur/vim-editorconfig') " Required during startup

     

       84
       89
        
           call packager#add('tpope/vim-characterize')

     

       85
       90
        
           call packager#add('https://gitlab.com/hauleth/qfx.vim.git')

     

       91
       91
       +
           call packager#add('hauleth/vim-backscratch')

     

       86
       92
        
           call packager#add('tpope/vim-dadbod')

     

       87
       93
        
           call packager#add('https://gitlab.com/hauleth/smart.vim.git')

     

       88
       94
        
           " }}}

+1 -1

vim/.config/nvim/compiler/mix.vim

···

       8
       8
        
       endif

     

       9
       9
        
       

     

       10
       10
        
       CompilerSet errorformat=%A%t%*[^:]:\ %m,%C%f:%l:\ %m,%C%f:%l,%Z

     

       11
       11
       -
       CompilerSet makeprg=mix

     

       11
       11
       +
       CompilerSet makeprg=mix\ compile

+3 -4

vim/.config/nvim/ftdetect/custom.vim

···

       1
       1
       -
       au BufRead,BufNewFile *.ket setlocal ft=ketos.scheme syn=scheme

     

       2
       2
       -
       au BufRead,BufNewFile *.config setlocal ft=erlang syn=erlang

     

       3
       3
       -
       au BufRead,BufNewFile *.config.script setlocal ft=erlang syn=erlang

     

       4
       4
       -
       au BufRead,BufNewFile *.app.src setlocal ft=erlang syn=erlang

     

       1
       1
       +
       au BufRead,BufNewFile *.config,*.config.script,*.app.src setf erlang

     

       2
       2
       +
       au BufRead,BufNewFile *.dhall setf dhall

     

       3
       3
       +
       au BufRead,BufNewFile PULLREQ_EDITMSG setf gitcommit

+16 -5

vim/.config/nvim/init.vim

···

       5
       5
        
       

     

       6
       6
        
       " Plugins {{{

     

       7
       7
        
       let g:loaded_netrwPlugin = 1

     

       8
       8
       +
       let g:loaded_matchit = 1

     

       8
       9
        
       

     

       9
       10
        
       command! -bar PackInstall call plugins#reload() | call packager#install()

     

       10
       11
        
       command! -bar PackUpdate  call plugins#reload() | call packager#update()

     
···

       56
       57
        
       " Hypen is part of the keyword, if you want to substract then add spaces {{{

     

       57
       58
        
       set iskeyword+=-

     

       58
       59
        
       " }}}

     

       59
       59
       -
       " Show 80 column {{{

     

       60
       60
       -
       set colorcolumn=+1

     

       61
       61
       -
       " }}}

     

       62
       60
        
       " Split in CORRECT places {{{

     

       63
       61
        
       set splitright splitbelow

     

       64
       62
        
       " }}}

     
···

       78
       76
        
       set undofile

     

       79
       77
        
       " }}}

     

       80
       78
        
       " Custom configurations {{{

     

       79
       79
       +
       " Matchparen {{{

     

       80
       80
       +
       let g:matchup_matchparen_offscreen = {'method': 'popup'}

     

       81
       81
       +
       

     

       82
       82
       +
       augroup matchparen

     

       83
       83
       +
           autocmd!

     

       84
       84
       +
           autocmd BufEnter term://* NoMatchParen

     

       85
       85
       +
           autocmd BufLeave term://* DoMatchParen

     

       86
       86
       +
       augroup END

     

       87
       87
       +
       " }}}

     

       81
       88
        
       " Fuzzy file search {{{

     

       82
       89
        
       nnoremap <Space><Space> :<C-u>PickerEdit<CR>

     

       83
       90
        
       

     

       84
       91
        
       let g:picker_custom_find_executable = 'rg'

     

       85
       92
        
       let g:picker_custom_find_flags = '--color never --files --hidden --glob !.git'

     

       93
       93
       +
       let g:clap#provider#files# = {

     

       94
       94
       +
                   \ 'source': 'rg --color never --files --hidden --glob !.git',

     

       95
       95
       +
                   \ 'sink': 'e'

     

       96
       96
       +
                   \ }

     

       86
       97
        
       

     

       87
       98
        
       set path=,,

     

       88
       99
        
       " }}}

     
···

       215
       226
        
       

     

       216
       227
        
       augroup hotfix

     

       217
       228
        
           autocmd!

     

       218
       218
       -
           autocmd FocusGained * checktime

     

       219
       219
       -
           autocmd CursorHold * checktime

     

       229
       229
       +
           autocmd BufLeave * call utils#cleanup()

     

       220
       230
        
           autocmd ColorScheme * highlight LspErrorHighlight gui=underline cterm=underline

     

       221
       231
        
                       \ | highlight LspWarningHighlight gui=underline cterm=underline

     

       222
       232
        
       augroup END

     

       233
       233
       +
       

     

       223
       234
        
       " Needed for Projectionist and dadbod

     

       224
       235
        
       command! -nargs=* Start <mods> split new <bar> call termopen(<q-args>) <bar> startinsert

     

       225
       236
        
       command! -nargs=0 Ctags AsyncDo ctags -R

-4

vim/.config/nvim/plugin/pack-delayed.vim

···

       4
       4
        
       let g:loaded_pack_delayed = 1

     

       5
       5
        
       

     

       6
       6
        
       func! DelayedLoad(...) abort " No abort as we want to continue if any plugin fails

     

       7
       7
       -
           echom 'Loading plugins'

     

       8
       8
       -
       

     

       9
       7
        
           " Git

     

       10
       8
        
           packadd vim-fugitive

     

       11
       9
        
                       \ | call fugitive#detect(getcwd())

     
···

       14
       12
        
           packadd targets.vim

     

       15
       13
        
       

     

       16
       14
        
           autocmd! delayed_pack_load

     

       17
       17
       -
       

     

       18
       18
       -
           echom 'Loaded plugins'

     

       19
       15
        
       endfunc

     

       20
       16
        
       

     

       21
       17
        
       augroup delayed_pack_load

+4

vim/.config/nvim/plugin/projections.vim

···

       20
       20
        
                   \   'alternate': 'test/{}_test.exs',

     

       21
       21
        
                   \   'template': ['defmodule {camelcase|capitalize|dot} do', 'end'],

     

       22
       22
        
                   \ },

     

       23
       23
       +
                   \ 'src/*.erl': {

     

       24
       24
       +
                   \   'type': 'src',

     

       25
       25
       +
                   \   'alternate': 'test/{}_SUITE.erl',

     

       26
       26
       +
                   \ },

     

       23
       27
        
                   \ 'test/*_test.exs': {

     

       24
       28
        
                   \   'type': 'test',

     

       25
       29
        
                   \   'alternate': 'lib/{}.ex',

-10

vim/.config/nvim/plugin/scratch.vim

···

       1
       1
       -
       if exists('g:loaded_scratch')

     

       2
       2
       -
           finish

     

       3
       3
       -
       endif

     

       4
       4
       -
       let g:loaded_scratch = 1

     

       5
       5
       -
       

     

       6
       6
       -
       command! Scratchify setlocal nobuflisted noswapfile buftype=nofile bufhidden=delete

     

       7
       7
       -
       command! Scratch  enew   |Scratchify

     

       8
       8
       -
       command! SScratch new    +Scratchify

     

       9
       9
       -
       command! VScratch vnew   +Scratchify

     

       10
       10
       -
       command! TScratch tabnew +Scratchify

+62

vim/.config/nvim/syntax/dhall.vim

···

       1
       1
       +
       scriptencoding utf-8

     

       2
       2
       +
       

     

       3
       3
       +
       if exists('b:current_syntax')

     

       4
       4
       +
           finish

     

       5
       5
       +
       endif

     

       6
       6
       +
       

     

       7
       7
       +
       syntax match dhallInterpolation "\v\$\{[^\}]*\}"

     

       8
       8
       +
       syntax keyword dhallTodo TODO FIXME

     

       9
       9
       +
       syntax match dhallBrackets "[<>|]"

     

       10
       10
       +
       syntax match dhallOperator "+\|*\|#"

     

       11
       11
       +
       syntax match dhallOperator "//\|⫽"

     

       12
       12
       +
       syntax match dhallOperator "/\\\|∧"

     

       13
       13
       +
       syntax match dhallOperator "//\\\\\|⩓"

     

       14
       14
       +
       syntax match dhallNumber "\v[0-9]"

     

       15
       15
       +
       syntax match dhallNumber "\v\+[0-9]"

     

       16
       16
       +
       syntax match dhallIndex "\v\@[0-9]+" contains=dhallNumber

     

       17
       17
       +
       syntax match dhallLambda "∀\|λ\|→\|->\|\\"

     

       18
       18
       +
       syntax match dhallType "\v[A-Z][a-z0-9A-Z_]*"

     

       19
       19
       +
       syntax match dhallSpecialLabel "\v`[A-Z][a-z]*`"

     

       20
       20
       +
       syntax match dhallLabel "\v[A-Z][a-z]*/[a-z_][A-Za-z0-9\.\-]*"

     

       21
       21
       +
       syntax match dhallLabel "\v[a-z_][A-Za-z0-9\-]*"

     

       22
       22
       +
       syntax match dhallType "\v[a-zA-Z]+\.[A-Z][a-z0-9A-Z_]*"

     

       23
       23
       +
       syntax match dhallParens "(\|)\|\[\|\]\|,"

     

       24
       24
       +
       syntax match dhallRecord "{\|}\|:"

     

       25
       25
       +
       syntax keyword dhallKeyword let in forall constructors if then else merge env as

     

       26
       26
       +
       syntax match dhallEsc +\\["\\abfnrtv$/]+

     

       27
       27
       +
       syntax match dhallSingleSpecial +'''+

     

       28
       28
       +
       syntax match dhallSingleSpecial +''${+

     

       29
       29
       +
       syntax match dhallComment '\v--.*$' contains=@Spell,dhallTodo

     

       30
       30
       +
       syntax region dhallMultilineComment start="{-" end="-}" contains=@Spell,dhallTodo,dhallMultilineComment

     

       31
       31
       +
       syntax match dhallUrl "https://[a-zA-Z0-9/.\-_\?\=\&]*"

     

       32
       32
       +
       syntax match dhallUrl "http://[a-zA-Z0-9/.\-_\?\=\&]*"

     

       33
       33
       +
       syntax match dhallUrl "/[a-zA-Z0-9/.\-_]*"

     

       34
       34
       +
       syntax match dhallUrl "\.\./[a-zA-Z0-9/.\-_]*"

     

       35
       35
       +
       syntax match dhallUrl "\./[a-zA-Z0-9/.\-_]*"

     

       36
       36
       +
       syntax region dhallString start=+''+ end=+''+ contains=@Spell,dhallInterpolation,dhallSingleSpecial

     

       37
       37
       +
       syntax region dhallString start=+"+ end=+"+ contains=dhallInterpolation,dhallEsc

     

       38
       38
       +
       syntax region dhallString start=+"/+ end=+"+ contains=dhallInterpolation,dhallEsc

     

       39
       39
       +
       syntax keyword dhallBool True False

     

       40
       40
       +
       

     

       41
       41
       +
       highlight link dhallSingleSpecial Special

     

       42
       42
       +
       highlight link dhallIndex Special

     

       43
       43
       +
       highlight link dhallSpecialLabel Operator

     

       44
       44
       +
       highlight link dhallEsc Special

     

       45
       45
       +
       highlight link dhallInterpolation Special

     

       46
       46
       +
       highlight link dhallTodo Todo

     

       47
       47
       +
       highlight link dhallBrackets Operator

     

       48
       48
       +
       highlight link dhallBool Underlined

     

       49
       49
       +
       highlight link dhallUrl String

     

       50
       50
       +
       highlight link dhallOperator Operator

     

       51
       51
       +
       highlight link dhallNumber Number

     

       52
       52
       +
       highlight link dhallLambda Special

     

       53
       53
       +
       highlight link dhallString String

     

       54
       54
       +
       highlight link dhallLabel Identifier

     

       55
       55
       +
       highlight link dhallRecord Special

     

       56
       56
       +
       highlight link dhallKeyword Keyword

     

       57
       57
       +
       highlight link dhallType Structure

     

       58
       58
       +
       highlight link dhallParens Special

     

       59
       59
       +
       highlight link dhallComment Comment

     

       60
       60
       +
       highlight link dhallMultilineComment Comment

     

       61
       61
       +
       

     

       62
       62
       +
       let b:current_syntax = 'dhall'