From 374a0a2d14262342a1322fd0546960b1d9bed9f3 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Fri, 16 Jun 2023 14:03:09 -0400
Subject: [PATCH] meta: Flatten modules directory

---
 {modules/stylix => assets}/wallpaper.png      | Bin
 modules/default.nix                           |  22 +++++++++---------
 .../default.nix => dual-function-keys.nix}    |   0
 .../{fcitx5-mozc/default.nix => fcitx.nix}    |   0
 .../{fish-starship/default.nix => fish.nix}   |   2 +-
 modules/{fonts/default.nix => fonts.nix}      |   0
 .../{hyprland/default.nix => hyprland.nix}    |   2 +-
 .../{librewolf/default.nix => librewolf.nix}  |   0
 modules/{piper/default.nix => piper.nix}      |   0
 .../{pipewire/default.nix => pipewire.nix}    |   0
 modules/{stylix/default.nix => stylix.nix}    |   2 +-
 .../{swaylock/default.nix => swaylock.nix}    |   0
 modules/{thunar/default.nix => thunar.nix}    |   2 +-
 13 files changed, 15 insertions(+), 15 deletions(-)
 rename {modules/stylix => assets}/wallpaper.png (100%)
 rename modules/{dual-function-keys/default.nix => dual-function-keys.nix} (100%)
 rename modules/{fcitx5-mozc/default.nix => fcitx.nix} (100%)
 rename modules/{fish-starship/default.nix => fish.nix} (99%)
 rename modules/{fonts/default.nix => fonts.nix} (100%)
 rename modules/{hyprland/default.nix => hyprland.nix} (99%)
 rename modules/{librewolf/default.nix => librewolf.nix} (100%)
 rename modules/{piper/default.nix => piper.nix} (100%)
 rename modules/{pipewire/default.nix => pipewire.nix} (100%)
 rename modules/{stylix/default.nix => stylix.nix} (94%)
 rename modules/{swaylock/default.nix => swaylock.nix} (100%)
 rename modules/{thunar/default.nix => thunar.nix} (90%)

diff --git a/modules/stylix/wallpaper.png b/assets/wallpaper.png
similarity index 100%
rename from modules/stylix/wallpaper.png
rename to assets/wallpaper.png
diff --git a/modules/default.nix b/modules/default.nix
index d7459d5..113b068 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,15 +1,15 @@
 {
   imports = [
-    ./dual-function-keys
-    ./fcitx5-mozc
-    ./fish-starship
-    ./fonts
-    ./hyprland
-    ./librewolf
-    ./piper
-    ./pipewire
-    ./stylix
-    ./swaylock
-    ./thunar
+    ./dual-function-keys.nix
+    ./fcitx.nix
+    ./fish.nix
+    ./fonts.nix
+    ./hyprland.nix
+    ./librewolf.nix
+    ./piper.nix
+    ./pipewire.nix
+    ./stylix.nix
+    ./swaylock.nix
+    ./thunar.nix
   ];
 }
diff --git a/modules/dual-function-keys/default.nix b/modules/dual-function-keys.nix
similarity index 100%
rename from modules/dual-function-keys/default.nix
rename to modules/dual-function-keys.nix
diff --git a/modules/fcitx5-mozc/default.nix b/modules/fcitx.nix
similarity index 100%
rename from modules/fcitx5-mozc/default.nix
rename to modules/fcitx.nix
diff --git a/modules/fish-starship/default.nix b/modules/fish.nix
similarity index 99%
rename from modules/fish-starship/default.nix
rename to modules/fish.nix
index ecb569d..c35497f 100644
--- a/modules/fish-starship/default.nix
+++ b/modules/fish.nix
@@ -1,6 +1,6 @@
 { pkgs, ... }:
 
-let VARIABLES = import ../../src/variables.nix; in {
+let VARIABLES = import ../src/variables.nix; in {
   users.defaultUserShell = pkgs.fish;
   environment.shells = [ pkgs.fish ];
 
diff --git a/modules/fonts/default.nix b/modules/fonts.nix
similarity index 100%
rename from modules/fonts/default.nix
rename to modules/fonts.nix
diff --git a/modules/hyprland/default.nix b/modules/hyprland.nix
similarity index 99%
rename from modules/hyprland/default.nix
rename to modules/hyprland.nix
index f2602dc..939a11e 100644
--- a/modules/hyprland/default.nix
+++ b/modules/hyprland.nix
@@ -1,6 +1,6 @@
 { pkgs, ... }:
 
-let VARIABLES = import ../../src/variables.nix; in {
+let VARIABLES = import ../src/variables.nix; in {
   programs.hyprland.enable = true;
   services.udisks2 = {
     enable = true;
diff --git a/modules/librewolf/default.nix b/modules/librewolf.nix
similarity index 100%
rename from modules/librewolf/default.nix
rename to modules/librewolf.nix
diff --git a/modules/piper/default.nix b/modules/piper.nix
similarity index 100%
rename from modules/piper/default.nix
rename to modules/piper.nix
diff --git a/modules/pipewire/default.nix b/modules/pipewire.nix
similarity index 100%
rename from modules/pipewire/default.nix
rename to modules/pipewire.nix
diff --git a/modules/stylix/default.nix b/modules/stylix.nix
similarity index 94%
rename from modules/stylix/default.nix
rename to modules/stylix.nix
index a38f278..6d1c52e 100644
--- a/modules/stylix/default.nix
+++ b/modules/stylix.nix
@@ -1,5 +1,5 @@
 { pkgs, ... }: {
-  stylix.image = ./wallpaper.png;
+  stylix.image = ../assets/wallpaper.png;
   stylix.polarity = "dark";
   stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/monokai.yaml";
   stylix.opacity.terminal = 0.92;
diff --git a/modules/swaylock/default.nix b/modules/swaylock.nix
similarity index 100%
rename from modules/swaylock/default.nix
rename to modules/swaylock.nix
diff --git a/modules/thunar/default.nix b/modules/thunar.nix
similarity index 90%
rename from modules/thunar/default.nix
rename to modules/thunar.nix
index c51b910..5e6eccd 100644
--- a/modules/thunar/default.nix
+++ b/modules/thunar.nix
@@ -6,7 +6,7 @@
   environment.systemPackages = with pkgs; [
     xfce.exo # Open with kitty support
     glib
-    (pkgs.callPackage ../../packages/go-thumbnailer { })
+    (pkgs.callPackage ../packages/go-thumbnailer { })
   ];
 
   services.gvfs.enable = true; # Trash support