Change themes

Signed-off-by: Hadi <112569860+anotherhadi@users.noreply.github.com>

home/system/caelestia-shell/appearance.nix

@@ -3,7 +3,7 @@
   config,
   ...
 }: let
-  rounding = config.theme.rounding + config.theme.gaps-out;
+  inherit (config.theme) bar-rounding bar-thickness;
   inherit (config.stylix) fonts;
 in {
   home.packages = with pkgs; [
@@ -43,8 +43,8 @@ in {
     };
     dashboard.showOnHover = false;
     border = {
-      inherit rounding;
+      rounding = bar-rounding;
-      thickness = 8;
+      thickness = bar-thickness;
     };
   };
 }

hosts/laptop/variables.nix

@@ -5,7 +5,7 @@
 }: {
   imports = [
     # Choose your theme here:
-    ../../themes/darkviolet.nix
+    ../../themes/nixy.nix
   ];
 
   config.var = {

hosts/server/variables.nix

@@ -5,7 +5,7 @@
 }: {
   imports = [
     # Choose your theme here:
-    ../../themes/rose-pine.nix
+    ../../themes/nixy.nix
   ];
 
   config.var = {

hosts/work/variables.nix

@@ -5,7 +5,7 @@
 }: {
   imports = [
     # Choose your theme here:
-    ../../themes/darkviolet.nix
+    ../../themes/nixy.nix
   ];
 
   config.var = {

themes/nixy.nix

@@ -7,16 +7,17 @@
   options.theme = lib.mkOption {
     type = lib.types.attrs;
     default = {
-      rounding = 25;
+      rounding = 28;
+      bar-rounding = 28 + 10;
+      bar-thickness = 0;
       gaps-in = 10;
       gaps-out = 10 * 2;
-      active-opacity = 0.99;
+      active-opacity = 0.98;
-      inactive-opacity = 0.97;
+      inactive-opacity = 0.95;
       blur = true;
-      border-size = 2;
+      border-size = 4;
       animation-speed = "medium"; # "fast" | "medium" | "slow"
       fetch = "none"; # "nerdfetch" | "neofetch" | "pfetch" | "none"
-      textColorOnWallpaper = config.lib.stylix.colors.base00; # Color of the text displayed on the wallpaper (Lockscreen, display manager, ...)
     };
     description = "Theme configuration options";
   };
@@ -26,8 +27,8 @@
 
     # See https://tinted-theming.github.io/tinted-gallery/ for more schemes
     base16Scheme = {
-      base00 = "110F12"; # Default Background
+      base00 = "0B0B0D"; # Default Background
-      base01 = "1C1920"; # Lighter Background (Used for status bars, line number and folding marks)
+      base01 = "110F12"; # Lighter Background (Used for status bars, line number and folding marks)
       base02 = "2D2A36"; # Selection Background
       base03 = "514D63"; # Comments, Invisibles, Line Highlighting
       base04 = "8E8AA0"; # Dark Foreground (Used for status bars)
@@ -74,8 +75,8 @@
 
     polarity = "dark";
     image = pkgs.fetchurl {
-      url = "https://raw.githubusercontent.com/anotherhadi/awesome-wallpapers/refs/heads/main/app/static/wallpapers/white-snow-and-a-tree_light.png";
+      url = "https://raw.githubusercontent.com/anotherhadi/awesome-wallpapers/refs/heads/main/app/static/wallpapers/a-violet-blur.png";
-      sha256 = "sha256-HKqDY/iCcV++WwNuNIWZEyXuxYuGWG+krn2vPTe58HQ=";
+      sha256 = "sha256-uzAhuKGqnN038A5P+xdvxYgRiYq046GDmD9P1FcISz4=";
     };
   };
 }

themes/rose-pine.nix

@@ -1,81 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: {
-  options.theme = lib.mkOption {
-    type = lib.types.attrs;
-    default = {
-      rounding = 30;
-      gaps-in = 12;
-      gaps-out = 12 * 2;
-      active-opacity = 0.96;
-      inactive-opacity = 0.94;
-      blur = true;
-      border-size = 4;
-      animation-speed = "fast"; # "fast" | "medium" | "slow"
-      fetch = "none"; # "nerdfetch" | "neofetch" | "pfetch" | "none"
-      textColorOnWallpaper = config.lib.stylix.colors.base00; # Color of the text displayed on the wallpaper (Lockscreen, display manager, ...)
-    };
-    description = "Theme configuration options";
-  };
-
-  config.stylix = {
-    enable = true;
-
-    # See https://tinted-theming.github.io/tinted-gallery/ for more schemes
-    base16Scheme = {
-      base00 = "151320"; # Default Background
-      base01 = "1f1d2e"; # Lighter Background (Used for status bars, line number and folding marks)
-      base02 = "26233a"; # Selection Background
-      base03 = "6e6a86"; # Comments, Invisibles, Line Highlighting
-      base04 = "908caa"; # Dark Foreground (Used for status bars)
-      base05 = "e0def4"; # Default Foreground, Caret, Delimiters, Operators
-      base06 = "e0def4"; # Light Foreground (Not often used)
-      base07 = "524f67"; # Light Background (Not often used)
-      base08 = "eb6f92"; # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted
-      base09 = "f6c177"; # Integers, Boolean, Constants, XML Attributes, Markup Link Url
-      base0A = "ebbcba"; # Classes, Markup Bold, Search Text Background
-      base0B = "31748f"; # Strings, Inherited Class, Markup Code, Diff Inserted
-      base0C = "9ccfd8"; # Support, Regular Expressions, Escape Characters, Markup Quotes
-      base0D = "c4a7e7"; # Functions, Methods, Attribute IDs, Headings, Accent color
-      base0E = "f6c177"; # Keywords, Storage, Selector, Markup Italic, Diff Changed
-      base0F = "524f67"; # Deprecated, Opening/Closing Embedded Language Tags, e.g. <?php ?>
-    };
-
-    cursor = {
-      name = "BreezeX-RosePine-Linux";
-      package = pkgs.rose-pine-cursor;
-      size = 20;
-    };
-
-    fonts = {
-      monospace = {
-        package = pkgs.maple-mono.NF;
-        name = "Maple Mono NF";
-      };
-      sansSerif = {
-        package = pkgs.source-sans-pro;
-        name = "Source Sans Pro";
-      };
-      serif = config.stylix.fonts.sansSerif;
-      emoji = {
-        package = pkgs.noto-fonts-color-emoji;
-        name = "Noto Color Emoji";
-      };
-      sizes = {
-        applications = 13;
-        desktop = 13;
-        popups = 13;
-        terminal = 13;
-      };
-    };
-
-    polarity = "dark";
-    image = pkgs.fetchurl {
-      url = "https://raw.githubusercontent.com/anotherhadi/awesome-wallpapers/refs/heads/main/app/static/wallpapers/pink-clouds.png";
-      sha256 = "sha256-IvINf62mg9rKjml4sh8hl/j7UHrQQlbm6QnZTaI+TRk=";
-    };
-  };
-}

themes/zen.nix

@@ -1,81 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: {
-  options.theme = lib.mkOption {
-    type = lib.types.attrs;
-    default = {
-      rounding = 30;
-      gaps-in = 12;
-      gaps-out = 12 * 2;
-      active-opacity = 0.99;
-      inactive-opacity = 0.98;
-      blur = false;
-      border-size = 4;
-      animation-speed = "medium"; # "fast" | "medium" | "slow"
-      fetch = "none"; # "nerdfetch" | "neofetch" | "pfetch" | "none"
-      textColorOnWallpaper = config.lib.stylix.colors.base00; # Color of the text displayed on the wallpaper (Lockscreen, display manager, ...)
-    };
-    description = "Theme configuration options";
-  };
-
-  config.stylix = {
-    enable = true;
-
-    # See https://tinted-theming.github.io/tinted-gallery/ for more schemes
-    base16Scheme = {
-      base00 = "090E13"; # Default Background
-      base01 = "12171E"; # Lighter Background (Used for status bars, line number and folding marks)
-      base02 = "393B44"; # Selection Background
-      base03 = "54546D"; # Comments, Invisibles, Line Highlighting
-      base04 = "A4A7A4"; # Dark Foreground (Used for status bars)
-      base05 = "C5C9C7"; # Default Foreground, Caret, Delimiters, Operators
-      base06 = "DCD7BA"; # Light Foreground (Not often used)
-      base07 = "C8C093"; # Light Background (Not often used)
-      base08 = "C4746E"; # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted
-      base09 = "B6927B"; # Integers, Boolean, Constants, XML Attributes, Markup Link Url
-      base0A = "C4B28A"; # Classes, Markup Bold, Search Text Background
-      base0B = "8A9A7B"; # Strings, Inherited Class, Markup Code, Diff Inserted
-      base0C = "8EA4A2"; # Support, Regular Expressions, Escape Characters, Markup Quotes
-      base0D = "8BA4B0"; # Functions, Methods, Attribute IDs, Headings, Accent color
-      base0E = "A292A3"; # Keywords, Storage, Selector, Markup Italic, Diff Changed
-      base0F = "B98D7B"; # Deprecated, Opening/Closing Embedded Language Tags, e.g. <?php ?>
-    };
-
-    cursor = {
-      name = "BreezeX-RosePine-Linux";
-      package = pkgs.rose-pine-cursor;
-      size = 20;
-    };
-
-    fonts = {
-      monospace = {
-        package = pkgs.maple-mono.NF;
-        name = "Maple Mono NF";
-      };
-      sansSerif = {
-        package = pkgs.source-sans-pro;
-        name = "Source Sans Pro";
-      };
-      serif = config.stylix.fonts.sansSerif;
-      emoji = {
-        package = pkgs.noto-fonts-color-emoji;
-        name = "Noto Color Emoji";
-      };
-      sizes = {
-        applications = 13;
-        desktop = 13;
-        popups = 13;
-        terminal = 13;
-      };
-    };
-
-    polarity = "dark";
-    image = pkgs.fetchurl {
-      url = "https://raw.githubusercontent.com/anotherhadi/awesome-wallpapers/refs/heads/main/app/static/wallpapers/nepal.png";
-      sha256 = "sha256-0o2+B3+yA++PCyfNC+VqmaX959aKk3GuD7XpOq3SGcM=";
-    };
-  };
-}