diff --git a/modules/gameservers/minecraft_modded/default.nix b/modules/gameservers/minecraft_modded/default.nix index 4d31e24..e2f8c60 100644 --- a/modules/gameservers/minecraft_modded/default.nix +++ b/modules/gameservers/minecraft_modded/default.nix @@ -76,8 +76,8 @@ in { Group = "minecraft"; WorkingDirectory = srv.data_dir; UMask = "0007"; - #ExecStart = "${pkgs.bash}/bin/bash ${srv.start_file}"; - ExecStart = "${pkgs.bash}/bin/bash ${srv.data_dir}/${srv.start_file}"; + ExecStart = "${pkgs.bash}/bin/bash ${srv.start_file}"; + #ExecStart = "${srv.data_dir}/${srv.start_file}"; Restart = "on-failure"; KillMode = "process"; }; diff --git a/modules/holocron/syncthing/default.nix b/modules/holocron/syncthing/default.nix index 43a4ad0..3ef39a0 100644 --- a/modules/holocron/syncthing/default.nix +++ b/modules/holocron/syncthing/default.nix @@ -22,7 +22,7 @@ in { dataDir = "/var/lib/syncthing"; guiAddress = "0.0.0.0:2222"; openDefaultPorts = true; - extraFlags = ["--no-default-folder"]; + #extraFlags = ["--no-default-folder"]; key = sec."${service}/snowbelle/key".path; cert = sec."${service}/snowbelle/cert".path; settings = { diff --git a/users/blake/dots/core/git/default.nix b/users/blake/dots/core/git/default.nix index 916160d..db857d2 100644 --- a/users/blake/dots/core/git/default.nix +++ b/users/blake/dots/core/git/default.nix @@ -17,9 +17,11 @@ in { # configure git programs.${program} = { enable = true; - userName = "blake"; - userEmail = "me@blakedheld.xyz"; - extraConfig = { + settings = { + user = { + name = "blake"; + email = "me@blakedheld.xyz"; + }; init.defaultBranch = "trunk"; core.editor = "nvim"; pull.rebase = true; diff --git a/users/blake/dots/core/zsh/default.nix b/users/blake/dots/core/zsh/default.nix index aff919c..6c9776e 100644 --- a/users/blake/dots/core/zsh/default.nix +++ b/users/blake/dots/core/zsh/default.nix @@ -22,8 +22,8 @@ in { programs.${program} = { enable = true; - #dotDir = "${config.xdg.configHome}/zsh"; - dotDir = ".config/zsh"; + dotDir = "${config.xdg.configHome}/zsh"; + #dotDir = ".config/zsh"; autocd = true; enableCompletion = true;