massive stylix update

home-manager/modules/alacritty.nix

@@ -1,46 +1,12 @@
-{
+{ lib, ... }: {
   programs.alacritty = {
     enable = true;
     settings = {
       window.opacity = 1.0;
 
       font = {
-        size = 13.0;
-        # draw_bold_text_with_bright_colors = true;
         builtin_box_drawing = true;
-        normal = {
+        normal.style = lib.mkForce "Bold";
-          family = "JetBrains Mono";
-          style = "Bold";
-        };
-      };
-
-      colors = {
-        primary = {
-          # hard contrast background = = '#1d2021'
-          background = "#282828";
-          # soft contrast background = = '#32302f'
-          foreground = "#ebdbb2";
-        };
-        normal = {
-          black   = "#282828";
-          red     = "#cc241d";
-          green   = "#98971a";
-          yellow  = "#d79921";
-          blue    = "#458588";
-          magenta = "#b16286";
-          cyan    = "#689d6a";
-          white   = "#a89984";
-        };
-        bright = {
-          black   = "#928374";
-          red     = "#fb4934";
-          green   = "#b8bb26";
-          yellow  = "#fabd2f";
-          blue    = "#83a598";
-          magenta = "#d3869b";
-          cyan    = "#8ec07c";
-          white   = "#ebdbb2";
-        };
       };
     };
   };

home-manager/modules/cursor.nix

@@ -1,8 +0,0 @@
-{ pkgs, ... }: {
-  home.pointerCursor = {
-    name = "DMZ-Black";
-    size = 36;
-    package = pkgs.vanilla-dmz;
-    gtk.enable = true;
-  };
-}

home-manager/modules/default.nix

@@ -1,7 +1,6 @@
 {
   imports = [
     ./alacritty.nix
-    ./cursor.nix
     ./eza.nix
     ./git.nix
     ./hyprland
@@ -9,7 +8,7 @@
     ./neovim.nix
     ./obsidian.nix
     ./starship.nix
-    # ./stylix.nix
+    ./stylix.nix
     ./swaync
     ./tmux.nix
     ./waybar

home-manager/modules/hyprland/hyprpaper.nix

@@ -1,16 +1,6 @@
 {
-  home.file.".config/wallpaper.png" = {
+  # Wallpaper is configured in ../stylix.nix
-    source = builtins.fetchurl {
-      url = "https://codeberg.org/lunik1/nixos-logo-gruvbox-wallpaper/raw/branch/master/png/gruvbox-dark-rainbow.png";
-      sha256 = "036gqhbf6s5ddgvfbgn6iqbzgizssyf7820m5815b2gd748jw8zc";
-    };
-  };
-
   services.hyprpaper = {
     enable = true;
-    settings = {
-      preload = [ "~/.config/wallpaper.png" ];
-      wallpaper = [ ",~/.config/wallpaper.png" ];
-    };
   };
 }

home-manager/modules/stylix.nix

@@ -1,53 +1,65 @@
 { pkgs, inputs, ... }: {
   imports = [ inputs.stylix.homeManagerModules.stylix ];
+
+  home.packages = with pkgs; [
+    jetbrains-mono
+    noto-fonts
+    noto-fonts-emoji
+    font-awesome
+    powerline-fonts
+    powerline-symbols
+    (nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; })
+  ];
+
   stylix = {
     enable = true;
     polarity = "dark";
-    # base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-material-dark-medium.yaml";
+    base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-medium.yaml";
-    base16Scheme = {
-    #   base00 = "#282828";
-    #   base01 = "#cc241d";
-    #   base02 = "#98971a";
-    #   base03 = "#d79921";
-    #   base04 = "#458588";
-    #   base05 = "#b16286";
-    #   base06 = "#689d6a";
-    #   base07 = "#a89984";
-    #   base08 = "#928374";
-    #   base09 = "#fb4934";
-    #   base0A = "#b8bb26";
-    #   base0B = "#fabd2f";
-    #   base0C = "#83a598";
-    #   base0D = "#d3869b";
-    #   base0E = "#8ec07c";
-    #   base0F = "#ebdbb2";
-    # };
-      base00 = "#282828"; # ----
-      base01 = "#3c3836"; # ---
-      base02 = "#504945"; # --
-      base03 = "#665c54"; # -
-      base04 = "#bdae93"; # +
-      base05 = "#d5c4a1"; # ++
-      base06 = "#ebdbb2"; # +++
-      base07 = "#fbf1c7"; # ++++
-      base08 = "#fb4934"; # red
-      base09 = "#fe8019"; # orange
-      base0A = "#fabd2f"; # yellow
-      base0B = "#b8bb26"; # green
-      base0C = "#8ec07c"; # aqua/cyan
-      base0D = "#83a598"; # blue
-      base0E = "#d3869b"; # purple
-      base0F = "#d65d0e"; # brown
-    };
 
     targets = {
       neovim.enable = false;
       waybar.enable = false;
       wofi.enable = false;
+      hyprland.enable = false;
       hyprlock.enable = false;
     };
 
-    # This doesn't work and idk why
+    cursor = {
+      name = "DMZ-Black";
+      size = 24;
+      package = pkgs.vanilla-dmz;
+    };
+
+    fonts = {
+      emoji = {
+        name = "Noto Color Emoji";
+        package = pkgs.noto-fonts-color-emoji;
+      };
+      monospace = {
+        name = "JetBrains Mono";
+        package = pkgs.jetbrains-mono;
+      };
+      sansSerif = {
+        name = "Noto Sans";
+        package = pkgs.noto-fonts;
+      };
+      serif = {
+        name = "Noto Serif";
+        package = pkgs.noto-fonts;
+      };
+
+      sizes = {
+        terminal = 13;
+      };
+    };
+
+    iconTheme = {
+      enable = true;
+      package = pkgs.papirus-icon-theme;
+      dark = "Papirus-Dark";
+      light = "Papirus-Light";
+    };
+
     image = pkgs.fetchurl {
       url = "hhttps://codeberg.org/lunik1/nixos-logo-gruvbox-wallpaper/raw/branch/master/png/gruvbox-dark-rainbow.pngttps://codeberg.org/lunik1/nixos-logo-gruvbox-wallpaper/raw/branch/master/png/gruvbox-dark-rainbow.png";
       sha256 = "036gqhbf6s5ddgvfbgn6iqbzgizssyf7820m5815b2gd748jw8zc";

home-manager/modules/zathura.nix

@@ -7,8 +7,7 @@
       u = "scroll half_up";
     };
     options = {
-      default-bg = "#282828";
+
-      default-fg = "#ebdbb2";
     };
   };
 }

nixos/packages.nix

@@ -65,14 +65,15 @@
     home-manager
   ];
 
-  fonts.packages = with pkgs; [
+  # Moved to home-manager/modules/stylix.nix
-    jetbrains-mono
+  # fonts.packages = with pkgs; [
-    noto-fonts
+  #   jetbrains-mono
-    noto-fonts-emoji
+  #   noto-fonts
-    twemoji-color-font
+  #   noto-fonts-emoji
-    font-awesome
+  #   twemoji-color-font
-    powerline-fonts
+  #   font-awesome
-    powerline-symbols
+  #   powerline-fonts
-    (nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; })
+  #   powerline-symbols
-  ];
+  #   (nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; })
+  # ];
 }