Home Manager 25.05

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

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
 ]

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
 ]

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";

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 ];

pkgs/wm/mako/mako.nix

@@ -7,13 +7,14 @@
 
   services.mako = {
     enable = true;
+    settings = {
         font = "monospace 14";
         sort = "-time";
         width = 350;
         height = 200;
         output = "DP-4";
         # backgroundColor = "#00000080";
-    margin = "20";
+        margin = 20;
         # outerMargin = "10";
         markup = true;
         borderSize = 2;
@@ -24,25 +25,17 @@
         maxIconSize = 64;
         defaultTimeout = 5000;
         ignoreTimeout = false;
-    padding = "20";
+        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
-    '';
+        "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"; };
       };
+    };
+    # '';
+  # };
 }