From de81dc1f588f12e9c2231041cac20c00fd7e1abb Mon Sep 17 00:00:00 2001
From: Asmir A <asmir.abdulahovic@gmail.com>
Date: Fri, 29 Sep 2023 20:59:39 +0200
Subject: [PATCH] flake: adjust paths for new layout, add packages followin
 nixpkgs

---
 flake.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/flake.nix b/flake.nix
index 70591aa..8b059c4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,9 +3,16 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    caps2esc.url = "gitlab:asmir.abdulahovic/caps2esc";
-    nix-xilinx.url = "gitlab:asmir.abdulahovic/nix-xilinx";
-    peerix.url = "gitlab:asmir.abdulahovic/peerix";
+
+    nix-xilinx = {
+      url = "gitlab:asmir.abdulahovic/nix-xilinx";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    peerix = {
+      url = "gitlab:asmir.abdulahovic/peerix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     zremap = {
       url = "gitlab:asmir.abdulahovic/zremap";
@@ -25,7 +32,6 @@
 
   outputs = inputs @ {
     nixpkgs,
-    caps2esc,
     home-manager,
     nix-xilinx,
     peerix,
@@ -40,9 +46,9 @@
         system = "x86_64-linux";
         modules = [
           {_module.args = inputs;}
-          ./configuration.nix
+          ./nixy/configuration.nix
+          ./nixy/hardware-configuration.nix
           ./packages.nix
-          ./hardware-configuration.nix
           sops-nix.nixosModules.sops
           home-manager.nixosModules.home-manager
           {