home, modules: add myFlake.home-manager.colorScheme

users/guanranwang/home-manager/actual-modules/color-scheme.nix

@@ -0,0 +1,9 @@
+{lib, ...}: {
+  options.myFlake.home-manager = {
+    colorScheme = lib.mkOption {
+      type = lib.types.enum [null "tokyonight"];
+      default = "tokyonight";
+      description = "Select desired terminal color scheme.";
+    };
+  };
+}

users/guanranwang/home-manager/actual-modules/default.nix

@@ -1,5 +1,6 @@
 {...}: {
   imports = [
     ./terminal.nix
+    ./color-scheme.nix
   ];
 }

users/guanranwang/home-manager/actual-modules/terminal.nix

@@ -1,11 +1,4 @@
-{
+{lib, ...}: {
-  lib,
-  config,
-  pkgs,
-  ...
-}: let
-  cfg = config.myFlake.home-manager.terminal;
-in {
   # 3 terminals, one module.
   #     -- The Orange Box (wtf)
 
@@ -49,36 +42,6 @@ in {
         example = 8;
         description = "Select desired terminal padding size (in px).";
       };
-
-      colorScheme = lib.mkOption {
-        type = lib.types.enum [null "tokyonight"];
-        default = "tokyonight";
-        description = "Select desired terminal color scheme.";
     };
   };
-  };
-
-  config.programs = lib.mkMerge [
-    {
-      alacritty.settings.cursor.style = cfg.cursorStyle;
-      kitty.settings.cursor_shape = cfg.cursorStyle;
-      foot.settings.cursor.style = cfg.cursorStyle;
-
-      alacritty.settings.font.size = cfg.fontSize;
-      kitty.settings.font_size = cfg.fontSize;
-      foot.settings.main.font = "monospace:size=${builtins.toString cfg.fontSize}";
-
-      alacritty.settings.window.padding.x = cfg.padding;
-      alacritty.settings.window.padding.y = cfg.padding;
-      kitty.settings.window_padding_width = builtins.toString (cfg.padding * (3.0 / 4.0)); # px -> pt
-      foot.settings.main.pad = "${builtins.toString cfg.padding}x${builtins.toString cfg.padding}";
-    }
-
-    # TODO: split this part to ./color-scheme.nix (???)
-    (lib.mkIf (cfg.colorScheme == "tokyonight") {
-      alacritty.settings.import = ["${pkgs.vimPlugins.tokyonight-nvim}/extras/alacritty/tokyonight_night.yml"];
-      kitty.settings.include = "${pkgs.vimPlugins.tokyonight-nvim}/extras/kitty/tokyonight_night.conf";
-      foot.settings.main.include = "${pkgs.vimPlugins.tokyonight-nvim}/extras/foot/tokyonight_night.ini";
-    })
-  ];
 }

users/guanranwang/home-manager/modules/editor/helix.nix

