From d59ff2906458e830d3f53b08e6fc23a799255448 Mon Sep 17 00:00:00 2001
From: foglar <sigma@goon.com>
Date: Thu, 10 Apr 2025 19:17:48 +0200
Subject: [PATCH] git fixes and style fixes

---
 kogami/home.nix                         |  1 +
 nixos/home/packages/packages.nix        |  1 +
 nixos/home/packages/programming/git.nix | 18 ++++++------------
 nixos/home/packages/tools/fastfetch.nix |  2 +-
 nixos/system/settings/style.nix         | 21 ++++++++++++++++++++-
 5 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/kogami/home.nix b/kogami/home.nix
index 1d9870a..3b586fb 100644
--- a/kogami/home.nix
+++ b/kogami/home.nix
@@ -59,6 +59,7 @@
     };
 
     git.enable = true;
+    gitkraken.enable = true;
     neovim.enable = false;
 
     firefox.enable = false;
diff --git a/nixos/home/packages/packages.nix b/nixos/home/packages/packages.nix
index 54962d1..1ab46c1 100644
--- a/nixos/home/packages/packages.nix
+++ b/nixos/home/packages/packages.nix
@@ -96,6 +96,7 @@
       themes.enable = lib.mkDefault false;
     };
     git.enable = lib.mkDefault true;
+    gitkraken.enable = lib.mkDefault false;
     neovim.enable = lib.mkDefault true;
   };
 
diff --git a/nixos/home/packages/programming/git.nix b/nixos/home/packages/programming/git.nix
index b92fd33..947beb8 100644
--- a/nixos/home/packages/programming/git.nix
+++ b/nixos/home/packages/programming/git.nix
@@ -17,18 +17,12 @@
       lfs.enable = true;
     };
 
-    home.packages = with pkgs;
-      [
-        git
-        github-cli
-        git-lfs
-        git-credential-manager
-      ]
-      ++ (
-        if pkgs.system == "x86_64-linux"
-        then [gitkraken]
-        else []
-      );
+    home.packages = with pkgs; [
+      git
+      github-cli
+      git-lfs
+      git-credential-manager
+    ];
 
     nixpkgs.config.allowUnfreePredicate = pkg:
       builtins.elem (lib.getName pkg) [
diff --git a/nixos/home/packages/tools/fastfetch.nix b/nixos/home/packages/tools/fastfetch.nix
index fa9a5d5..9228709 100644
--- a/nixos/home/packages/tools/fastfetch.nix
+++ b/nixos/home/packages/tools/fastfetch.nix
@@ -33,7 +33,7 @@
               then 18
               else 19;
             "padding" = {
-              "top" = 1;
+              "top" = if userSettings.theme == "evangelion-blood" then 1 else 0;
             };
           }
           else {
diff --git a/nixos/system/settings/style.nix b/nixos/system/settings/style.nix
index 4ff73b9..37cfa42 100644
--- a/nixos/system/settings/style.nix
+++ b/nixos/system/settings/style.nix
@@ -59,7 +59,7 @@
           base00 = "011d33";
           base01 = "1a4a6e";
           base02 = "1570a7";
-          base03 = "42a1d7";
+          base03 = "2281b7";
           base04 = "40a3dc";
           base05 = "509ede";
           base06 = "46a8d9";
@@ -73,6 +73,25 @@
           base0E = "329bc8";
           base0F = "3699d0";
         }
+        else if userSettings.theme == "purple-dawn"
+        then {
+          base00 = "100010";
+          base01 = "401020";
+          base02 = "202050";
+          base03 = "500060";
+          base04 = "a060a0";
+          base05 = "803080";
+          base06 = "504050";
+          base07 = "c080a0";
+          base08 = "ffffff";
+          base09 = "e030f0";
+          base0A = "ffffff";
+          base0B = "a03080";
+          base0C = "403070";
+          base0D = "c090c0";
+          base0E = "a03040";
+          base0F = "ffffff";
+        }
         else "${pkgs-stable.base16-schemes}/share/themes/${userSettings.theme}.yaml";
 
       polarity = "dark";