default bindings and theme

bindings are now part of the config spec (alot.rc.spec),
the default theme is a valid (as of theme.sec)
.theme-file, provided in alot/defaults

5 files changed, 75 insertions, 78 deletions

diff --git a/alot/defaults/alot.rc.new b/alot/defaults/alot.rc.new
index 54834335..fa87f810 100644
--- a/alot/defaults/alot.rc.new
+++ b/alot/defaults/alot.rc.new
@@ -90,7 +90,7 @@ initial_command = search tag:inbox AND NOT tag:killed
 
 # default sort order of results in a search
 # must be one of one of 'oldest_first', 'newest_first', 'message_id' or 'unsorted'
-search_threads_sort_order = newest_first
+search_threads_sort_order = oldest_first
 
 # in case more than one account has an address book:
 # Set this to True to make tabcompletion for recipients during compose only
@@ -105,72 +105,3 @@ quit_on_last_bclose = False
 # The string '%(version)s' will be replaced by the version string of the running instance.
 # Beware ne necessary 3-fold escaping for the symbol '%' though.
 user_agent = 'alot/%%%%%%%%(version)s'
-
-[bindings]
-    [[global]]
-        j = move down
-        k = move up
-        ' ' = move page down
-        esc = cancel
-        enter = select
-
-        @ = refresh
-        ? = help bindings
-        I = search tag:inbox AND NOT tag:killed
-        L = taglist
-        shift tab = bprevious
-        U = search tag:unread
-        tab = bnext
-        \ = prompt 'search '
-        d = bclose
-        $ = flush
-        m = compose
-        o = prompt 'search '
-        q = exit
-        ';' = bufferlist
-        ':' = prompt
-
-    [[bufferlist]]
-        x = close
-        select = openfocussed
-
-    [[search]]
-        a = toggletags inbox
-        & = toggletags killed
-        ! = toggletags flagged
-        s = toggletags unread
-        l = retagprompt
-        O = refineprompt
-        | = refineprompt
-
-    [[envelope]]
-        a = prompt 'attach ~/'
-        y = send
-        P = save
-        s = 'refine Subject'
-        t = 'refine To'
-        b = 'refine Bcc'
-        c = 'refine Cc'
-        select = edit
-        H = toggleheaders
-
-    [[taglist]]
-
-    [[thread]]
-        C = fold --all
-        E = unfold --all
-        c = fold
-        e = unfold
-        < = fold
-        > = unfold
-        H = toggleheaders
-        h = togglesource
-        P = print --all --separately --add_tags
-        S = save --all
-        g = reply --all
-        f = forward
-        p = print --add_tags
-        n = editnew
-        s = save
-        r = reply
-        | = prompt 'pipeto '
diff --git a/alot/defaults/alot.rc.spec b/alot/defaults/alot.rc.spec
index 820d2eb7..6ce5038e 100644
--- a/alot/defaults/alot.rc.spec
+++ b/alot/defaults/alot.rc.spec
@@ -101,7 +101,75 @@ user_agent = string(default='alot/$VERSION')
 
 # Keybindings 
 [bindings]
-    # one for each mode
-    [[__many__]]
-        # key = commandline string
+    [[global]]
+        j = string(default='move down')
+        k = string(default='move up')
+        ' ' = string(default='move page down')
+        esc = string(default='cancel')
+        enter = string(default='select')
+        @ = string(default='refresh')
+        ? = string(default='help bindings')
+        I = string(default='search tag:inbox AND NOT tag:killed')
+        L = string(default='taglist')
+        shift tab = string(default='bprevious')
+        U = string(default='search tag:unread')
+        tab = string(default='bnext')
+        \ = string(default='prompt "search "')
+        d = string(default='bclose')
+        $ = string(default='flush')
+        m = string(default='compose')
+        o = string(default='prompt "search "')
+        q = string(default='exit')
+        ';' = string(default='bufferlist')
+        ':' = string(default='prompt')
+        __many__ = string(default=None)
+
+    [[bufferlist]]
+        x = string(default='close')
+        select = string(default='openfocussed')
+        __many__ = string(default=None)
+
+    [[search]]
+        a = string(default='toggletags inbox')
+        & = string(default='toggletags killed')
+        ! = string(default='toggletags flagged')
+        s = string(default='toggletags unread')
+        l = string(default='retagprompt')
+        O = string(default='refineprompt')
+        | = string(default='refineprompt')
+        __many__ = string(default=None)
+
+    [[envelope]]
+        a = string(default='prompt "attach ~/"')
+        y = string(default='send')
+        P = string(default='save')
+        s = string(default=''refine Subject'')
+        t = string(default=''refine To'')
+        b = string(default=''refine Bcc'')
+        c = string(default=''refine Cc'')
+        select = string(default='edit')
+        H = string(default='toggleheaders')
+        __many__ = string(default=None)
+
+    [[taglist]]
+        __many__ = string(default=None)
+
+    [[thread]]
+        C = string(default='fold --all')
+        E = string(default='unfold --all')
+        c = string(default='fold')
+        e = string(default='unfold')
+        < = string(default='fold')
+        > = string(default='unfold')
+        H = string(default='toggleheaders')
+        h = string(default='togglesource')
+        P = string(default='print --all --separately --add_tags')
+        S = string(default='save --all')
+        g = string(default='reply --all')
+        f = string(default='forward')
+        p = string(default='print --add_tags')
+        n = string(default='editnew')
+        s = string(default='save')
+        r = string(default='reply')
+        | = string(default='prompt "pipeto "')
         __many__ = string(default=None)
diff --git a/alot/defaults/theme.rc b/alot/defaults/default.theme
index f988ebec..f988ebec 100644
--- a/alot/defaults/theme.rc
+++ b/alot/defaults/default.theme
diff --git a/alot/defaults/theme.rc.spec b/alot/defaults/theme.spec
index ef07aeb3..ef07aeb3 100644
--- a/alot/defaults/theme.rc.spec
+++ b/alot/defaults/theme.spec
diff --git a/setup.py b/setup.py
index 2973ccb7..d6e6b4e0 100755
--- a/setup.py
+++ b/setup.py
@@ -13,13 +13,11 @@ setup(name='alot',
       license=alot.__copyright__,
       packages=['alot', 'alot.commands'],
       package_data={'alot': [
-                             'defaults/alot.rc',
-                             'defaults/alot.rc.new',
+                             'defaults/alot.rc', # only old-style default values
                              'defaults/alot.rc.spec',
-                             'defaults/notmuch.rc',
                              'defaults/notmuch.rc.spec',
-                             'defaults/theme.rc',
-                             'defaults/theme.rc.spec',
+                             'defaults/default.theme', # default theme
+                             'defaults/theme.spec',
                             ]},
       scripts=['bin/alot'],
       requires=[