691 current 2024-05-26 22:12:48 24.11.20240524.bfb7a88 6.9.1-zen1 *

modules/home/apps/helpers/ags/cfg/style.css

@@ -1,5 +1,6 @@
 *:not(selection):not(tooltip) {
-  all: unset; }
+  all: unset;
+}
 
 .clock {
   background-color: #1e1e2e;
@@ -7,7 +8,8 @@
   border: 3px solid #11111b;
   color: #cdd6f4;
   font-weight: bold;
-  padding: 1px 15px; }
+  padding: 1px 15px;
+}
 
 .media {
   background-color: #1e1e2e;
@@ -15,10 +17,12 @@
   border: 3px solid #11111b;
   color: #cdd6f4;
   font-weight: bold;
-  padding: 1px 15px; }
+  padding: 1px 15px;
-  .media:hover {
+}
-    color: #74C7EC;
+.media:hover {
-    border: 3px solid #74C7EC; }
+  color: #74c7ec;
+  border: 3px solid #74c7ec;
+}
 
 .barNotification {
   background-color: #1e1e2e;
@@ -27,15 +31,20 @@
   color: #cdd6f4;
   font-weight: bold;
   margin-right: 10px;
-  padding: 1px 15px; }
+  padding: 1px 15px;
+}
 
 @keyframes lowBlink {
   0% {
-    color: #74C7EC; }
+    color: #74c7ec;
+  }
   50% {
-    color: #cdd6f4; }
+    color: #cdd6f4;
+  }
   100% {
-    color: #74C7EC; } }
+    color: #74c7ec;
+  }
+}
 
 .sysinfo {
   background-color: #1e1e2e;
@@ -44,22 +53,28 @@
   color: #cdd6f4;
   font-weight: bold;
   margin-right: 10px;
-  padding: 1px 15px; }
+  padding: 1px 15px;
-  .sysinfo:hover {
+}
-    color: #74C7EC;
+.sysinfo:hover {
-    border: 3px solid #74C7EC; }
+  color: #74c7ec;
+  border: 3px solid #74c7ec;
+}
 
 .volume {
-  margin-left: 8px; }
+  margin-left: 8px;
+}
 
 .bluetoothindicator {
-  margin-left: 8px; }
+  margin-left: 8px;
+}
 
 .batIcon {
   margin-left: 8px;
-  margin-right: 4px; }
+  margin-right: 4px;
-  .batIcon.low {
+}
-    animation: lowBlink 2s infinite; }
+.batIcon.low {
+  animation: lowBlink 2s infinite;
+}
 
 .title {
   background: #1e1e2e;
@@ -68,10 +83,12 @@
   color: #cdd6f4;
   font-weight: bold;
   margin-left: 10px;
-  padding: 1px 15px; }
+  padding: 1px 15px;
-  .title:hover {
+}
-    color: #74C7EC;
+.title:hover {
-    border: 3px solid #74C7EC; }
+  color: #74c7ec;
+  border: 3px solid #74c7ec;
+}
 
 .tray {
   background-color: #1e1e2e;
@@ -80,9 +97,11 @@
   color: #cdd6f4;
   font-weight: bold;
   margin-right: 10px;
-  padding: 1px 11px; }
+  padding: 1px 11px;
-  .tray > * {
+}
-    margin: 0 4px; }
+.tray > * {
+  margin: 0 4px;
+}
 
 menu menuitem {
   background-color: #1e1e2e;
@@ -90,98 +109,122 @@ menu menuitem {
   border: 3px solid #11111b;
   color: #cdd6f4;
   margin: 1px;
-  padding: 5px; }
+  padding: 5px;
-  menu menuitem:hover {
+}
-    color: #74C7EC;
+menu menuitem:hover {
-    border: 3px solid #74C7EC; }
+  color: #74c7ec;
+  border: 3px solid #74c7ec;
+}
 
 .workspaces_pill {
   background: #1e1e2e;
   border-radius: 15px;
   border: 3px solid #11111b;
-  padding: 1px 15px; }
+  padding: 1px 15px;
+}
 
 .workspaces {
-  margin: 3px 0; }
+  margin: 3px 0;
-  .workspaces button {
+}
+.workspaces button {
   background: #cdd6f4;
   border-radius: 24px;
   margin: 0 3px;
   min-height: 16px;
   min-width: 16px;
-    transition: all 0.3s cubic-bezier(0.2, 0, 0, 1); }
+  transition: all 0.3s cubic-bezier(0.2, 0, 0, 1);
-    .workspaces button:hover {
+}
-      min-width: 24px; }
+.workspaces button:hover {
-    .workspaces button.focused {
+  min-width: 24px;
-      background: #74C7EC;
+}
-      min-width: 32px; }
+.workspaces button.focused {
+  background: #74c7ec;
+  min-width: 32px;
+}
 
 .bar {
-  font-family: JetBrains Mono Nerd Font; }
+  font-family: Zed Sans;
+}
 
 .Slider {
   background: #1e1e2e;
   border-radius: 15px;
   border: 3px solid #11111b;
   margin-bottom: 15px;
-  padding: 12px; }
+  padding: 12px;
+}
 
 .sldLabel {
-  margin-bottom: 6px; }
+  margin-bottom: 6px;
+}
 
 .sldIcon {
-  margin-right: 6px; }
+  margin-right: 6px;
+}
 
 .sldSlider {
-  min-width: 300px; }
+  min-width: 300px;
-  .sldSlider slider {
+}
-    background: none; }
+.sldSlider slider {
-  .sldSlider trough {
+  background: none;
+}
+.sldSlider trough {
   background: #313244;
   border-radius: 24px;
-    min-height: 16px; }
+  min-height: 16px;
-  .sldSlider highlight {
+}
-    background: #74C7EC;
+.sldSlider highlight {
+  background: #74c7ec;
   border-radius: 24px;
-    min-width: 16px; }
+  min-width: 16px;
+}
 
 .calendar {
   background-color: #1e1e2e;
   border-radius: 16px;
   border: 3px solid #11111b;
   color: #cdd6f4;
-  padding: 10px; }
+  padding: 10px;
+}
 
 .calendarWidget {
-  padding: 3px; }
+  padding: 3px;
-  .calendarWidget:selected {
+}
-    color: #74C7EC; }
+.calendarWidget:selected {
+  color: #74c7ec;
+}
 
 .notificationList {
   background-color: #1e1e2e;
   border-radius: 15px;
   border: 3px solid #11111b;
   margin-bottom: 15px;
-  padding: 10px; }
+  padding: 10px;
+}
 
 .notificationEmpty {
   color: #313244;
-  font-size: 80px; }
+  font-size: 80px;
+}
 
 .notificationImage {
   color: #cdd6f4;
-  font-size: 40px; }
+  font-size: 40px;
+}
 
 .notification {
   background-color: #313244;
   border-radius: 15px;
-  padding: 10px; }
+  padding: 10px;
+}
 
 .notificationTitle {
-  color: #cdd6f4; }
+  color: #cdd6f4;
+}
 
 .notificationDescription {
-  color: #bac2de; }
+  color: #bac2de;
+}
 
 .quicktoggles {
   background: #1e1e2e;
@@ -189,31 +232,42 @@ menu menuitem {
   border: 3px solid #11111b;
   margin-bottom: 15px;
   min-width: 300px;
-  padding: 20px 20px; }
+  padding: 20px 20px;
+}
 
 .buttons {
-  margin-top: 10px; }
+  margin-top: 10px;
+}
 
