From e1a429bdecce81069305d7dcf87c5335694189a4 Mon Sep 17 00:00:00 2001
From: Ivan Kirilov Dimitrov <ivan@idimitrov.dev>
Date: Fri, 2 Aug 2024 19:27:41 +0200
Subject: [PATCH] overlays to module

---
 default.nix               | 13 +++----------
 nixos/modules/default.nix |  2 +-
 overlays/default.nix      | 14 ++++++++++++++
 3 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 overlays/default.nix

diff --git a/default.nix b/default.nix
index 6e9bb99..abbad27 100644
--- a/default.nix
+++ b/default.nix
@@ -1,20 +1,13 @@
 top@{ inputs, ... }: {
-  imports = [ ./nixos ./home ./packages ];
+  imports = [ ./nixos ./home ./packages ./overlays ];
   systems = [ "x86_64-linux" ];
   flake.stateVersion = "24.05";
-  perSystem = perSystem@{ config, system, ... }: {
+  perSystem = perSystem@{ system, ... }: {
     config._module.args = {
       pkgs = import inputs.nixpkgs {
         inherit system;
         overlays = [
-          (final: prev: {
-            nvim = config.packages.nvim;
-            bingwp = config.packages.bingwp;
-            screenshot = config.packages.screenshot;
-            cursors = config.packages.cursors;
-            wpd = config.packages.wpd;
-          })
-          inputs.sal.overlays.default
+          top.config.flake.overlays.default
         ];
       };
     };
diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix
index e064c93..3b8c9df 100644
--- a/nixos/modules/default.nix
+++ b/nixos/modules/default.nix
@@ -18,7 +18,7 @@ top@{ moduleWithSystem, ... }: {
       i18n.supportedLocales = [ "all" ];
       time.timeZone = "Europe/Prague";
       environment = {
-        systemPackages = with pkgs; [ cmatrix uutils-coreutils-noprefix cryptsetup fd file git glibc gnumake mlocate openssh openssl procs ripgrep srm unzip vim zip just ];
+        systemPackages = with pkgs; [ wpd cmatrix uutils-coreutils-noprefix cryptsetup fd file git glibc gnumake mlocate openssh openssl procs ripgrep srm unzip vim zip just ];
         sessionVariables = { MAKEFLAGS = "-j 4"; };
         shells = with pkgs; [ bash zsh nushell ];
       };
diff --git a/overlays/default.nix b/overlays/default.nix
new file mode 100644
index 0000000..5d77b31
--- /dev/null
+++ b/overlays/default.nix
@@ -0,0 +1,14 @@
+top@{ inputs, withSystem, ... }: {
+  flake.overlays.default = final: prev:
+    let system = prev.stdenv.hostPlatform.system; in
+    withSystem system (
+      { config, ... }: {
+        nvim = config.packages.nvim;
+        bingwp = config.packages.bingwp;
+        screenshot = config.packages.screenshot;
+        cursors = config.packages.cursors;
+        wpd = config.packages.wpd;
+        sal = inputs.sal.packages.${system}.default;
+      }
+    );
+}