refactor: migrate to stylix (#71)

zakuciael · May 20, 2024 · e2b5149 · e2b5149
1 parent a55a741
commit e2b5149
Show file tree

Hide file tree

Showing 7 changed files with 255 additions and 44 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -44,6 +44,11 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-utils.follows = "flake-utils";
     };
+    stylix = {
+      url = "github:danth/stylix/release-23.11";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.home-manager.follows = "home-manager";
+    };
     nil = {
       url = "github:oxalica/nil";
       inputs.nixpkgs.follows = "nixpkgs-unstable";
@@ -86,8 +91,12 @@
           // {packages = flakeInputs.nostale-dev-env.packages.${system};};
         age-plugin-op =
           flakeInputs.age-plugin-op.packages.${system}
+          // {default = flakeInputs.age-plugin-op.packages.${system}.age-plugin-op;};
+        stylix =
+          flakeInputs.stylix
           // {
-            default = flakeInputs.age-plugin-op.packages.${system}.age-plugin-op;
+            packages = flakeInputs.stylix.packages.${system};
+            nixosModules = flakeInputs.stylix.nixosModules // {default = flakeInputs.stylix.nixosModules.stylix;};
           };
       };
 
@@ -104,5 +113,7 @@
       mappedHosts = builtins.mapAttrs (n: v: mkHost {name = n;}) hosts;
     in
       mappedHosts;
+
+    inherit pkgs lib inputs;
   };
 }
diff --git a/hosts/pc/configuration.nix b/hosts/pc/configuration.nix
@@ -1,11 +1,14 @@
 {
+  config,
   lib,
   inputs,
   username,
   dotfiles,
   ...
 }:
-with lib.my; {
+with lib.my; let
+  colorScheme = inputs.nix-colors.colorSchemes.catppuccin-mocha;
+in {
   imports = [./hardware.nix ./networking.nix];
 
   environment = {
@@ -14,7 +17,15 @@ with lib.my; {
     };
   };
 
-  home-manager.users.${username}.colorScheme = inputs.nix-colors.colorSchemes.catppuccin-mocha;
+  home-manager.users.${username} = {
+    inherit colorScheme;
+    stylix.base16Scheme = colorScheme;
+    stylix.autoEnable = false;
+  };
+
+  stylix.image = ""; # Workaround for Stylix requirement for this to be set.
+  stylix.base16Scheme = colorScheme;
+  stylix.autoEnable = false;
 
   # Configure Secret Managment through sops-nix.
   sops.age.keyFile = "/home/${username}/.config/sops/age/keys.txt";

diff --git a/lib/hosts.nix b/lib/hosts.nix
@@ -28,6 +28,7 @@ with lib.my; {
 
           inputs.home-manager.nixosModules.default
           inputs.sops-nix.nixosModules.default
+          inputs.stylix.nixosModules.default
         ]
         ++ (utils.recursiveReadDir ./../modules {
           ignoredDirs = ["apps"];

diff --git a/modules/desktop/apps/alacritty.nix b/modules/desktop/apps/alacritty.nix
@@ -1,49 +1,19 @@
 {
-  lib,
   pkgs,
   username,
-  colorScheme,
   ...
-}:
-with lib; {
-  home-manager.users.${username}.programs.alacritty = {
-    enable = true;
-    settings = {
-      general = {
-        shell = "${pkgs.fish}/bin/fish";
-        "live_config_reload" = false;
-      };
-      env.TERM = "xterm-256color";
+}: {
+  home-manager.users.${username} = {
+    stylix.targets.alacritty.enable = true;
 
-      colors = with colorScheme.palette; {
-        bright = {
-          black = "0x${base00}";
-          blue = "0x${base0D}";
-          cyan = "0x${base0C}";
-          green = "0x${base0B}";
-          magenta = "0x${base0E}";
-          red = "0x${base08}";
-          white = "0x${base06}";
-          yellow = "0x${base09}";
-        };
-        cursor = {
-          cursor = "0x${base06}";
-          text = "0x${base06}";
-        };
-        normal = {
-          black = "0x${base00}";
-          blue = "0x${base0D}";
-          cyan = "0x${base0C}";
-          green = "0x${base0B}";
-          magenta = "0x${base0E}";
-          red = "0x${base08}";
-          white = "0x${base06}";
-          yellow = "0x${base0A}";
-        };
-        primary = {
-          background = "0x${base00}";
-          foreground = "0x${base06}";
+    programs.alacritty = {
+      enable = true;
+      settings = {
+        general = {
+          shell = "${pkgs.fish}/bin/fish";
+          "live_config_reload" = false;
         };
+        env.TERM = "xterm-256color";
       };
     };
   };