From 5a3d2089adbb261e9a3a7f71f4e8a0e2d91ad99f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= <leana.jiang+git@icloud.com>
Date: Mon, 26 May 2025 09:00:12 +0200
Subject: [PATCH] vanadium: move overlays up a level

---
 nix/configurations/vanadium.nix                                 | 2 +-
 nix/configurations/vanadium/{nixos => }/overlay.nix             | 2 +-
 .../vanadium/{nixos => }/patches/fcitx5/disable-clipboard.patch | 0
 .../{nixos => }/patches/fcitx5/disable-quickphrase.patch        | 0
 .../vanadium/{nixos => }/patches/fcitx5/disable-unicode.patch   | 0
 5 files changed, 2 insertions(+), 2 deletions(-)
 rename nix/configurations/vanadium/{nixos => }/overlay.nix (95%)
 rename nix/configurations/vanadium/{nixos => }/patches/fcitx5/disable-clipboard.patch (100%)
 rename nix/configurations/vanadium/{nixos => }/patches/fcitx5/disable-quickphrase.patch (100%)
 rename nix/configurations/vanadium/{nixos => }/patches/fcitx5/disable-unicode.patch (100%)

diff --git a/nix/configurations/vanadium.nix b/nix/configurations/vanadium.nix
index c03ac67a..5e7e4a2d 100644
--- a/nix/configurations/vanadium.nix
+++ b/nix/configurations/vanadium.nix
@@ -45,7 +45,7 @@ in
             ../overlays/nix-tree.nix
 
             ../overlays/packages.nix
-            ./vanadium/nixos/overlay.nix
+            ./vanadium/overlay.nix
 
             # removed, but I need it for PLFA!
             ../overlays/pin-emacs28.nix
diff --git a/nix/configurations/vanadium/nixos/overlay.nix b/nix/configurations/vanadium/overlay.nix
similarity index 95%
rename from nix/configurations/vanadium/nixos/overlay.nix
rename to nix/configurations/vanadium/overlay.nix
index 3acdc8d0..8418a931 100644
--- a/nix/configurations/vanadium/nixos/overlay.nix
+++ b/nix/configurations/vanadium/overlay.nix
@@ -1,5 +1,5 @@
 let
-  sources = import ../../../sources.nix;
+  sources = import ../../sources.nix;
   lib = import (sources.nixpkgs + "/lib");
 
   infuse-lib = import sources.infuse {
diff --git a/nix/configurations/vanadium/nixos/patches/fcitx5/disable-clipboard.patch b/nix/configurations/vanadium/patches/fcitx5/disable-clipboard.patch
similarity index 100%
rename from nix/configurations/vanadium/nixos/patches/fcitx5/disable-clipboard.patch
rename to nix/configurations/vanadium/patches/fcitx5/disable-clipboard.patch
diff --git a/nix/configurations/vanadium/nixos/patches/fcitx5/disable-quickphrase.patch b/nix/configurations/vanadium/patches/fcitx5/disable-quickphrase.patch
similarity index 100%
rename from nix/configurations/vanadium/nixos/patches/fcitx5/disable-quickphrase.patch
rename to nix/configurations/vanadium/patches/fcitx5/disable-quickphrase.patch
diff --git a/nix/configurations/vanadium/nixos/patches/fcitx5/disable-unicode.patch b/nix/configurations/vanadium/patches/fcitx5/disable-unicode.patch
similarity index 100%
rename from nix/configurations/vanadium/nixos/patches/fcitx5/disable-unicode.patch
rename to nix/configurations/vanadium/patches/fcitx5/disable-unicode.patch