summaryrefslogtreecommitdiffstats
path: root/src/main.rs
diff options
context:
space:
mode:
authorJiayi Zhao <jeff.no.zhao@gmail.com>2019-01-05 22:54:32 -0500
committerJiayi Zhao <jeff.no.zhao@gmail.com>2019-01-05 22:54:32 -0500
commit9bababf24d2dad7a8d5478cda8f181864d0c3f30 (patch)
tree139f68f2bbaa9ae4d546d33cf55d85b3a53b48d7 /src/main.rs
parent9216b5fe47e2dddc679c8c8845c4eee874634da4 (diff)
revert back to using keymap.toml
- figured out a way to make things work
Diffstat (limited to 'src/main.rs')
-rw-r--r--src/main.rs6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main.rs b/src/main.rs
index ba887e9..ef347c0 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -15,7 +15,8 @@ mod joshuto;
const PROGRAM_NAME: &str = "joshuto";
const CONFIG_FILE: &str = "joshuto.toml";
const MIMETYPE_FILE: &str = "mimetype.toml";
-const KEYMAP_FILE: &str = "keymap.conf";
+const KEYMAP_FILE: &str = "keymap.toml";
+const THEME_FILE: &str = "theme.toml";
fn main()
{
@@ -33,5 +34,8 @@ fn main()
// println!("{:#?}", keymap);
// println!("{:#?}", keymap.keymaps);
+ let theme = joshuto::theme::JoshutoTheme::get_config();
+// println!("{:#?}", theme);
+
joshuto::run(config, keymap, mimetype);
}