fix stylix config for mayer

hosts/chernobog/default.nix

···
       comic-relief
     ];
     fontconfig.defaultFonts = {
-      serif = ["Comic Relief" "Noto Serif" "Source Han Serif"];
-      sansSerif = ["Comic Relief" "Noto Sans" "Source Han Sans"];
-      monospace = ["Comic Mono"];
+      serif = [
+        "Comic Relief"
+        "Noto Serif"
+        "Source Han Serif"
+      ];
+      sansSerif = [
+        "Comic Relief"
+        "Noto Sans"
+        "Source Han Sans"
+      ];
+      monospace = [ "Comic Mono" ];
     };
   };
 

hosts/chernobog/modules/auto-mount.nix

···
 {
   services.udisks2.enable = true;
-  home-manager.sharedModules = [{
-    services.udiskie.enable = true;
-  }];
+  home-manager.sharedModules = [
+    {
+      services.udiskie.enable = true;
+    }
+  ];
 }

hosts/chernobog/modules/boot.nix

···
     enable = true;
     editor = false;
     configurationLimit = 20;
+    consoleMode = "max";
   };
   boot.loader.efi.canTouchEfiVariables = true;
 }

hosts/chernobog/modules/lact.nix/default.nix

···
 {
+  hardware.amdgpu.overdrive.enable = true;
+
   services.lact.enable = true;
   environment.etc."lact/config.yaml".source = ./config.yaml;
 }

hosts/chernobog/modules/network.nix

···
 {
-  imports = [ ../../../modules/network/dns ];
+  imports = [ ../../../modules/network/dns/systemd.nix ];
 
   networking.useDHCP = true;
 }

modules/network/dns/systemd.nix

···
+{
+  networking.nameservers = [
+    "1.1.1.1"
+    "1.0.0.1"
+  ];
+
+  services.resolved = {
+    enable = true;
+    dnssec = "true";
+    domains = [ "~." ];
+    fallbackDns = [
+      "1.1.1.1"
+      "1.0.0.1"
+    ];
+    dnsovertls = "true";
+  };
+}

modules/network/tailscale.nix

···
+{ lib, ... }:
 {
   services.tailscale = {
     enable = true;
     port = 41641;
     extraSetFlags = [ "--advertise-exit-node" ];
-    extraUpFlags = [ "--ssh" ];
+    # extraUpFlags = [ "--ssh" ];
     extraDaemonFlags = [ "--no-logs-no-support" ];
     useRoutingFeatures = "both";
     openFirewall = true;
   };
+
+  networking.interfaces.tailscale0.useDHCP = lib.mkForce false;
 }

users/mayer/default.nix

