Merge pull request #310 from hadronized/fix-packaging

Fix packaging

Author: hadronized

docs/man/configuration.md

@@ -5,7 +5,7 @@ options via the user configuration.
 
 The `$XDG_CONFIG_HOME/kak-tree-sitter/config.toml` contains the user configuration of both `kak-tree-sitter` and
 `ktsctl`, which is shared. If you want to tweak something, you can have a look at the
-[default configuration file](https://github.com/hadronized/kak-tree-sitter/blob/master/default-config.toml) to know
+[default configuration file](https://github.com/hadronized/kak-tree-sitter/blob/master/kak-tree-sitter-config/default-config.toml) to know
 which path and values to pick from.
 
 > The user and default configurations get merged, so you do not have to copy the default configuration to tweak it.

docs/man/ktsctl.md

@@ -77,7 +77,6 @@ It calls `--sync` with `--all`. Basically, it will:
 - If you do, the resource is checked against the pinned version of the configuration. If it’s too old, a new version
   is fetched, compiled, etc.
 
->>>>>>> 4694637 (Update user manual for the new version of ktsctl.)
 ### Getting information
 
 The `query` command allows to get information about tree-sitter resources. As with `manage`, you can use `--help` to
@@ -96,8 +95,9 @@ reuse datasets from other projects, such as the GitHub repositories of the gramm
 Whatever you decide to use, you need to update your [user configuration](configuration.md) file according to the
 languages, grammars and queries. **However**, as explained in the linked section, 99% of people will just be satisfied
 with the default settings shipped with `kak-tree-sitter`’s `default-config.toml`, which you can find at the root of the
-repository, [here](https://github.com/hadronized/kak-tree-sitter/blob/master/default-config.toml). That configuration
-file is shipped with the binary (`kak-tree-sitter`), so you do not need to copy it; just add what you need!
+repository, [here](https://github.com/hadronized/kak-tree-sitter/blob/master/kak-tree-sitter-config/default-config.toml).
+That configuration file is shipped with the binary (`kak-tree-sitter`), so you do not need to copy it; just add what you
+need!
 
 # A note for release channels
 

kak-tree-sitter-config/LICENSE

@@ -0,0 +1 @@
+../LICENSE

kak-tree-sitter-config/LICENSE

@@ -39,7 +39,7 @@ impl Config {
   }
 
   /// Default configuration using the `default-config.toml` file.
-  const DEFAULT_CONFIG_CONTENT: &'static str = include_str!("../../default-config.toml");
+  const DEFAULT_CONFIG_CONTENT: &'static str = include_str!("../default-config.toml");
 
   pub fn load_default_config() -> Result<Self, ConfigError> {
     log::debug!("loading default configuration");

default-config.toml kak-tree-sitter-config/default-config.toml

@@ -0,0 +1 @@
+../LICENSE

kak-tree-sitter-config/src/lib.rs

@@ -0,0 +1 @@
+../LICENSE