feat: Change to use dark theme

sudosubin · Jul 15, 2024 · c94dfe9 · c94dfe9
1 parent c97f0ad
commit c94dfe9
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 41 deletions.
diff --git a/libraries/nixpkgs/programs/google-chrome/default.nix b/libraries/nixpkgs/programs/google-chrome/default.nix
@@ -3,7 +3,8 @@ final: { lib, ... }@prev:
 {
   google-chrome = prev.google-chrome.override {
     commandLineArgs = lib.concatStringsSep " " [
-      "--enable-features=WebRTCPipeWireCapturer,OverlayScrollbar"
+      "--enable-features=WebRTCPipeWireCapturer,WebUIDarkMode,OverlayScrollbar"
+      "--force-dark-mode"
     ];
   };
 }
diff --git a/modules/darwin/configuration.nix b/modules/darwin/configuration.nix
@@ -49,7 +49,7 @@
     # system configurations
     NSGlobalDomain = {
       AppleShowAllFiles = true;
-      AppleInterfaceStyle = null;
+      AppleInterfaceStyle = "Dark";
       AppleInterfaceStyleSwitchesAutomatically = false;
       AppleICUForce24HourTime = true;
       AppleShowAllExtensions = true;

diff --git a/modules/linux/programs/theme/default.nix b/modules/linux/programs/theme/default.nix
@@ -15,8 +15,8 @@
     };
 
     gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
-    gtk3.extraConfig = { "gtk-application-prefer-dark-theme" = false; };
-    gtk4.extraConfig = { "gtk-application-prefer-dark-theme" = false; };
+    gtk3.extraConfig = { "gtk-application-prefer-dark-theme" = true; };
+    gtk4.extraConfig = { "gtk-application-prefer-dark-theme" = true; };
   };
 
   home.pointerCursor = {

diff --git a/modules/shared/programs/alacritty/default.nix b/modules/shared/programs/alacritty/default.nix
@@ -4,14 +4,14 @@ let
   inherit (pkgs.stdenvNoCC.hostPlatform) isDarwin;
 
   colors = {
-    black = "#24292f";
-    red = "#cf222e";
-    green = "#1a7f37";
-    yellow = "#9a6700";
-    blue = "#0969da";
-    magenta = "#8250df";
-    cyan = "#3192aa";
-    white = "#6e7781";
+    black = "#5c6370";
+    red = "#e06c75";
+    green = "#98c379";
+    yellow = "#e5c07b";
+    blue = "#61afef";
+    magenta = "#c678dd";
+    cyan = "#56b6c2";
+    white = "#abb2bf";
   };
 
   font-size = if isDarwin then 13 else 10;
@@ -59,8 +59,8 @@ in
       };
 
       colors = {
-        primary.background = "#ffffff";
-        primary.foreground = "#0E1116";
+        primary.background = "#1e2127";
+        primary.foreground = colors.white;
         normal.black = colors.black;
         normal.red = colors.red;
         normal.green = colors.green;
@@ -77,10 +77,6 @@ in
         bright.magenta = colors.magenta;
         bright.cyan = colors.cyan;
         bright.white = colors.white;
-        indexed_colors = [
-          { index = 16; color = "#d18616"; }
-          { index = 17; color = "#a40e26"; }
-        ];
       };
 
       live_config_reload = false;

diff --git a/modules/shared/programs/bat/default.nix b/modules/shared/programs/bat/default.nix
@@ -5,7 +5,7 @@
     enable = true;
 
     config = {
-      theme = "GitHub";
+      theme = "base16";
       style = "numbers,changes,header";
       italic-text = "always";
     };

