diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index 64eef9c..d9458ae 100644 --- a/.github/ISSUE_TEMPLATE/bug.yml +++ b/.github/ISSUE_TEMPLATE/bug.yml @@ -73,7 +73,7 @@ body: attributes: label: Relevant logs description: | - Please copy and paste (or attach) any relevant logs, error messages or any other output. This will be automatically formatted into code, so no need for backticks. Screenshots are accepted if they make life easier for you. The log files (located as specified by `/etc/ly/config.ini`) usually contain relevant information about the problem: + Please copy and paste (or attach) any relevant logs, error messages or any other output. This will be automatically formatted into code, so no need for backticks. Screenshots are accepted if they make life easier for you. The log files (located as specified by `/etc/ly/config.lua` or `/etc/ly/config.ini`) usually contain relevant information about the problem: - The session log is located at `~/.local/state/ly-session.log` by default. - The system log is located at `/var/log/ly.log` by default. render: shell diff --git a/install.zig b/install.zig index 29d2cdd..5489f3c 100644 --- a/install.zig +++ b/install.zig @@ -126,19 +126,16 @@ fn installLy(allocator: std.mem.Allocator, io: std.Io, patch_map: PatchMap, inst var config_dir = std.Io.Dir.cwd().openDir(io, ly_config_directory, .{}) catch unreachable; defer config_dir.close(io); - if (install_config) { - const patched_config = try patchFile(allocator, io, "res/config.lua", patch_map); - defer allocator.free(patched_config); + const patched_config = try patchFile(allocator, io, "res/config.lua", patch_map); + defer allocator.free(patched_config); - try installText(io, patched_config, config_dir, ly_config_directory, "config.ini", .{}); + if (install_config) { + try installText(io, patched_config, config_dir, ly_config_directory, "config.lua", .{}); try installFile(io, "res/startup.sh", config_dir, ly_config_directory, "startup.sh", .{ .permissions = .fromMode(0o755) }); } - const patched_example_config = try patchFile(allocator, io, "res/config.lua", patch_map); - defer allocator.free(patched_example_config); - - try installText(io, patched_example_config, config_dir, ly_config_directory, "config.lua.example", .{}); + try installText(io, patched_config, config_dir, ly_config_directory, "config.lua.example", .{}); const patched_setup = try patchFile(allocator, io, "res/setup.sh", patch_map); defer allocator.free(patched_setup); diff --git a/readme.md b/readme.md index 51368db..6073179 100644 --- a/readme.md +++ b/readme.md @@ -97,7 +97,7 @@ Every environment that works on other login managers also should work on Ly. - If Xorg sessions don't work then check if your distro compiles Ly with Xorg. -Logs are defined by `/etc/ly/config.ini`: +Logs are defined by `/etc/ly/config.lua` or `/etc/ly/config.ini`: - The session log is located at `~/.local/state/ly-session.log` by default. diff --git a/res/example.lua b/res/example.lua index 81f9bc9..ac5fb87 100644 --- a/res/example.lua +++ b/res/example.lua @@ -18,7 +18,7 @@ -- -- For arguments fg and bg: they are colors in the format -- 0xSSRRGGBB, where SS is for styling. See your --- config.ini for more details. +-- config.ini or config.lua for more details. -- -- For the byte argument, you may use string.byte to fill this argument. -- diff --git a/src/main.zig b/src/main.zig index 811ca25..d5f728a 100644 --- a/src/main.zig +++ b/src/main.zig @@ -195,7 +195,7 @@ pub fn main(init: std.process.Init) !void { if (res.args.help != 0) { try clap.help(stderr, clap.Help, ¶ms, .{}); - std.log.info("note: if you want to configure Ly, please check the config file, which is located at " ++ build_options.config_directory ++ "/ly/config.ini.", .{}); + std.log.info("note: if you want to configure Ly, please check the config file, which is located at " ++ build_options.config_directory ++ "/ly/config.lua or " ++ build_options.config_directory ++ "/ly/config.ini.", .{}); std.process.exit(0); } if (res.args.version != 0) {