aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoe Wilm <joe@jwilm.com>2017-01-06 11:16:57 -0800
committerJoe Wilm <joe@jwilm.com>2017-01-06 11:17:48 -0800
commit99ef2bef9e47f2d44536fd4b531c1b33e2828cac (patch)
tree1df2bddc9531245456342917555ca4beb9ada622 /src
parent2befe3681e7e813e704fbbf75a520e04bf049d36 (diff)
downloadalacritty-99ef2bef9e47f2d44536fd4b531c1b33e2828cac.tar.gz
alacritty-99ef2bef9e47f2d44536fd4b531c1b33e2828cac.zip
Add default macOS config
Should solve the `monospace` issue people are seeing for now.
Diffstat (limited to 'src')
-rw-r--r--src/config.rs3
-rw-r--r--src/main.rs2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/config.rs b/src/config.rs
index bd073371..36f0c363 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -200,7 +200,10 @@ pub struct Config {
config_path: Option<PathBuf>,
}
+#[cfg(not(target_os="macos"))]
static DEFAULT_ALACRITTY_CONFIG: &'static str = include_str!("../alacritty.yml");
+#[cfg(target_os="macos")]
+static DEFAULT_ALACRITTY_CONFIG: &'static str = include_str!("../alacritty_macos.yml");
fn default_config() -> Config {
serde_yaml::from_str(DEFAULT_ALACRITTY_CONFIG)
diff --git a/src/main.rs b/src/main.rs
index ce323ac1..d53daf0f 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -43,7 +43,7 @@ fn main() {
Err(err) => err_println!("Write defaults config failure: {}", err)
}
- Config::default()
+ Config::load().unwrap()
},
// If there's a problem with the config file, print an error