-.bluetooth, .wifi {
+.bluetooth,
-  background: #74C7EC;
+.wifi {
+  background: #74c7ec;
   border-radius: 24px;
   min-width: 125px;
-  padding: 9px; }
+  padding: 9px;
-  .bluetooth.off, .wifi.off {
+}
-    background: #313244; }
+.bluetooth.off,
+.wifi.off {
+  background: #313244;
+}
 
 .wifi {
-  margin-right: 10px; }
+  margin-right: 10px;
+}
 
-.wifiIcon, .bluetoothIcon {
+.wifiIcon,
-  margin-right: 6px; }
+.bluetoothIcon {
+  margin-right: 6px;
+}
 
 .Icon {
   background: #313244;
   border-radius: 50%;
   margin-left: 5px;
   min-height: 32px;
-  min-width: 32px; }
+  min-width: 32px;
+}
 
 .dashboard {
-  font-weight: bold; }
+  font-weight: bold;
+}

modules/home/apps/helpers/ags/cfg/style.cssyazicd

@@ -117,7 +117,7 @@ menu menuitem {
       min-width: 32px; }
 
 .bar {
-  font-family: JetBrains Mono Nerd Font; }
+  font-family: Zed Sans; }
 
 .Slider {
   background: #1e1e2e;

modules/home/apps/term/alacritty/default.nix

@@ -0,0 +1,50 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+with lib;
+with lib.custom; let
+  cfg = config.apps.term.alacritty;
+in {
+  options.apps.term.alacritty = with types; {
+    enable = mkBoolOpt false "Enable Alacritty Term";
+
+    fonts = {
+      normal = {
+        family = mkStringOpt "ZedMono NFM" "The Family of the font";
+        style = mkStringOpt "Bold" "The Style of the font";
+      };
+      bold = {
+        family = mkStringOpt "ZedMono NFM" "The Family of the font";
+        style = mkStringOpt "ExtraBold" "The Style of the font";
+      };
+      italic = {
+        family = mkStringOpt "ZedMono NFM" "The Family of the font";
+        style = mkStringOpt "Bold Italic" "The Style of the font";
+      };
+      bold_italic = {
+        family = mkStringOpt "ZedMono NFM" "The Family of the font";
+        style = mkStringOpt "ExtraBold Italic" "The Style of the font";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    programs.alacritty = {
+      enable = true;
+      catppuccin.enable = true;
+
+      settings = {
+        background_opacity = "0.75";
+        font = {
+          normal = cfg.fonts.normal;
+          bold = cfg.fonts.bold;
+          italic = cfg.fonts.italic;
+          bold_italic = cfg.fonts.bold_italic;
+        };
+      };
+    };
+  };
+}

modules/home/apps/term/kitty/default.nix

@@ -12,10 +12,10 @@ in {
     enable = mkBoolOpt false "Enable Kitty Term";
 
     fonts = {
-      normal = mkStringOpt "Zed Mono Bold" "Normal Font";
+      normal = mkStringOpt "ZedMono NFM Bold" "Normal Font";
-      bold = mkStringOpt "Zed Mono ExtraBold" "Bold Font";
+      bold = mkStringOpt "ZedMono NFM ExtraBold" "Bold Font";
-      italic = mkStringOpt "Zed Mono Bold Italic" "Italic Font";
+      italic = mkStringOpt "ZedMono NFM Bold Italic" "Italic Font";
-      bold_italic = mkStringOpt "Zed Mono ExtraBold Italic" "Bold Italic Font";
+      bold_italic = mkStringOpt "ZedMono NFM ExtraBold Italic" "Bold Italic Font";
     };
   };
 
@@ -31,6 +31,8 @@ in {
         bold_font ${cfg.fonts.bold}
         italic_font ${cfg.fonts.italic}
         bold_italic_font ${cfg.fonts.bold_italic}
+
+        disable_ligatures always
       '';
 
       catppuccin.enable = true;

modules/home/apps/tools/neovim/config/lua/plugins/utils/lualine_sources.lua

@@ -47,7 +47,7 @@ M.branch = {
 	color = function()
 		local colors = require("catppuccin.palettes").get_palette()
 
-		return { bg = colors.base }
+		return { bg = nil }
 	end,
 }
 
@@ -60,7 +60,7 @@ M.diff = {
 	},
 	color = function()
 		local colors = require("catppuccin.palettes").get_palette()
-		return { bg = colors.base }
+		return { bg = nil }
 	end,
 }
 
@@ -70,7 +70,7 @@ M.diagnostics = {
 	"diagnostics",
 	color = function()
 		local colors = require("catppuccin.palettes").get_palette()
-		return { bg = colors.base }
+		return { bg = nil }
 	end,
 }
 
@@ -78,7 +78,7 @@ M.encoding = {
 	"encoding",
 	color = function()
 		local colors = require("catppuccin.palettes").get_palette()
-		return { fg = colors.blue, bg = colors.base }
+		return { fg = colors.blue, bg = nil }
 	end,
 }
 
@@ -86,7 +86,7 @@ M.fileformat = {
 	"fileformat",
 	color = function()
 		local colors = require("catppuccin.palettes").get_palette()
-		return { fg = colors.blue, bg = colors.base }
+		return { fg = colors.blue, bg = nil }
 	end,
 }
 
@@ -99,7 +99,7 @@ M.indentation = {
 	end,
 	color = function()
 		local colors = require("catppuccin.palettes").get_palette()
-		return { fg = colors.blue, bg = colors.base }
+		return { fg = colors.blue, bg = nil }
 	end,
 }
 
@@ -110,7 +110,7 @@ M.progress = {
 	end,
 	color = function()
 		local colors = require("catppuccin.palettes").get_palette()
-		return { fg = colors.lavender, bg = colors.base }
+		return { fg = colors.lavender, bg = nil }
 	end,
 }
 
@@ -121,7 +121,7 @@ M.location = {
 	end,
 	color = function()
 		local colors = require("catppuccin.palettes").get_palette()
-		return { fg = colors.lavender, bg = colors.base }
+		return { fg = colors.lavender, bg = nil }
 	end,
 }
 
@@ -132,7 +132,7 @@ M.macro = {
 	icon = icons.Recording,
 	color = function()
 		local colors = require("catppuccin.palettes").get_palette()
-		return { fg = colors.red, bg = colors.base }
+		return { fg = colors.red, bg = nil }
 	end,
 }
 
@@ -151,7 +151,7 @@ M.lsp = {
 	icon = icons.Braces,
 	color = function()
 		local colors = require("catppuccin.palettes").get_palette()
-		return { fg = colors.overlay0, bg = colors.base }
+		return { fg = colors.overlay0, bg = nil }
 	end,
 }
 
@@ -161,7 +161,7 @@ M.gap = {
 	end,
 	color = function()
 		local colors = require("catppuccin.palettes").get_palette()
-		return { bg = colors.base }
+		return { bg = nil }
 	end,
 	padding = 0,
 }

modules/nixos/ui/fonts/default.nix

@@ -44,11 +44,11 @@ in {
       fontconfig = {
         defaultFonts = {
           monospace = [
-            "Iosevka Nerd Font Complete Mono"
+            "ZedMono Nerd Font Complete Mono"
-            "Iosevka Nerd Font"
+            "ZedMono Nerd Font"
             "Noto Color Emoji"
           ];
-          sansSerif = ["Inter" "Noto Color Emoji"];
+          sansSerif = ["Zed Sans" "Noto Color Emoji"];
           serif = ["Noto Serif" "Noto Color Emoji"];
           emoji = ["Noto Color Emoji"];
         };

packages/zed-fonts/default.nix

@@ -68,7 +68,6 @@ buildNpmPackage rec {
   buildPhase = ''
     export HOME=$TMPDIR
     runHook preBuild
-    npm run build --no-update-notifier -- --jCmd=$NIX_BUILD_CORES --verbose=9 ttf::zed-mono
     npm run build --no-update-notifier -- --jCmd=$NIX_BUILD_CORES --verbose=9 ttf::zed-sans
     runHook postBuild
   '';
@@ -77,7 +76,7 @@ buildNpmPackage rec {
     runHook preInstall
     fontdir="$out/share/fonts/truetype"
     install -d "$fontdir"
-    install "dist/$pname/ttf"/* "$fontdir"
+    install "dist/zed-sans/ttf"/* "$fontdir"
     runHook postInstall
   '';