several changes to home and nixos configs

home-manager/modules/packages.nix

@@ -8,6 +8,7 @@
 
 with lib;
 let
+  fontfile = import ./../../fonts.nix { inherit pkgs; };
   nixGL = config.lib.nixGL.wrap;
   electronFlags = "--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-wayland-ime --disable-gpu-shader-disk-cache -n";
 in
@@ -76,11 +77,8 @@ in
         nil
         nixd
         unrar
-        inputs.w17.packages.x86_64-linux.default
+        # inputs.w17.packages.x86_64-linux.default
         aichat
-        nerd-fonts.jetbrains-mono
-        nerd-fonts.fira-code
-        nerd-fonts.fira-mono
         nix-output-monitor
         nodePackages.pnpm
         npm-check-updates
@@ -102,11 +100,10 @@ in
       ++ (
         if (!config.machine.isGeneric) then
           [
-            toolbox
             distrobox
           ]
         else
-          [ ]
+          fontfile.fonts
       )
       ++ (
         if (config.machine.isGraphical) then
@@ -167,6 +164,8 @@ in
             audacity
             signal-desktop
             telegram-desktop
+            thunderbird
+            gearlever
           ]
         else
           [ ]

home-manager/programs/chromium.nix

@@ -19,7 +19,7 @@ let
     "bmnlcjabgnpnenekpadlanbbkooimhnj" # Honey
     "kbfnbcaeplbcioakkpcpgfkobkghlhen" # Grammarly
   ];
-  isEnabled = if (config.machine.isGraphical && !config.machine.isGeneric) then true else false;
+  isEnabled = if (config.machine.isGraphical) then true else false;
   dictionaries = with pkgs.hunspellDictsChromium; [
     en_US
     de_DE
@@ -33,10 +33,12 @@ let
     "--enable-features=WaylandWindowDecorations,VaapiVideoDecoder,VaapiVideoEncoder,VaapiVideoDecodeLinuxGL,WebRTCPipeWireCapturer"
   ];
   extensions = map (eid: { id = eid; }) chromium_extension;
+  nixGL = config.lib.nixGL.wrap;
 in
 {
   programs.brave = {
     # inherit commandLineArgs;
     enable = isEnabled;
+    package = if (!config.machine.isGeneric) then pkgs.brave else (nixGL pkgs.brave);
   };
 }

home-manager/programs/topgrade.nix

@@ -15,14 +15,15 @@ in
         assume_yes = true;
         ignore_failures = [ "git_repos" ];
         no_retry = true;
-        pre_sudo = false;
-        cleanup = true;
+        pre_sudo = if (config.machine.isGeneric) then false else true;
+        cleanup = if (config.machine.isGeneric) then true else false;
         skip_notify = true;
         disable = [
           "bun"
           "tldr"
           "flutter"
           "nix"
+          "uv"
         ];
       };
       git.repos = [ configPath ];
@@ -32,10 +33,19 @@ in
       pre_commands = {
         flakeUpgrade = "cd ${configPath} && ${pkgs.nixVersions.latest}/bin/nix flake update --commit-lock-file --verbose --repair";
       };
-      post_commands = {
-        nixCollectGarbage = "nix-collect-garbage -d";
-        dockerPrune = "docker system prune -f";
-      };
+      post_commands =
+        {
+          dockerPrune = "docker system prune -f";
+        }
+        // (
+          if (config.machine.isGeneric) then
+            {
+              nixCollectGarbage = "nix-collect-garbage -d";
+            }
+          else
+            {
+            }
+        );
     };
   };
 }

home-manager/programs/zed.nix

@@ -3,5 +3,48 @@
 {
   programs.zed-editor = {
     enable = if (config.machine.isGraphical && !config.machine.isGeneric) then true else false;
+    extensions = [
+      "xy-zed"
+      "nix"
+      "material-icon-theme"
+    ];
+    userSettings = {
+      telemetry = {
+        metrics = false;
+      };
+      theme = {
+        mode = "system";
+        dark = "XY-Zed";
+        light = "XY-Zed";
+      };
+      ui_font_family = "JetBrainsMono Nerd Font";
+      ui_font_size = 16;
+      buffer_font_family = "JetBrainsMono Nerd Font";
+      buffer_font_size = 18;
+      restore_on_startup = "none";
+      auto_update = false;
+      icon_theme = "Material Icon Theme";
+      hour_format = "hour24";
+      tabs = {
+        file_icons = true;
+        git_status = true;
+      };
+      indent_guides = {
+        enable = true;
+      };
+      languages = {
+        Nix = {
+          formatter = {
+            external = {
+              command = "nixfmt";
+              arguments = [
+                "--quiet"
+                "--"
+              ];
+            };
+          };
+        };
+      };
+    };
   };
 }

home-manager/programs/zsh.nix

@@ -5,6 +5,7 @@
     enable = true;
     autosuggestion.enable = true;
     enableCompletion = true;
+    completionInit = "autoload -U compinit && compinit -i";
     enableVteIntegration = true;
     syntaxHighlighting.enable = true;
     shellAliases = {