diff --git a/git/default.nix b/git/default.nix
index 7133264..ec62ad6 100644
--- a/git/default.nix
+++ b/git/default.nix
@@ -4,6 +4,9 @@
   programs.git = {
     enable = true;
     userName = "Evan Reichard";
+    aliases = {
+      lg = "log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all -n 15";
+    };
     includes = [
       {
         path = "~/.config/git/work";
@@ -14,6 +17,15 @@
         condition = "gitdir:~/Development/git/personal/";
       }
     ];
+    extraConfig = {
+      core = {
+        autocrlf = "input";
+        safecrlf = "true";
+      };
+      merge = {
+        conflictstyle = "zdiff3";
+      };
+    };
   };
 
   xdg.configFile = {
diff --git a/nvim/config/lua/lsp-config.lua b/nvim/config/lua/lsp-config.lua
index 15fdfc9..6de5f30 100644
--- a/nvim/config/lua/lsp-config.lua
+++ b/nvim/config/lua/lsp-config.lua
@@ -81,7 +81,12 @@ nvim_lsp.eslint.setup {
 }
 
 -- Svelte LSP Configuration
-nvim_lsp.svelte.setup {cmd = {nix_vars.sveltels, "--stdio"}}
+nvim_lsp.svelte.setup {
+    on_attach = on_attach_no_formatting,
+    flags = lsp_flags,
+    capabilities = capabilities,
+    cmd = {nix_vars.sveltels, "--stdio"}
+}
 
 -- Go LSP Configuration
 nvim_lsp.gopls.setup {