stylix working

flake.nix

@@ -18,21 +18,14 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    hosts = {
-      url = "github:StevenBlack/hosts";
-      #flake = false;
-    };
-
-    hyprland.url = "github:hyprwm/Hyprland";
-    hyprland-plugins = {
-      url = "github:hyprwm/hyprland-plugins";
-      inputs.hyprland.follows = "hyprland";
-      #flake = false;
-    };
-
     zig.url = "github:mitchellh/zig-overlay";
     zls.url = "github:zigtools/zls?rev=a26718049a8657d4da04c331aeced1697bc7652b";
 
+    stylix = {
+      url = "github:danth/stylix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     moonlight = {
       url = "github:moonlight-mod/moonlight"; # Add `/develop` to the flake URL to use nightly.
       inputs.nixpkgs.follows = "nixpkgs";
@@ -52,11 +45,6 @@
 
     nix-index-database.url = "github:nix-community/nix-index-database";
     nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
-
-    chinese-fonts-overlay = {
-      url = "github:brsvh/chinese-fonts-overlay/main";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
   outputs = {
     nixpkgs,
@@ -68,8 +56,20 @@
     overlays = [
       inputs.zig.overlays.default
       inputs.rust-overlay.overlays.default
-      inputs.chinese-fonts-overlay.overlays.default
       inputs.nh.overlays.default
+      #Signal desktop decided to break bc of being outdated on macos :(
+      (
+        final: prev: {
+          signal-desktop-bin = prev.signal-desktop-bin.overrideAttrs (old: {
+            version = "7.51.0";
+
+            src = prev.fetchurl {
+              url = "https://updates.signal.org/desktop/signal-desktop-mac-universal-7.51.0.dmg";
+              hash = "sha256-dUcBvKbGVsEUxOSv8u/jjuvYjHar2+zbv+/ZRS85w1w=";
+            };
+          });
+        }
+      )
     ];
 
     # ----- USER SETTINGS ----- #
@@ -78,13 +78,17 @@
       name = "Natalie"; # name/identifier
       email = "nmarks413@gmail.com"; # email (used for certain configurations)
       dotfilesDir = "~/.dotfiles"; # absolute path of the local repo
+      theme = "catpuccin-mocha"; #name of theme that stylix will use
       browser = "firefox"; # Default browser; must select one from ./user/app/browser/
       term = "ghostty"; # Default terminal command;
-      font = "iosevka Nerd Font"; # Selected font
+      font = "iosevka"; # Selected font
       editor = "neovim"; # Default editor;
       spawnEditor = "exec" + term + " -e " + editor;
       timeZone = "America/Los_Angeles";
       sexuality = "bisexual";
+
+      darwinHost = "laptop";
+      nixosHost = "desktop";
     };
 
     mkSystem = import ./lib/mkSystem.nix {

hosts/desktop/configuration.nix

@@ -1,7 +1,4 @@
 {
-  self,
-  inputs,
-  config,
   pkgs,
   userSettings,
   ...

hosts/laptop/configuration.nix

@@ -1,25 +1,12 @@
-{
-  inputs,
-  config,
-  pkgs,
-  lib,
-  userSettings,
-  ...
-}: {
+{pkgs, ...}: {
   imports = [
-    # ../../modules/macos/icons.nix
     ../../modules/macos/homebrew.nix
   ];
 
-  environment.systemPackages = with pkgs;
-    [
-      neovim
-      pinentry_mac
-    ]
-    ++ callPackage ../shared/packages.nix {};
-
-  # Use a custom configuration.nix location.
-  #environment.darwinConfig = "$HOME/.dotfiles/hosts/laptop";
+  environment.systemPackages = with pkgs; [
+    neovim
+    pinentry_mac
+  ];
 
   # Create /etc/zshrc that loads the nix-darwin environment.
   programs = {

hosts/laptop/home.nix

@@ -4,7 +4,6 @@
   pkgs,
   lib,
   userSettings,
-  systemSettings,
   ...
 }: {
   programs = import ../shared/home-programs.nix {inherit inputs config pkgs lib userSettings;};
@@ -15,7 +14,7 @@
     # shell = pkgs.fish;
     stateVersion = "23.05"; # Please read the comment before changing.
 
-    # packages = pkgs.callPackage ../shared/packages.nix {};
+    packages = pkgs.callPackage ../shared/packages.nix {};
 
     sessionPath = [
       "$HOME/.emacs.d/bin"

hosts/shared/home-programs.nix

@@ -1,8 +1,5 @@
 {
-  inputs,
-  config,
   pkgs,
-  lib,
   userSettings,
   ...
 }: {
@@ -32,20 +29,6 @@
   bat = {
     enable = true;
     extraPackages = with pkgs.bat-extras; [batdiff batman batgrep batwatch batpipe prettybat];
-    config = {
-      theme = "catpuccin";
-    };
-    themes = {
-      catpuccin = {
-        src = pkgs.fetchFromGitHub {
-          owner = "catppuccin";
-          repo = "bat";
-          hash = "sha256-6fWoCH90IGumAMc4buLRWL0N61op+AuMNN9CAR9/OdI=";
-          rev = "699f60fc8ec434574ca7451b444b880430319941";
-        };
-        file = "themes/Catppuccin Mocha.tmTheme";
-      };
-    };
   };
 
   hyfetch = {
@@ -59,13 +42,7 @@
       };
       color_align = {
         mode = "horizontal";
-        # custom_colors = [];
-        # fore_back = null;
       };
-      distro = "nixos";
-      pride_month_shown = [
-      ];
-      pride_month_disable = false;
     };
   };
 

lib/mkSystem.nix

@@ -10,27 +10,21 @@
   darwin ? false,
   extraModules ? [],
 }: let
-  # userSettings = rec {
-  #   username = "nmarks"; # username
-  #   name = "Natalie"; # name/identifier
-  #   email = "nmarks413@gmail.com"; # email (used for certain configurations)
-  #   dotfilesDir = "~/.dotfiles"; # absolute path of the local repo
-  #   browser = "firefox"; # Default browser; must select one from ./user/app/browser/
-  #   term = "ghostty"; # Default terminal command;
-  #   font = "iosevka Nerd Font"; # Selected font
-  #   editor = "neovim"; # Default editor;
-  #   spawnEditor = "exec" + term + "- e " + editor;
-  # };
   nixindex =
     if darwin
     then inputs.nix-index-database.darwinModules.nix-index
     else inputs.nix-index-database.nixosModules.nix-index;
 
+  stylix =
+    if darwin
+    then inputs.stylix.darwinModules.stylix
+    else inputs.stylix.nixosModules.stylix;
+
   systemSettings = rec {
     host =
       if darwin
-      then "laptop"
-      else "desktop";
+      then userSettings.darwinHost
+      else userSettings.nixosHost;
 
     # The config files for this system.
 
@@ -71,9 +65,17 @@ in
           ../modules/shared/extras.nix
           ../modules/shared/nix.nix
 
+          # Link to config.nix
           hostConfig
+
+          #Set up nix-index and enable comma for easy one-shot command use
+          #https://github.com/nix-community/comma
           nixindex
           {programs.nix-index-database.comma.enable = true;}
+
+          #style programs
+          stylix
+
           hmModules.home-manager
           {
             home-manager = {
@@ -99,5 +101,6 @@ in
             };
           }
         ]
+        #Add extra modules depending on system
         ++ extraModules;
     }

modules/macos/homebrew.nix

@@ -1,10 +1,4 @@
-{
-  inputs,
-  config,
-  lib,
-  pkgs,
-  ...
-}: {
+_: {
   # Use homebrew to install casks and Mac App Store apps
   homebrew = {
     enable = true;
@@ -15,10 +9,6 @@
       upgrade = true;
     };
 
-    # taps = [
-    #   "legcord/legcord"
-    # ];
-
     brews = [
       "imagemagick"
       "opam"

modules/nixos/nvidia.nix

@@ -1,5 +1,4 @@
 {
-  lib,
   pkgs,
   config,
   ...

modules/nixos/services.nix

@@ -1,9 +1,4 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: {
+{pkgs, ...}: {
   services = {
     avahi = {
       enable = true;

modules/shared/extras.nix

@@ -1,7 +1,5 @@
 {
   pkgs,
-  config,
-  inputs,
   userSettings,
   ...
 }: {
@@ -26,4 +24,33 @@
     TERMINAL = userSettings.term;
     BROWSER = userSettings.browser;
   };
+
+  stylix = {
+    enable = true;
+    base16Scheme = "${pkgs.base16-schemes}/share/themes/${userSettings.theme}.yaml";
+
+    #   pkgs.fetchurl {
+    #   url = "https://raw.githubusercontent.com/tinted-theming/schemes/refs/heads/spec-0.11/base16/catppuccin-mocha.yaml";
+    #   hash = "sha256-+/adkhwuW/3jCJ3/EWxyz99u13yuTk9Fqqy0YZ4KPPY=";
+    # };
+
+    fonts = {
+      serif = {
+        package = pkgs.nerd-fonts.${userSettings.font};
+        name = "Iosevka Nerd Font";
+      };
+      sansSerif = {
+        package = pkgs.nerd-fonts.${userSettings.font};
+        name = "Iosevka Nerd Font";
+      };
+      monospace = {
+        package = pkgs.nerd-fonts.${userSettings.font};
+        name = "Iosevka Nerd Font";
+      };
+      emoji = {
+        package = pkgs.twemoji-color-font;
+        name = "Twemoji Color";
+      };
+    };
+  };
 }

modules/shared/nix.nix

@@ -1,8 +1,4 @@
-{
-  config,
-  inputs,
-  ...
-}: {
+{inputs, ...}: {
   nixpkgs.config = {
     allowUnfree = true;
   };