mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-10-16 06:46:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

move a bunch of files to src/os

Browse Source
This commit is contained in:
Mitchell Hashimoto
2023-07-10 16:48:22 -07:00
parent 9300404603
commit bf25bf0a6a
6 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/config.zig
View File

@@ -4,10 +4,8 @@ const builtin = @import("builtin");
const Allocator = std.mem.Allocator;
const ArenaAllocator = std.heap.ArenaAllocator;
const inputpkg = @import("input.zig");
const passwd = @import("passwd.zig");
const terminal = @import("terminal/main.zig");
const internal_os = @import("os/main.zig");
const xdg = @import("xdg.zig");
const cli_args = @import("cli_args.zig");
const log = std.log.scoped(.config);
@@ -625,7 +623,7 @@ pub const Config = struct {
/// Load the configuration from the default file locations. Currently,
/// this loads from $XDG_CONFIG_HOME/ghostty/config.
pub fn loadDefaultFiles(self: *Config, alloc: Allocator) !void {
const home_config_path = try xdg.config(alloc, .{ .subdir = "ghostty/config" });
const home_config_path = try internal_os.xdg.config(alloc, .{ .subdir = "ghostty/config" });
defer alloc.free(home_config_path);
const cwd = std.fs.cwd();
@@ -740,7 +738,7 @@ pub const Config = struct {
}
// We need the passwd entry for the remainder
const pw = try passwd.get(alloc);
const pw = try internal_os.passwd.get(alloc);
if (self.command == null) {
if (pw.shell) |sh| {
log.info("default shell src=passwd value={s}", .{sh});