From 424dadd45f945aef9722020d9b5588607a9d3e31 Mon Sep 17 00:00:00 2001
From: Kulvir Singh <kulvirs734@gmail.com>
Date: Sat, 11 Jan 2025 20:54:23 +0530
Subject: [PATCH] chores: configs cleanup

---
 hosts/mba/configuration.nix |  1 -
 hosts/mba/home.nix          |  1 +
 hosts/mba/mac-apps.nix      |  3 +--
 hosts/mba/nix.nix           |  9 ++++-----
 modules/fastfetch.nix       | 28 ++++++----------------------
 modules/starship.nix        | 26 ++++++--------------------
 6 files changed, 18 insertions(+), 50 deletions(-)

diff --git a/hosts/mba/configuration.nix b/hosts/mba/configuration.nix
index d5f8c39..f870112 100644
--- a/hosts/mba/configuration.nix
+++ b/hosts/mba/configuration.nix
@@ -33,7 +33,6 @@
       FXPreferredViewStyle = "Nlsv";
       NewWindowTarget = "Other";
       NewWindowTargetPath = "file:///Users/lilj/Downloads";
-      QuitMenuItem = true;
       ShowPathbar = true;
       ShowStatusBar = true;
       ShowRemovableMediaOnDesktop = false;
diff --git a/hosts/mba/home.nix b/hosts/mba/home.nix
index 13054f3..264b3eb 100644
--- a/hosts/mba/home.nix
+++ b/hosts/mba/home.nix
@@ -8,6 +8,7 @@
   imports = [
     # ../../modules/alacritty.nix
     ../../modules/git.nix
+    ../../modules/fastfetch.nix
     ../../modules/kitty.nix
     ../../modules/nvim.nix
     ../../modules/shell.nix
diff --git a/hosts/mba/mac-apps.nix b/hosts/mba/mac-apps.nix
index daae4c4..e593c5b 100644
--- a/hosts/mba/mac-apps.nix
+++ b/hosts/mba/mac-apps.nix
@@ -18,7 +18,7 @@
     pkgs.nerd-fonts.jetbrains-mono
     # Alternate Fonts
     # pkgs.nerd-fonts.caskaydia-mono
-    pkgs.nerd-fonts.iosevka
+    # pkgs.nerd-fonts.iosevka
   ];
 
   homebrew = {
@@ -30,7 +30,6 @@
 
     caskArgs = {
       appdir = "/Applications";
-      # require_sha = true;
     };
 
     # darwin support for packages sucks
diff --git a/hosts/mba/nix.nix b/hosts/mba/nix.nix
index 2b8025f..e7b1a32 100644
--- a/hosts/mba/nix.nix
+++ b/hosts/mba/nix.nix
@@ -19,12 +19,11 @@
   nix.gc = {
     user = "root";
     automatic = lib.mkDefault true;
-    options = lib.mkDefault "--delete-older-than 4d";
+    options = lib.mkDefault "--delete-older-than 5d";
   };
 
-  # Disable auto-optimise-store because of this issue:
   # https://github.com/NixOS/nix/issues/7273
-  # nix.settings = {
-  #     auto-optimise-store = false;
-  # };
+  nix.settings = {
+      auto-optimise-store = false;
+  };
 }
diff --git a/modules/fastfetch.nix b/modules/fastfetch.nix
index 0da56bf..426c1b6 100644
--- a/modules/fastfetch.nix
+++ b/modules/fastfetch.nix
@@ -38,11 +38,6 @@
           key = "WM   ";
           keyColor = "green";
         }
-        {
-          type = "wmtheme";
-          key = " ├ 󰉼 ";
-          keyColor = "green";
-        }
         {
           type = "icons";
           key = " ├ 󰀻 ";
@@ -55,12 +50,7 @@
         }
         {
           type = "terminal";
-          key = " ├  ";
-          keyColor = "green";
-        }
-        {
-          type = "terminalfont";
-          key = " └  ";
+          key = " └  ";
           keyColor = "green";
         }
         "break"
@@ -76,17 +66,6 @@
           key = " ├  ";
           keyColor = "yellow";
         }
-        {
-          type = "gpu";
-          format = "{1} {2} @ {12} GHz";
-          key = " ├ 󰢮 ";
-          keyColor = "yellow";
-        }
-        {
-          type = "uptime";
-          key = " └  ";
-          keyColor = "yellow";
-        }
         {
           type = "memory";
           key = " ├  ";
@@ -102,6 +81,11 @@
           key = " ├ 󰋊 ";
           keyColor = "yellow";
         }
+        {
+          type = "uptime";
+          key = " ├  ";
+          keyColor = "yellow";
+        }
         {
           type = "monitor";
           key = " └  ";
diff --git a/modules/starship.nix b/modules/starship.nix
index b581926..42ff83e 100644
--- a/modules/starship.nix
+++ b/modules/starship.nix
@@ -4,18 +4,19 @@
     settings = {
       add_newline = true;
       continuation_prompt = "▶▶ ";
-      format = ''$directory$all$character'';
+      format = "$directory$c$bun$golang$nodejs(bold blue)$git_branch$git_status[❯](bold yellow)[❯](bold purple)[❯](bold blue)\n$character";
+      # format = ''$directory$all$character'';
       palette = "catppuccin_mocha";
       scan_timeout = 120;
 
       bun = {
-        format = "[🍞 bun $version ](bold green)";
+        format = "[🍞 $version ](bold green)";
         version_format = "\${major}.\${minor}";
       };
 
       c = {
         detect_extensions = ["c" "cpp"];
-        format = "[$symbol $name-$version ]($style)";
+        format = "[$symbol $version ]($style)";
         symbol = "";
         version_format = "\${major}.\${minor}";
       };
@@ -38,22 +39,12 @@
       };
 
       git_branch = {
-        format = "[ $symbol$branch ]($style)";
+        format = "[$symbol$branch ]($style)";
         style = "bold purple";
         symbol = " ";
         always_show_remote = true;
       };
 
-      # git_status = {
-      #   format = "([$all_status$ahead_behind]($style))";
-      #   up_to_date = "✓";
-      #   ahead = "⇡\${count}";
-      #   diverged = "⇕⇡\${ahead_count}⇣\${behind_count}";
-      #   behind = "⇣\${count}";
-      #   stashed = "📦 ";
-      #   staged = "[++($count)](green)";
-      # };
-
       golang = {
         format = "[$symbol $version ](bold cyan)";
         version_format = "\${major}.\${minor}";
@@ -62,7 +53,7 @@
 
       hostname = {
         ssh_only = true;
-        format = "[$ssh_symbol$hostname]($style)";
+        format = "[$ssh_symbol$hostname ]($style)";
         style = "bold green";
         ssh_symbol = "󰇧 ";
         disabled = false;
@@ -74,11 +65,6 @@
         version_format = "\${major}.\${minor}";
       };
 
-      package = {
-        format = "[pkg $symbol$version]($style) ";
-        disabled = true;
-      };
-
       palettes.catppuccin_mocha = {
         rosewater = "#f5e0dc";
         flamingo = "#f2cdcd";