2024-03-02

2 files changed, 20 insertions, 61 deletions

diff --git a/modules/common/profiles/default.nix b/modules/common/profiles/default.nix
index 2b24752..a17ff08 100644
--- a/modules/common/profiles/default.nix
+++ b/modules/common/profiles/default.nix
@@ -13,53 +13,13 @@ in {
     ./email.nix
     ./headful.nix
     ./headless.nix
-    (mkAliasOptionModule ["colourScheme"] [
-      "nixfiles"
-      "modules"
-      "profiles"
-      "default"
-      "colourScheme"
-    ])
   ];
 
-  options.nixfiles.modules.profiles.default = {
-    enable =
-      mkEnableOption "The most default profile of them all."
-      // {
-        default = true;
-      };
-
-    colourScheme = let
-      mkColour = default:
-        mkOption {
-          type = types.str;
-          inherit default;
-          description = "Colour in a standard hexadecimal notation.";
-          example = "#000000";
-        };
-    in rec {
-      black = mkColour "#161719";
-      red = mkColour "#cc6666";
-      green = mkColour "#b5bd68";
-      yellow = mkColour "#f0c674";
-      blue = mkColour "#81a2be";
-      magenta = mkColour "#b294bb";
-      cyan = mkColour "#8abeb7";
-      white = mkColour "#c5c8c6";
-
-      brightBlack = mkColour "#969896";
-      brightRed = mkColour "#cc6666";
-      brightGreen = mkColour "#b5bd68";
-      brightYellow = mkColour "#f0c674";
-      brightBlue = mkColour "#81a2be";
-      brightMagenta = mkColour "#b294bb";
-      brightCyan = mkColour "#8abeb7";
-      brightWhite = mkColour "#ffffff";
-
-      background = black;
-      foreground = white;
+  options.nixfiles.modules.profiles.default.enable =
+    mkEnableOption "The most default profile of them all."
+    // {
+      default = true;
     };
-  };
 
   config = mkIf cfg.enable {
     assertions = [
diff --git a/modules/common/profiles/dev/sql.nix b/modules/common/profiles/dev/sql.nix
index b290c16..3e1c4b2 100644
--- a/modules/common/profiles/dev/sql.nix
+++ b/modules/common/profiles/dev/sql.nix
@@ -16,7 +16,6 @@ in {
   config = mkIf cfg.enable {
     hm = {
       home.packages = with pkgs; [
-        dbeaver
         pgcli
         litecli
       ];
@@ -34,26 +33,26 @@ in {
           table_format = "fancy_grid";
         };
 
-        colorsSection = with config.colourScheme; {
+        colorsSection = with config.colors.withHashtag; {
           "arg-toolbar" = "noinherit bold";
           "arg-toolbar.text" = "nobold";
-          "bottom-toolbar" = "bg:${black} ${white}";
-          "bottom-toolbar.off" = "bg:${black} ${brightBlack}";
-          "bottom-toolbar.on" = "bg:${black} ${brightWhite}";
-          "bottom-toolbar.transaction.failed" = "bg:${black} ${red} bold";
-          "bottom-toolbar.transaction.valid" = "bg:${black} ${green} bold";
-          "completion-menu.completion" = "bg:${black} ${white}";
-          "completion-menu.completion.current" = "bg:${white} ${black}";
-          "completion-menu.meta.completion" = "bg:${black} ${yellow}";
-          "completion-menu.meta.completion.current" = "bg:${yellow} ${black}";
-          "completion-menu.multi-column-meta" = "bg:${yellow} ${black}";
-          "scrollbar" = "bg:${black}";
-          "scrollbar.arrow" = "bg:${black}";
-          "search" = "bg:${magenta} ${brightWhite}";
+          "bottom-toolbar" = "bg:${base01} ${base06}";
+          "bottom-toolbar.off" = "bg:${base01} ${base02}";
+          "bottom-toolbar.on" = "bg:${base01} ${base07}";
+          "bottom-toolbar.transaction.failed" = "bg:${base01} ${base08} bold";
+          "bottom-toolbar.transaction.valid" = "bg:${base01} ${base0B} bold";
+          "completion-menu.completion" = "bg:${base01} ${base06}";
+          "completion-menu.completion.current" = "bg:${base06} ${base01}";
+          "completion-menu.meta.completion" = "bg:${base01} ${base13}";
+          "completion-menu.meta.completion.current" = "bg:${base09} ${base01}";
+          "completion-menu.multi-column-meta" = "bg:${base09} ${base01}";
+          "scrollbar" = "bg:${base01}";
+          "scrollbar.arrow" = "bg:${base01}";
+          "search" = "bg:${base17} ${base07}";
           "search-toolbar" = "noinherit bold";
           "search-toolbar.text" = "nobold";
-          "search.current" = "bg:${green} ${brightWhite}";
-          "selected" = "bg:${blue} ${brightWhite}";
+          "search.current" = "bg:${base14} ${base07}";
+          "selected" = "bg:${base0D} ${base07}";
           "system-toolbar" = "noinherit bold";
         };