···
   nixosConfig = globalAttrs.config;
 in
 {
+  imports = [ ./stylix.nix ];
+
   users.users.mayer = {
     isNormalUser = true;
     createHome = true;
···
   security.polkit.enable = true;
 
   security.pam.loginLimits = [
-    { domain = "@users"; item = "rtprio"; type = "-"; value = 1; }
+    {
+      domain = "@users";
+      item = "rtprio";
+      type = "-";
+      value = 1;
+    }
   ];
 
   home-manager.users.mayer =
···
             ]
             # dev stuff
             [
+              "zed"
               "helix"
               "git"
               "ssh"
···
         in
         l.flatten [
           (tlib.prefixStrings "${inputs.self}/users/modules/" modulesToEnable)
-          ./stylix.nix
         ];
 
       home = {
···
       };
 
       fonts.fontconfig.enable = l.mkForce true;
-
-      settings.iconTheme = {
-        name = "Yaru-dark";
-        package = pkgs.yaru-theme;
-      };
-
-      home.pointerCursor = {
-        package = pkgs.bibata-cursors;
-        name = "Bibata-Modern-Classic";
-        size = 24;
-        gtk.enable = true;
-        x11.enable = true;
-      };
-      gtk.enable = true;
-      gtk.theme.package = pkgs.yaru-theme;
-      gtk.theme.name = "Yaru-dark";
 
       programs.git.includes = [
         {

users/mayer/stylix.conf.nix

···
+{
+  config,
+  pkgs,
+  ...
+}:
+{
+  stylix.enable = true;
+  stylix.autoEnable = false;
+
+  stylix.targets = {
+    console.enable = true;
+    fontconfig.enable = true;
+    font-packages.enable = true;
+    qt.enable = true;
+    gnome.enable = true;
+    gtk.enable = true;
+  };
+
+  stylix.image = ./wallpaper.png;
+  stylix.polarity = "dark";
+  stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
+
+  stylix.cursor = {
+    package = pkgs.bibata-cursors;
+    name = "Bibata-Modern-Classic";
+    size = 24;
+  };
+
+  stylix.fonts = {
+    serif = {
+      name = "Comic Relief";
+      package = pkgs.comic-relief;
+    };
+    sansSerif = config.stylix.fonts.serif;
+    monospace = {
+      name = "Comic Mono";
+      package = pkgs.comic-mono;
+    };
+  };
+
+  stylix.fonts.sizes = {
+    popups = 13;
+    terminal = 13;
+  };
+
+  stylix.opacity = {
+    terminal = 0.7;
+    applications = 0.9;
+    desktop = 0.9;
+    popups = 0.9;
+  };
+
+  stylix.icons = {
+    enable = true;
+    dark = "Yaru-dark";
+    light = "Yaru";
+    package = pkgs.yaru-theme;
+  };
+}

users/mayer/stylix.home.nix

···
+{
+  inputs,
+  ...
+}:
+{
+  imports = [
+    (import inputs.stylix).homeModules.stylix
+    ./stylix.conf.nix
+  ];
+}

users/mayer/stylix.nix

···
 {
   inputs,
-  config,
-  pkgs,
-  terra,
-  lib,
   ...
 }:
 {
-  imports = [ (import inputs.stylix).homeModules.stylix ];
-
-  stylix.image = ./wallpaper.png;
-  stylix.polarity = "dark";
-  stylix.base16Scheme =
-    let
-      night = "#2b292d";
-      ash = "#383539";
-      umber = "#4d424b";
-      bark = "#6F5D63";
-      mist = "#D1D1E0";
-      sage = "#B1B695";
-      blush = "#fecdb2";
-      coral = "#ffa07a";
-      rose = "#F6B6C9";
-      ember = "#e06b75";
-      honey = "#F5D76E";
-    in
-    {
-      base00 = night;
-      base01 = ash;
-      base02 = umber;
-      base03 = bark;
-      base04 = blush;
-      base05 = mist;
-      base06 = mist;
-      base07 = bark;
-      base08 = ember;
-      base09 = honey;
-      base0A = rose;
-      base0B = sage;
-      base0C = bark;
-      base0D = coral;
-      base0E = blush;
-      base0F = umber;
-    };
-
-  stylix.fonts = {
-    serif = {
-      name = "Comic Relief";
-      package = pkgs.comic-relief;
-    };
-    sansSerif = config.stylix.fonts.serif;
-    monospace = {
-      name = "Comic Mono";
-      package = terra.comic-mono;
-    };
-  };
-
-  stylix.fonts.sizes = {
-    popups = 13;
-    terminal = 13;
-  };
+  imports = [
+    (import inputs.stylix).nixosModules.stylix
+    ./stylix.conf.nix
+  ];
 }

users/modules/foot/default.nix

···
     package = pkgs.foot;
     server.enable = true;
     settings = {
-      colors = {
-        alpha = 0.7;
-        background = "000000";
-      };
+      # colors = {
+      #   alpha = 0.7;
+      #   background = "000000";
+      # };
       main = {
         # login-shell = "yes";
         dpi-aware = lib.mkForce "yes";
-        font = "Comic Mono:size=12";
       };
       csd = {
         preferred = "client";
···
       bell.system = "no";
     };
   };
+  stylix.targets.foot.enable = true;
 }

users/modules/helix/default.nix

···
 {
-  # stylix.targets.helix.enable = false;
+  stylix.targets.helix.enable = true;
   programs.helix = {
     enable = true;
     languages.language = [
···
       }
     ];
     settings = {
-      theme = "ferra";
       editor = {
         soft-wrap.enable = true;
         line-number = "relative";

users/modules/mako/default.nix

···
 { ... }:
 {
-  programs.mako = {
+  stylix.targets.mako.enable = true;
+  services.mako = {
     enable = true;
-    anchor = "top-center";
-    borderRadius = 16;
+    settings = {
+      anchor = "top-right";
+      border-radius = 2;
+      default-timeout = 4000;
+    };
   };
 }

users/modules/nushell/default.nix

···
 {
   home.shell.enableNushellIntegration = true;
 
+  stylix.targets.nushell.enable = true;
   programs.carapace.enable = true;
   programs.nushell = {
     enable = true;

users/modules/rofi/default.nix

···
 { pkgs, ... }:
 {
+  stylix.targets.rofi.enable = true;
   programs.rofi = {
     enable = true;
+    package = pkgs.rofi.overrideAttrs (old: rec {
+      buildInputs = builtins.filter (x: x.pname != "gdk-pixbuf") old.buildInputs;
+    });
   };
 }

users/modules/settings/default.nix

···
       type = t.bool;
       default = true;
     };
-    settings.iconTheme = {
-      name = l.mkOption {
-        type = t.str;
-      };
-      package = l.mkOption {
-        type = t.package;
-      };
-    };
     settings.terminal = {
       name = l.mkOption {
         type = t.str;
···
         type = t.path;
       };
     };
-  };
-
-  config = l.mkIf cfg.enable {
-    gtk.iconTheme = cfg.iconTheme;
   };
 }

users/modules/sway/default.nix

···
     ../wayland
     ../swaylock
     ../wlsunset
-    ../dunst
+    ../mako
     ../rofi
     # ./swayidle.nix
   ];
 
+  stylix.targets.sway.enable = true;
   wayland.windowManager = {
     sway =
       let
···
       {
         enable = true;
         wrapperFeatures.gtk = true;
-        systemd.variables = ["--all"];
+        systemd.variables = [ "--all" ];
         config = {
           bars = [ ];
           window = {
···
             };
           input = {
             "13364:832:Keychron_Keychron_V4_Keyboard" = {
-              xkb_layout = nixosConfig.services.xserver.layout;
+              xkb_layout = nixosConfig.services.xserver.xkb.layout;
             };
             "1:1:AT_Translated_Set_2_keyboard" = {
               xkb_layout = "tr";
···
         };
       };
   };
-}
+}

users/modules/swaylock/default.nix

···
 { pkgs, ... }:
 {
+  stylix.targets.swaylock.enable = true;
   programs.swaylock = {
     package = pkgs.swaylock-effects;
     settings = {

users/modules/zed/default.nix

···
+{ pkgs, ... }:
+{
+  stylix.targets.zed.enable = true;
+  programs.zed-editor = {
+    enable = true;
+    extensions = [ "nix" ];
+    extraPackages = with pkgs; [ nixd ];
+    installRemoteServer = true;
+  };
+}