all the work to make stylix work again, just need to update the flake lock when it's time
This commit is contained in:
		
							parent
							
								
									480bdcdcc4
								
							
						
					
					
						commit
						e4839e4d2e
					
				
					 6 changed files with 114 additions and 317 deletions
				
			
		| 
						 | 
				
			
			@ -70,8 +70,8 @@
 | 
			
		|||
  catppuccin = {
 | 
			
		||||
    flavor = "macchiato";
 | 
			
		||||
    tty.enable = true;
 | 
			
		||||
    # sddm.enable = true;
 | 
			
		||||
    # sddm.flavor = "macchiato";
 | 
			
		||||
    sddm.enable = true;
 | 
			
		||||
    sddm.flavor = "macchiato";
 | 
			
		||||
    forgejo.enable = true;
 | 
			
		||||
    forgejo.flavor = "macchiato";
 | 
			
		||||
    # plymouth.enable = false;
 | 
			
		||||
| 
						 | 
				
			
			@ -87,70 +87,70 @@
 | 
			
		|||
    enableBrowserSocket = true;
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  # stylix = {
 | 
			
		||||
  #   enable = true;
 | 
			
		||||
  #   # targets.qt.platform = "kde6";
 | 
			
		||||
  #   autoEnable = true;
 | 
			
		||||
  #   base16Scheme = {
 | 
			
		||||
  #     scheme = "Catppuccin Macchiato";
 | 
			
		||||
  #     author = "https://github.com/catppuccin/catppuccin";
 | 
			
		||||
  #     base00 = "24273a";
 | 
			
		||||
  #     base01 = "1e2030";
 | 
			
		||||
  #     base02 = "363a4f";
 | 
			
		||||
  #     base03 = "494d64";
 | 
			
		||||
  #     base04 = "5b6078";
 | 
			
		||||
  #     base05 = "cad3f5";
 | 
			
		||||
  #     base06 = "f4dbd6";
 | 
			
		||||
  #     base07 = "b7bdf8";
 | 
			
		||||
  #     base08 = "ed8796";
 | 
			
		||||
  #     base09 = "f5a97f";
 | 
			
		||||
  #     base0A = "eed49f";
 | 
			
		||||
  #     base0B = "a6da95";
 | 
			
		||||
  #     base0C = "8bd5ca";
 | 
			
		||||
  #     base0D = "8aadf4";
 | 
			
		||||
  #     base0E = "c6a0f6";
 | 
			
		||||
  #     base0F = "f0c6c6";
 | 
			
		||||
  #   };
 | 
			
		||||
  #   image = ./background.jpg;
 | 
			
		||||
  #   cursor.package = pkgs.catppuccin-cursors.macchiatoMauve;
 | 
			
		||||
  #   cursor.name = "catppuccin-macchiato-mauve-cursors";
 | 
			
		||||
  #   cursor.size = 16;
 | 
			
		||||
  #   homeManagerIntegration.followSystem = true;
 | 
			
		||||
  #   fonts = {
 | 
			
		||||
  #     serif = {
 | 
			
		||||
  #       package = pkgs.dejavu_fonts;
 | 
			
		||||
  #       name = "DejaVu Serif";
 | 
			
		||||
  #     };
 | 
			
		||||
  stylix = {
 | 
			
		||||
    enable = true;
 | 
			
		||||
    autoEnable = true;
 | 
			
		||||
    base16Scheme = {
 | 
			
		||||
      scheme = "Catppuccin Macchiato";
 | 
			
		||||
      author = "https://github.com/catppuccin/catppuccin";
 | 
			
		||||
      base00 = "24273a";
 | 
			
		||||
      base01 = "1e2030";
 | 
			
		||||
      base02 = "363a4f";
 | 
			
		||||
      base03 = "494d64";
 | 
			
		||||
      base04 = "5b6078";
 | 
			
		||||
      base05 = "cad3f5";
 | 
			
		||||
      base06 = "f4dbd6";
 | 
			
		||||
      base07 = "b7bdf8";
 | 
			
		||||
      base08 = "ed8796";
 | 
			
		||||
      base09 = "f5a97f";
 | 
			
		||||
      base0A = "eed49f";
 | 
			
		||||
      base0B = "a6da95";
 | 
			
		||||
      base0C = "8bd5ca";
 | 
			
		||||
      base0D = "8aadf4";
 | 
			
		||||
      base0E = "c6a0f6";
 | 
			
		||||
      base0F = "f0c6c6";
 | 
			
		||||
    };
 | 
			
		||||
    image = ./background.jpg;
 | 
			
		||||
    cursor.package = pkgs.catppuccin-cursors.macchiatoMauve;
 | 
			
		||||
    cursor.name = "catppuccin-macchiato-mauve-cursors";
 | 
			
		||||
    cursor.size = 16;
 | 
			
		||||
    homeManagerIntegration.followSystem = true;
 | 
			
		||||
    fonts = {
 | 
			
		||||
      serif = {
 | 
			
		||||
        package = pkgs.atkinson-hyperlegible;
 | 
			
		||||
        name = "Atkinson Hyperlegible";
 | 
			
		||||
      };
 | 
			
		||||
 | 
			
		||||
  #     monospace = {
 | 
			
		||||
  #       package = pkgs.dejavu_fonts;
 | 
			
		||||
  #       name = "DejaVu Sans Mono";
 | 
			
		||||
  #     };
 | 
			
		||||
      monospace = {
 | 
			
		||||
        package = pkgs.atkinson-monolegible;
 | 
			
		||||
        name = "Atkinson Monolegible";
 | 
			
		||||
      };
 | 
			
		||||
 | 
			
		||||
  #     sansSerif = {
 | 
			
		||||
  #       package = pkgs.dejavu_fonts;
 | 
			
		||||
  #       name = "DejaVu Sans";
 | 
			
		||||
  #     };
 | 
			
		||||
      sansSerif = {
 | 
			
		||||
        package = pkgs.atkinson-hyperlegible;
 | 
			
		||||
        name = "Atkinson Hyperlegible";
 | 
			
		||||
      };
 | 
			
		||||
 | 
			
		||||
  #     emoji = {
 | 
			
		||||
  #       package = pkgs.noto-fonts-emoji-blob-bin;
 | 
			
		||||
  #       name = "Blobmoji";
 | 
			
		||||
  #     };
 | 
			
		||||
  #   };
 | 
			
		||||
  # };
 | 
			
		||||
      emoji = {
 | 
			
		||||
        package = pkgs.noto-fonts-emoji-blob-bin;
 | 
			
		||||
        name = "Blobmoji";
 | 
			
		||||
      };
 | 
			
		||||
    };
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  fonts.packages = [
 | 
			
		||||
    pkgs.atkinson-hyperlegible
 | 
			
		||||
    pkgs.atkinson-monolegible
 | 
			
		||||
    pkgs.noto-fonts-emoji-blob-bin
 | 
			
		||||
    pkgs.noto-fonts
 | 
			
		||||
    pkgs.nerd-fonts.fira-mono
 | 
			
		||||
  ];
 | 
			
		||||
 | 
			
		||||
  fonts.fontconfig.defaultFonts = {
 | 
			
		||||
    emoji = ["Blobmoji"];
 | 
			
		||||
    monospace = ["Atkinson Monolegible"];
 | 
			
		||||
    sansSerif = ["Atkinson Hyperlegible"];
 | 
			
		||||
  };
 | 
			
		||||
  # fonts.fontconfig.defaultFonts = {
 | 
			
		||||
  #   emoji = ["Blobmoji"];
 | 
			
		||||
  #   monospace = ["Atkinson Monolegible"];
 | 
			
		||||
  #   sansSerif = ["Atkinson Hyperlegible"];
 | 
			
		||||
  # };
 | 
			
		||||
 | 
			
		||||
  networking =
 | 
			
		||||
    if config.services.vpn-ip.enable
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue