From ed23d513f832891020c70dd2e8a63df761e3087b Mon Sep 17 00:00:00 2001
From: Sunny <sunnybhowmick0310@gmail.com>
Date: Mon, 16 Mar 2026 15:26:15 +0530
Subject: [PATCH 1/2] added non-flake nix compatibility with flake-compat

---
 default.nix | 11 +++++++++++
 flake.lock  | 17 +++++++++++++++++
 flake.nix   |  4 ++++
 shell.nix   | 11 +++++++++++
 4 files changed, 43 insertions(+)
 create mode 100644 default.nix
 create mode 100644 shell.nix

diff --git a/default.nix b/default.nix
new file mode 100644
index 000000000..a53756e2a
--- /dev/null
+++ b/default.nix
@@ -0,0 +1,11 @@
+(import (
+  let
+    lock = builtins.fromJSON (builtins.readFile ./flake.lock);
+  in
+  fetchTarball {
+    url =
+      lock.nodes.flake-compat.locked.url
+        or "https://github.com/NixOS/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
+    sha256 = lock.nodes.flake-compat.locked.narHash;
+  }
+) { src = ./.; }).defaultNix
diff --git a/flake.lock b/flake.lock
index ee75f2880..56a925f32 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,21 @@
 {
   "nodes": {
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1771369470,
@@ -39,6 +55,7 @@
     },
     "root": {
       "inputs": {
+        "flake-compat": "flake-compat",
         "nixpkgs": "nixpkgs",
         "quickshell": "quickshell"
       }
diff --git a/flake.nix b/flake.nix
index 1a90c2fa7..ba9a98390 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,6 +7,10 @@
       url = "git+https://git.outfoxxed.me/quickshell/quickshell?rev=41828c4180fb921df7992a5405f5ff05d2ac2fff";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    flake-compat = {
+      url = "github:NixOS/flake-compat";
+      flake = false;
+    };
   };
 
   outputs =
diff --git a/shell.nix b/shell.nix
new file mode 100644
index 000000000..fd8a2966f
--- /dev/null
+++ b/shell.nix
@@ -0,0 +1,11 @@
+(import (
+  let
+    lock = builtins.fromJSON (builtins.readFile ./flake.lock);
+  in
+  fetchTarball {
+    url =
+      lock.nodes.flake-compat.locked.url
+        or "https://github.com/NixOS/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
+    sha256 = lock.nodes.flake-compat.locked.narHash;
+  }
+) { src = ./.; }).shellNix

From 1fc590450ef0d4238aa51d74817e0b42abddfc6d Mon Sep 17 00:00:00 2001
From: LuckShiba <luckshiba@protonmail.com>
Date: Fri, 17 Apr 2026 22:36:58 -0300
Subject: [PATCH 2/2] nix: move flake-compat files to distro/nix

---
 default.nix => distro/nix/default.nix | 4 ++--
 shell.nix => distro/nix/shell.nix     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename default.nix => distro/nix/default.nix (71%)
 rename shell.nix => distro/nix/shell.nix (72%)

diff --git a/default.nix b/distro/nix/default.nix
similarity index 71%
rename from default.nix
rename to distro/nix/default.nix
index a53756e2a..10c0d529c 100644
--- a/default.nix
+++ b/distro/nix/default.nix
@@ -1,6 +1,6 @@
 (import (
   let
-    lock = builtins.fromJSON (builtins.readFile ./flake.lock);
+    lock = builtins.fromJSON (builtins.readFile ../../flake.lock);
   in
   fetchTarball {
     url =
@@ -8,4 +8,4 @@
         or "https://github.com/NixOS/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
     sha256 = lock.nodes.flake-compat.locked.narHash;
   }
-) { src = ./.; }).defaultNix
+) { src = ../..; }).defaultNix
diff --git a/shell.nix b/distro/nix/shell.nix
similarity index 72%
rename from shell.nix
rename to distro/nix/shell.nix
index fd8a2966f..478679cfd 100644
--- a/shell.nix
+++ b/distro/nix/shell.nix
@@ -1,6 +1,6 @@
 (import (
   let
-    lock = builtins.fromJSON (builtins.readFile ./flake.lock);
+    lock = builtins.fromJSON (builtins.readFile ../../flake.lock);
   in
   fetchTarball {
     url =
@@ -8,4 +8,4 @@
         or "https://github.com/NixOS/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
     sha256 = lock.nodes.flake-compat.locked.narHash;
   }
-) { src = ./.; }).shellNix
+) { src = ../..; }).shellNix