From 5d49db53ffcbbc619c564ef6f8e93f4c1cc358e4 Mon Sep 17 00:00:00 2001
From: wayne <...>
Date: Mon, 16 Jun 2025 13:06:21 -0700
Subject: [PATCH] Home Manager 25.05

---
 hm/home.nix                          |  4 +-
 hm/pkgs/inet-packages.nix            |  2 +-
 hm/pkgs/wm-packages.nix              |  4 +-
 pkgs/app/terminal/kitty.nix          |  2 +-
 pkgs/derivations/polycat/default.nix |  2 +-
 pkgs/wm/mako/mako.nix                | 69 +++++++++++++---------------
 6 files changed, 38 insertions(+), 45 deletions(-)

diff --git a/hm/home.nix b/hm/home.nix
index cd305d4..841adc5 100644
--- a/hm/home.nix
+++ b/hm/home.nix
@@ -165,7 +165,7 @@ in
     starship
     yazi
     appimage-run
-    nerdfonts ubuntu_font_family
+    # nerdfonts ubuntu_font_family
 
     doublecmd filezilla
     libreoffice
@@ -205,7 +205,7 @@ in
     ripgrep.enable = true;
     vscode = {
       enable = true;
-      extensions = with pkgs.vscode-extensions; [
+      profiles.default.extensions = with pkgs.vscode-extensions; [
         devsense.profiler-php-vscode
         devsense.phptools-vscode
         devsense.composer-php-vscode
diff --git a/hm/pkgs/inet-packages.nix b/hm/pkgs/inet-packages.nix
index 2018cd3..3cba0dc 100644
--- a/hm/pkgs/inet-packages.nix
+++ b/hm/pkgs/inet-packages.nix
@@ -29,7 +29,7 @@ with pkgs;
   keepassxc git-credential-keepassxc keybase-gui keybase kbfs
   remmina
 
-  mapscii
+  # mapscii
   # tidal-dl
   postman
 ]
\ No newline at end of file
diff --git a/hm/pkgs/wm-packages.nix b/hm/pkgs/wm-packages.nix
index 62c9a99..bed89eb 100644
--- a/hm/pkgs/wm-packages.nix
+++ b/hm/pkgs/wm-packages.nix
@@ -1,6 +1,6 @@
 { pkgs, ... }:
 let
-  polycat = pkgs.callPackage ../../pkgs/derivations/polycat {};
+  # polycat = pkgs.callPackage ../../pkgs/derivations/polycat {};
 in
 with pkgs;
 [
@@ -13,7 +13,7 @@ with pkgs;
   qalculate-qt
   xorg.xrandr
   dconf
-  polycat
+  # polycat
   # adwaita-qt
   adwaita-qt6 adwaita-icon-theme
 ]
\ No newline at end of file
diff --git a/pkgs/app/terminal/kitty.nix b/pkgs/app/terminal/kitty.nix
index c5a10eb..22c0189 100644
--- a/pkgs/app/terminal/kitty.nix
+++ b/pkgs/app/terminal/kitty.nix
@@ -15,7 +15,7 @@ in
     # stylix.targets.kitty.enable = true;
     font = {
       name = "JetBrainsMono Nerd Font";
-      package = pkgs.nerdfonts;
+      package = pkgs.nerd-fonts.jetbrains-mono;
     };
     settings = {
       themeFile = "Nord";
diff --git a/pkgs/derivations/polycat/default.nix b/pkgs/derivations/polycat/default.nix
index 9a44dbb..923f940 100644
--- a/pkgs/derivations/polycat/default.nix
+++ b/pkgs/derivations/polycat/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     # deepClone = true;
     # leaveDotGit = false;
     url = "https://github.com/2IMT/polycat.git";
-    hash = "sha256-zm5AJEKp9OcAPGYy86R1hxDQu3600zJWsPdQyx0OGKw=";  # replace this with the correct sha256 for the download
+    hash = "sha256-wpDx6hmZe/dLv+F+kbo+YUIZ2A8XgnrZP0amkz6I5IQ=";  # replace this with the correct sha256 for the download
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/wm/mako/mako.nix b/pkgs/wm/mako/mako.nix
index 3ce5f62..64a4428 100644
--- a/pkgs/wm/mako/mako.nix
+++ b/pkgs/wm/mako/mako.nix
@@ -7,42 +7,35 @@
 
   services.mako = {
     enable = true;
-    font = "monospace 14";
-    sort = "-time";
-    width = 350;
-    height = 200;
-    output = "DP-4";
-    # backgroundColor = "#00000080";
-    margin = "20";
-    # outerMargin = "10";
-    markup = true;
-    borderSize = 2;
-    # borderColor = "#ffffff";
-    borderRadius = 15;
-    icons = true;
-    layer = "top";
-    maxIconSize = 64;
-    defaultTimeout = 5000;
-    ignoreTimeout = false;
-    padding = "20";
-    anchor = "top-center";
-    format = "<b>%s</b>\\n%b";
-    actions = true;
-    # textAlignment = "center";
-    extraConfig = ''
-      [urgency=low]
-      border-color=#cccccc
-
-      [urgency=normal]
-      border-color=#d08770
-
-      [urgency=high]
-      border-color=#bf616a
-      default-timeout=0
-
-      [category=mpd]
-      default-timeout=2000
-      group-by=category
-    '';
-  };
+    settings = {
+        font = "monospace 14";
+        sort = "-time";
+        width = 350;
+        height = 200;
+        output = "DP-4";
+        # backgroundColor = "#00000080";
+        margin = 20;
+        # outerMargin = "10";
+        markup = true;
+        borderSize = 2;
+        # borderColor = "#ffffff";
+        borderRadius = 15;
+        icons = true;
+        layer = "top";
+        maxIconSize = 64;
+        defaultTimeout = 5000;
+        ignoreTimeout = false;
+        padding = 20;
+        anchor = "top-center";
+        format = "<b>%s</b>\\n%b";
+        actions = true;
+        # textAlignment = "center";
+        "urgency=low" = { border-color = "#cccccc"; };
+        "urgency=normal" = { border-color = "#d08770"; };
+        "urgency=critical" = { border-color = "#bf616a"; default-timeout = 0; };
+        "category=mpd" = { "default-timeout" = 2000;  group-by = "category"; };
+      };
+    };
+    # '';
+  # };
 }
\ No newline at end of file