Moved to ordered dicts to allow DE & WMs to have priority and added cinnamon support

1 files changed, 36 insertions, 34 deletions

diff --git a/archey3 b/archey3
index a3681d3..38bced6 100755
--- a/archey3
+++ b/archey3
@@ -79,40 +79,42 @@ def module_register(name):
         return cls
     return decorator
 
-DE_DICT = {'gnome-session': 'GNOME',
-    'ksmserver': 'KDE',
-    'xfce4-session': 'Xfce',
-    'lxsession': 'LXDE',
-    '': 'None',
-}
-
-WM_DICT = {
-    'awesome': 'Awesome',
-    'beryl': 'Beryl',
-    'blackbox': 'Blackbox',
-    'dwm': 'DWM',
-    'enlightenment': 'Enlightenment',
-    'fluxbox': 'Fluxbox',
-    'fvwm': 'FVWM',
-    'i3': 'i3',
-    'icewm': 'IceWM',
-    'kwin': 'KWin',
-    'metacity': 'Metacity',
-    'musca': 'Musca',
-    'openbox': 'Openbox',
-    'pekwm': 'PekWM',
-    'ratpoison': 'ratpoison',
-    'scrotwm': 'ScrotWM',
-    'subtle': 'subtle',
-    'wmaker': 'Window Maker',
-    'wmfs': 'Wmfs',
-    'wmii': 'wmii',
-    'xfwm4': 'Xfwm',
-    'emerald': 'Emerald',
-    'compiz': 'Compiz',
-    re.compile('xmonad-*'): 'xmonad',
-    '': 'None',
-}
+DE_DICT = collections.OrderedDict([
+        ('cinnamon', 'Cinnamon'),
+        ('gnome-session', 'GNOME'),
+        ('ksmserver', 'KDE'),
+        ('xfce4-session', 'Xfce'),
+        ('lxsession', 'LXDE'),
+        ('', 'None'),
+        ])
+
+WM_DICT = collections.OrderedDict([
+        ('awesome', 'Awesome'),
+        ('beryl', 'Beryl'),
+        ('blackbox', 'Blackbox'),
+        ('dwm', 'DWM'),
+        ('enlightenment', 'Enlightenment'),
+        ('fluxbox', 'Fluxbox'),
+        ('fvwm', 'FVWM'),
+        ('i3', 'i3'),
+        ('icewm', 'IceWM'),
+        ('kwin', 'KWin'),
+        ('metacity', 'Metacity'),
+        ('musca', 'Musca'),
+        ('openbox', 'Openbox'),
+        ('pekwm', 'PekWM'),
+        ('ratpoison', 'ratpoison'),
+        ('scrotwm', 'ScrotWM'),
+        ('subtle', 'subtle'),
+        ('wmaker', 'Window Maker'),
+        ('wmfs', 'Wmfs'),
+        ('wmii', 'wmii'),
+        ('xfwm4', 'Xfwm'),
+        ('emerald', 'Emerald'),
+        ('compiz', 'Compiz'),
+        (re.compile('xmonad-*'), 'xmonad'),
+        ('', 'None'),
+        ])
 
 COLORS = {
     'black': '0',