diff --git a/modules/shared/programs/git/delta.nix b/modules/shared/programs/git/delta.nix
@@ -4,23 +4,22 @@
   programs.git.delta = {
     enable = true;
     options = {
-      syntax-theme = "GitHub";
-      light = true;
+      syntax-theme = "base16";
       file-style = "yellow ul";
       file-decoration-style = "";
-      hunk-style = "syntax #6e7781";
-      hunk-header-decoration-style = "#6e7781 ul";
-      minus-style = "syntax #FFEBE9";
-      minus-emph-style = "syntax #FFC1BF";
-      plus-style = "syntax #E6FFEC";
-      plus-emph-style = "syntax #ABF2BC";
-      whitespace-error-style = "#ABF2BC #ABF2BC";
+      hunk-style = "syntax #08000000";
+      hunk-header-decoration-style = "#08000000 ul";
+      minus-style = "syntax #400000";
+      minus-emph-style = "syntax #500000";
+      plus-style = "syntax #003000";
+      plus-emph-style = "syntax #004000";
+      whitespace-error-style = "22 reverse";
       side-by-side = true;
-      line-numbers-minus-style = "#6e7781 #FFEBE9";
-      line-numbers-zero-style = "#6e7781";
-      line-numbers-plus-style = "#6e7781 #E6FFEC";
-      line-numbers-left-style = "#6e7781";
-      line-numbers-right-style = "#6e7781";
+      line-numbers-minus-style = "#08000000 #400000";
+      line-numbers-zero-style = "#08000000";
+      line-numbers-plus-style = "#08000000 #003000";
+      line-numbers-left-style = "#08000000";
+      line-numbers-right-style = "#08000000";
     };
   };
 }
diff --git a/modules/shared/programs/shell/fzf.nix b/modules/shared/programs/shell/fzf.nix
@@ -4,10 +4,11 @@
   programs.fzf = {
     enable = true;
     defaultOptions = [
-      "--color=fg:-1,bg:-1,hl:#1a7f37"
-      "--color=fg+:#0E1116,bg+:#ffffff,hl+:#1a7f37"
-      "--color=info:#9a6700,prompt:#1a7f37,pointer:#3192aa"
-      "--color=marker:#3192aa,spinner:#9a6700,header:#3192aa"
+      "--color=dark"
+      "--color=fg:-1,bg:-1,hl:#98c379"
+      "--color=fg+:#ffffff,bg+:#282c34,hl+:#98c379"
+      "--color=info:#e5c07b,prompt:#98c379,pointer:#56b6c2"
+      "--color=marker:#56b6c2,spinner:#e5c07b,header:#56b6c2"
     ];
   };
 }
diff --git a/modules/shared/programs/tmux/default.nix b/modules/shared/programs/tmux/default.nix
@@ -22,8 +22,8 @@
       bind c new-window -c "#{pane_current_path}"
 
       # bottom status bar color
-      set -g status-bg "#DAFBE1"
-      set -g status-fg white
+      set -g status-bg green
+      set -g status-fg black
     '';
   };
 }
diff --git a/modules/shared/programs/vscode/default.nix b/modules/shared/programs/vscode/default.nix
@@ -55,6 +55,13 @@ let
         node ${./scripts/patch-material-icon-theme.js} "${./files/settings.json}"
       '';
     });
+
+    zhuangtongfa.material-theme = pkgs.vscode-extensions.zhuangtongfa.material-theme.overrideAttrs (attrs: {
+      preInstall = ''
+        ${attrs.preInstall or ""}
+        rm -rf ./styles
+      '';
+    });
   };
 
 in
@@ -86,7 +93,6 @@ in
       exiasr.hadolint
       foxundermoon.shell-format
       fwcd.kotlin
-      github.github-vscode-theme
       golang.go
       hashicorp.terraform
       jnoortheen.nix-ide
@@ -110,6 +116,7 @@ in
       usernamehw.errorlens
       yoavbls.pretty-ts-errors
       yzhang.markdown-all-in-one
+      overlays.zhuangtongfa.material-theme # TODO
     ];
   };
 

diff --git a/modules/shared/programs/vscode/files/settings.json b/modules/shared/programs/vscode/files/settings.json
@@ -14,7 +14,7 @@
   "search.useGlobalIgnoreFiles": true,
 
   // theme
-  "workbench.colorTheme": "GitHub Light",
+  "workbench.colorTheme": "One Dark Pro",
   "workbench.iconTheme": "material-icon-theme",
   "workbench.productIconTheme": "material-product-icons",
   "material-icon-theme.activeIconPack": "react",