diff --git a/programs/git.nix b/programs/git.nix index 17ad880..f5b9e97 100644 --- a/programs/git.nix +++ b/programs/git.nix @@ -19,11 +19,11 @@ core.autocrlf = "input"; push.autoSetupRemote = true; gpg.format = "ssh"; - merge.conflictStyle = "zdiff3"; - rebase.autoStash = true; - status.submoduleSummary = true; - diff.submodule = "log"; - submodule.recurse = true; + merge.conflictStyle = "zdiff3"; + rebase.autoStash = true; + status.submoduleSummary = true; + diff.submodule = "log"; + submodule.recurse = true; }; }; diff --git a/systems/fuji-wsl/default.nix b/systems/fuji-wsl/default.nix index ecf7f64..8e5d7c2 100644 --- a/systems/fuji-wsl/default.nix +++ b/systems/fuji-wsl/default.nix @@ -1,4 +1,8 @@ {config, ...}: { + imports = [ + ../../programs/rust.nix + ]; + wsl = { enable = true; defaultUser = "leo";