1 files changed, 24 insertions, 43 deletions

diff --git a/home-manager/home.nix b/home-manager/home.nix
index b46d8ba..10f46be 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -1,11 +1,27 @@
-{ username, pkgs, lib, ... }:
-
+{ username, nix-colors, config, pkgs, lib, ... }:
 let
   nvim-spell-pl-utf8-dict = builtins.fetchurl {
     url = "http://ftp.vim.org/vim/runtime/spell/pl.utf-8.spl";
     sha256 = "1sg7hnjkvhilvh0sidjw5ciih0vdia9vas8vfrd9vxnk9ij51khl";
   };
+
+  lux-scheme = builtins.fetchurl {
+    url = "https://git.jptrzy.xyz/lux-theme/plain/lux-theme.yaml?h=main";
+  };
+
+  nix-colors-lib = nix-colors.lib.contrib { inherit pkgs; };
+
+  schemeFromYaml = import ./schemeFromYAML.nix;
 in {
+  imports = [
+    nix-colors.homeManagerModules.default
+   ./firefox.nix
+   ./addons/alacritty.nix
+   ./addons/xresources.nix
+  ];
+
+  colorScheme = schemeFromYaml "lux-scheme" (builtins.readFile lux-scheme);
+
   home.username = "${username}";
   home.homeDirectory = "/home/${username}";
 
@@ -45,41 +61,6 @@ in {
     ".config/nvim/spell/pl.utf-8.spl".source = nvim-spell-pl-utf8-dict;
 
     ".config/sx/sxrc".source = ./sxrc;
-    ".config/Xresources".source = ./.Xresources;
-
-    ".config/alacritty/alacritty.yml".text = ''
-      font:
-        normal:
-          family: Neo Comic Mono
-          style: Regular
-        bold:
-          family: Neo Comic Mono
-          style: Bold
-        size: 12
-
-      colors:
-        primary:
-          background: '0x181921'
-          foreground: '0xeceadd'
-        normal:
-          black:   '0x090618'
-          red:     '0xe32929'
-          green:   '0xbdcc27'
-          yellow:  '0xff920d'
-          blue:    '0x1984db'
-          magenta: '0xaf18db'
-          cyan:    '0x55c8b9'
-          white:   '0x9ca7b2'
-        bright:
-          black:   '0x413e53'
-          red:     '0xd94545'
-          green:   '0xbac455'
-          yellow:  '0xe59e46'
-          blue:    '0x5a9dd4'
-          magenta: '0xba5ac9'
-          cyan:    '0x61b5aa'
-          white:   '0xf1f1f1'
-    '';
 
     ".local/share/gnupg/gpg-agent.conf".text = ''
       debug-pinentry
@@ -107,13 +88,15 @@ in {
     font.name = "Neo Comic Mono 12";
 
     theme = {
-      name = "Flat-Remix-GTK-Violet-Dark";
-      package = pkgs.flat-remix-gtk;
+      name = "lux-scheme";
+      package = nix-colors-lib.gtkThemeFromScheme {
+        scheme = config.colorScheme;
+      };
     };
 
     iconTheme = {
-      name = "Flat-Remix-Violet-Dark";
-      package = pkgs.flat-remix-icon-theme;
+      name = "Adwaita";
+      package = pkgs.gnome.adwaita-icon-theme;
     };
 
     cursorTheme = {
@@ -176,6 +159,4 @@ in {
       };
     };
   };
-
-  imports = [ ./firefox.nix ];
 }