a lot of work on visuals, overhauled waybar config

modules/sys/environment/stylix.nix

@@ -1,32 +1,14 @@
 {
   pkgs,
-  self,
-	lib,
+	scheme,
+	wallpaper,
   ...
 }: 
 
-let
-  wallpaper = "${self}/media/wallpapers/sine.png";
-
-	# Generate base16 color scheme from wallpaper
-	scheme_string_step1 = pkgs.runCommand "scheme_string" { }''
-		${pkgs.flavours}/bin/flavours generate dark ${wallpaper} --stdout | sed 's/"//g' | sed 's/://' | tail -n 16 > $out
-	'';
-	scheme_string = builtins.readFile scheme_string_step1;
-	scheme_list = lib.filter (x: x != "") (lib.splitString "\n" scheme_string);
-	scheme_set = lib.lists.foldl' (acc: line:
-		let
-			splitLine = lib.splitString " " line;
-			key = builtins.elemAt splitLine 0;
-			value = builtins.elemAt splitLine 1;
-		in
-		acc // { "${key}" = value; }
-	) {} scheme_list;
-in
 {
   stylix = {
     enable = true;
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/chalk.yaml";
+		base16Scheme = scheme;
     image = wallpaper;
     polarity = "dark";
     autoEnable = true;
@@ -35,6 +17,9 @@ in
       console.enable = true;
       feh.enable = true;
       grub.enable = true;
+			gtk.enable = true;
+			nixos-icons.enable = true;
+			nixvim.enable = true;
     };
     cursor = {
       package = pkgs.bibata-cursors;

modules/sys/software/nixvim/options.nix

@@ -1,7 +1,28 @@
-{ config, ... }:
+{ scheme, config, ... }:
 
 {
   programs.nixvim = {
+		colorschemes.base16 = {
+			enable = true;
+			colorscheme = {
+				base00 = "#${scheme.base00}";
+				base01 = "#${scheme.base01}";
+				base02 = "#${scheme.base02}";
+				base03 = "#${scheme.base03}";
+				base04 = "#${scheme.base04}";
+				base05 = "#${scheme.base05}";
+				base06 = "#${scheme.base06}";
+				base07 = "#${scheme.base07}";
+				base08 = "#${scheme.base08}";
+				base09 = "#${scheme.base09}";
+				base0A = "#${scheme.base0A}";
+				base0B = "#${scheme.base0B}";
+				base0C = "#${scheme.base0C}";
+				base0D = "#${scheme.base0D}";
+				base0E = "#${scheme.base0E}";
+				base0F = "#${scheme.base0F}";
+			};
+		};
     enable = true;
     diagnostics.signs = false;
     extraConfigLua = ''