From 90eea5141ed22df0fb0e63c2a263fbcf61cc0ed1 Mon Sep 17 00:00:00 2001
From: sgoudham <sgoudham@gmail.com>
Date: Wed, 13 Mar 2024 04:01:52 +0000
Subject: [PATCH] refactor: we mocha now & more aliases

---
 home/apps/starship/config.toml |  2 +-
 home/apps/vscode/settings.json | 12 ++++++++----
 home/apps/wezterm/wezterm.lua  |  2 +-
 home/default.nix               |  4 +++-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/home/apps/starship/config.toml b/home/apps/starship/config.toml
index 5ccc316..aa1d7ce 100644
--- a/home/apps/starship/config.toml
+++ b/home/apps/starship/config.toml
@@ -1,7 +1,7 @@
 # Get editor completions based on the config schema
 "$schema" = 'https://starship.rs/config-schema.json'
 
-palette = "catppuccin_latte"
+palette = "catppuccin_mocha"
 format = """
 ┌ \
 $username\
diff --git a/home/apps/vscode/settings.json b/home/apps/vscode/settings.json
index 1fbd461..04acd83 100644
--- a/home/apps/vscode/settings.json
+++ b/home/apps/vscode/settings.json
@@ -295,7 +295,7 @@
     "editor.defaultFormatter": "ms-python.black-formatter"
   },
   "[typescript]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
+    "editor.defaultFormatter": "vscode.typescript-language-features"
   },
   "[markdown]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
@@ -346,9 +346,13 @@
   "files.autoSaveDelay": 100,
   "terminal.integrated.smoothScrolling": true,
   "explorer.confirmDelete": false,
-  "workbench.iconTheme": "catppuccin-latte",
-  "workbench.colorTheme": "Catppuccin Latte",
+  "workbench.iconTheme": "catppuccin-mocha",
+  "workbench.colorTheme": "Catppuccin Mocha",
   "[mdx]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
-  }
+  },
+  "[astro]": {
+    "editor.defaultFormatter": "astro-build.astro-vscode"
+  },
+  "diffEditor.renderSideBySide": false
 }
diff --git a/home/apps/wezterm/wezterm.lua b/home/apps/wezterm/wezterm.lua
index c138e4c..2f211ab 100644
--- a/home/apps/wezterm/wezterm.lua
+++ b/home/apps/wezterm/wezterm.lua
@@ -100,6 +100,6 @@ custom.tab_bar.new_tab.bg_color = "#080808"
 c.color_schemes = {
   ["OLEDppuccin"] = custom,
 }
-c.color_scheme = "Catppuccin Latte"
+c.color_scheme = "Catppuccin Mocha"
 
 return c
diff --git a/home/default.nix b/home/default.nix
index beadb9b..c560897 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -43,7 +43,7 @@
   home.sessionVariables = {
     TERMINAL = "wezterm-gui";
     LIBVA_DRIVER_NAME = "iHD";
-    LS_COLORS = "$(vivid generate catppuccin-latte)";
+    LS_COLORS = "$(vivid generate catppuccin-mocha)";
     JAVA_HOME = "${config.home.homeDirectory}/.sdkman/candidates/java/current";
     GRAALVM_HOME = "${config.home.homeDirectory}/.sdkman/candidates/java/22.3.r17-grl";
   };
@@ -53,6 +53,8 @@
   ];
   home.shellAliases = {
     magit = "nvim '+Neogit kind=replace'";
+    cat = "bat";
+    mv = "mv -iv";
   };
 
   xdg.configFile."ideavim/ideavimrc".source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/home/apps/ideavim/ideavimrc";