From 8f8421b2be6f4c75f11d9e6e874accfe0ee098b1 Mon Sep 17 00:00:00 2001 From: NullBite Date: Thu, 23 May 2024 03:14:32 -0400 Subject: [PATCH] home: change some config to use stylix --- home/common/theme.nix | 37 +++++++++++++++++++++++++++++++------ hosts/slab/home.nix | 5 ++++- 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/home/common/theme.nix b/home/common/theme.nix index 5854d3d..f8ad4bd 100644 --- a/home/common/theme.nix +++ b/home/common/theme.nix @@ -76,12 +76,37 @@ in { }; }; - home.pointerCursor = { - package = lib.mkDefault ctp.packages.cursors; - name = lib.mkDefault ctp.names.cursors; - size = lib.mkDefault 24; - x11.enable = lib.mkDefault true; - gtk.enable = lib.mkDefault true; + stylix = { + enable = true; + autoEnable = true; + cursor = { + package = lib.mkDefault ctp.packages.cursors; + name = lib.mkDefault ctp.names.cursors; + size = lib.mkDefault 24; + # x11.enable = lib.mkDefault true; + # gtk.enable = lib.mkDefault true; + }; + + fonts = let + ubuntu = pkgs.ubuntu_font_family; + in { + # packages = with pkgs; [ + # ubuntu_font_family + # noto-fonts-emoji-blob-bin + # ]; + emoji = { + package = pkgs.noto-fonts-emoji-blob-bin; + name = "Blobmoji"; + }; + monospace = { + package = ubuntu; + name = "Ubuntu Mono"; + }; + sansSerif = { + package = ubuntu; + name = "Ubuntu"; + }; + }; }; }; } diff --git a/hosts/slab/home.nix b/hosts/slab/home.nix index 16de53f..e881524 100644 --- a/hosts/slab/home.nix +++ b/hosts/slab/home.nix @@ -16,7 +16,10 @@ }; home.stateVersion = "23.11"; - home.pointerCursor = lib.mkIf config.nixfiles.theming.enable { size = 32; }; + # TODO mkif stylix.enable; danth/stylix#216 + home.pointerCursor = lib.mkIf (config.nixfiles.theming.enable && !config.stylix.enable) { size = 32; }; + stylix.cursor = { size = 32; }; + nixfiles.theming.catppuccin.themeDPI = "hdpi"; wayland.windowManager.hyprland.settings = {