@@ -1,9 +1,15 @@
-{...}: {
+{
+  config,
+  lib,
+  ...
+}: {
   programs.helix = {
     enable = true;
     defaultEditor = true;
     settings = {
-      theme = "tokyonight";
+      theme =
+        lib.mkIf (config.myFlake.home-manager.colorScheme == "tokyonight")
+        "tokyonight";
       editor = {
         cursor-shape = {
           insert = "bar";

users/guanranwang/home-manager/modules/editor/vscode.nix

@@ -1,9 +1,11 @@
 {
   lib,
   pkgs,
+  config,
   ...
 }: {
-  programs.vscode = {
+  programs.vscode = lib.mkMerge [
+    {
       enable = true;
       package = pkgs.vscodium; # foss
       enableExtensionUpdateCheck = false;
@@ -38,7 +40,6 @@
         terminal.integrated.cursorStyle = "line";
         terminal.integrated.smoothScrolling = true;
         window.menuBarVisibility = "toggle";
-      workbench.colorTheme = "Tokyo Night";
         workbench.list.smoothScrolling = true;
 
         # Workaround for VSCode crashing
@@ -61,11 +62,12 @@
         esbenp.prettier-vscode
         ritwickdey.liveserver
         vscodevim.vim
-
-      ### Themes
-      enkia.tokyo-night
-      #catppuccin.catppuccin-vsc-icons
-      #catppuccin.catppuccin-vsc
       ];
-  };
+    }
+
+    (lib.mkIf (config.myFlake.home-manager.colorScheme == "tokyonight") {
+      extensions = [pkgs.vscode-extensions.enkia.tokyo-night];
+      userSettings.workbench.colorTheme = "Tokyo Night";
+    })
+  ];
 }

users/guanranwang/home-manager/modules/shell/fish.nix

@@ -1,9 +1,15 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}: {
   programs.fish = {
     enable = true;
     interactiveShellInit = ''
       set fish_greeting
-      source ${pkgs.vimPlugins.tokyonight-nvim}/extras/fish/tokyonight_night.fish
+      ${lib.strings.optionalString (config.myFlake.home-manager.colorScheme == "tokyonight")
+        "source ${pkgs.vimPlugins.tokyonight-nvim}/extras/fish/tokyonight_night.fish"}
     '';
     plugins = [
       {

users/guanranwang/home-manager/modules/terms/alacritty.nix

@@ -1,6 +1,23 @@
-{...}: {
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
+  cfg = config.myFlake.home-manager.terminal;
+in {
   programs.alacritty = {
     enable = true;
-    #settings.env.WINIT_X11_SCALE_FACTOR = "1"; # workaround for.. something?
+    settings = {
+      import =
+        lib.mkIf (config.myFlake.home-manager.colorScheme == "tokyonight")
+        ["${pkgs.vimPlugins.tokyonight-nvim}/extras/alacritty/tokyonight_night.yml"];
+      cursor.style = cfg.cursorStyle;
+      font.size = cfg.fontSize;
+      window.padding.x = cfg.padding;
+      window.padding.y = cfg.padding;
+
+      #env.WINIT_X11_SCALE_FACTOR = "1"; # workaround for.. something?
+    };
   };
 }

users/guanranwang/home-manager/modules/terms/foot.nix

@@ -1,5 +1,20 @@
-{...}: {
+{
-  programs.foot = {
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
+  programs.foot = let
+    cfg = config.myFlake.home-manager.terminal;
+  in {
     enable = true;
+    settings = {
+      main.include =
+        lib.mkIf (config.myFlake.home-manager.colorScheme == "tokyonight")
+        "${pkgs.vimPlugins.tokyonight-nvim}/extras/foot/tokyonight_night.ini";
+      cursor.style = cfg.cursorStyle;
+      main.font = "monospace:size=${builtins.toString cfg.fontSize}";
+      main.pad = "${builtins.toString cfg.padding}x${builtins.toString cfg.padding}";
+    };
   };
 }

users/guanranwang/home-manager/modules/terms/kitty.nix

@@ -1,6 +1,22 @@
-{...}: {
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
+  cfg = config.myFlake.home-manager.terminal;
+in {
   programs.kitty = {
     enable = true;
-    settings.confirm_os_window_close = 0;
+    settings = {
+      include =
+        lib.mkIf (config.myFlake.home-manager.colorScheme == "tokyonight")
+        "${pkgs.vimPlugins.tokyonight-nvim}/extras/kitty/tokyonight_night.conf";
+      cursor_shape = cfg.cursorStyle;
+      font_size = cfg.fontSize;
+      window_padding_width = builtins.toString (cfg.padding * (3.0 / 4.0)); # px -> pt
+
+      confirm_os_window_close = 0;
+    };
   };
 }

users/guanranwang/home-manager/modules/wm/components/dunst.nix

@@ -1,7 +1,12 @@
-{...}: {
+{
+  lib,
+  config,
+  ...
+}: {
   services.dunst = {
     enable = true;
-    settings = {
+    settings = lib.mkMerge [
+      {
         global = {
           padding = 10;
           horizontal_padding = 10;
@@ -12,16 +17,17 @@
 
           max_icon_size = 128; # weird bug, default value (128) not working
         };
-
+      }
+      (lib.mkIf (config.myFlake.home-manager.colorScheme == "tokyonight") {
         # Tokyonight
         global = {
           frame_color = "#c0caf5";
           background = "#1a1b26";
           foreground = "#c0caf5";
         };
-
         urgency_critical.frame_color = "#fab387";
-    };
+      })
+    ];
   };
 
   xdg.dataFile."icons/dunst" = {

users/guanranwang/home-manager/profiles/graphical-stuff/nixos/theme.nix

@@ -1,6 +1,7 @@
 {
   pkgs,
   config,
+  lib,
   ...
 }: {
   gtk.enable = true;
@@ -65,7 +66,8 @@
   };
 
   # Misc
-  xresources.properties = {
+  xresources.properties = lib.mkMerge [
+    {
       # Cursor
       "Xcursor.theme" = "Adwaita";
 
@@ -76,7 +78,8 @@
       "Xft.hinting" = "1";
       "Xft.antialias" = "1";
       "Xft.rgba" = "rgb";
-
+    }
+    (lib.mkIf (config.myFlake.home-manager.colorScheme == "tokyonight") {
       # Tokyonight color scheme
       # i have no idea what does it apply to
       "*background" = "#1a1b26";
@@ -99,5 +102,6 @@
       "*color13" = "#bb9af7";
       "*color14" = "#7dcfff";
       "*color15" = "#c0caf5";
-  };
+    })
+  ];
 }