From 7b65696436b707ba698cb62525fe8c4ef2ffd286 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Tue, 18 Feb 2025 16:04:26 -0500 Subject: [PATCH] refactor(scoped): fix directory structure --- scopedPackages/dracula/{bat.nix => bat/default.nix} | 0 scopedPackages/dracula/default.nix | 12 ++++++------ scopedPackages/dracula/{git.nix => git/default.nix} | 0 scopedPackages/dracula/{gtk.nix => gtk/default.nix} | 0 .../dracula/{plymouth.nix => plymouth/default.nix} | 0 .../dracula/{sioyek.nix => sioyek/default.nix} | 0 .../dracula/{wallpaper.nix => wallpaper/default.nix} | 0 scopedPackages/mpv-scripts/default.nix | 12 ++++++------ .../default.nix} | 0 .../mpv-scripts/{modernz.nix => modernz/default.nix} | 0 .../default.nix} | 0 .../{pointer-event.nix => pointer-event/default.nix} | 0 .../default.nix} | 0 .../{undo-redo.nix => undo-redo/default.nix} | 0 14 files changed, 12 insertions(+), 12 deletions(-) rename scopedPackages/dracula/{bat.nix => bat/default.nix} (100%) rename scopedPackages/dracula/{git.nix => git/default.nix} (100%) rename scopedPackages/dracula/{gtk.nix => gtk/default.nix} (100%) rename scopedPackages/dracula/{plymouth.nix => plymouth/default.nix} (100%) rename scopedPackages/dracula/{sioyek.nix => sioyek/default.nix} (100%) rename scopedPackages/dracula/{wallpaper.nix => wallpaper/default.nix} (100%) rename scopedPackages/mpv-scripts/{kdialog-open-files.nix => kdialog-open-files/default.nix} (100%) rename scopedPackages/mpv-scripts/{modernz.nix => modernz/default.nix} (100%) rename scopedPackages/mpv-scripts/{persist-properties.nix => persist-properties/default.nix} (100%) rename scopedPackages/mpv-scripts/{pointer-event.nix => pointer-event/default.nix} (100%) rename scopedPackages/mpv-scripts/{touch-gestures.nix => touch-gestures/default.nix} (100%) rename scopedPackages/mpv-scripts/{undo-redo.nix => undo-redo/default.nix} (100%) diff --git a/scopedPackages/dracula/bat.nix b/scopedPackages/dracula/bat/default.nix similarity index 100% rename from scopedPackages/dracula/bat.nix rename to scopedPackages/dracula/bat/default.nix diff --git a/scopedPackages/dracula/default.nix b/scopedPackages/dracula/default.nix index 4129b2b6..8c798f0f 100644 --- a/scopedPackages/dracula/default.nix +++ b/scopedPackages/dracula/default.nix @@ -4,23 +4,23 @@ ... } @ inputs: lib.makeScope pkgs.newScope (drac: { - bat = drac.callPackage ./bat.nix { + bat = drac.callPackage ./bat { inherit (inputs) bat-theme-src mkVersion; }; - git = drac.callPackage ./git.nix { + git = drac.callPackage ./git { inherit (inputs) git-theme-src mkVersion; }; - gtk = import ./gtk.nix {inherit (inputs) gtk-theme-src pkgs;}; + gtk = import ./gtk {inherit (inputs) gtk-theme-src pkgs;}; - plymouth = drac.callPackage ./plymouth.nix { + plymouth = drac.callPackage ./plymouth { inherit (inputs) dracula-plymouth-src mkVersion; }; - sioyek = drac.callPackage ./sioyek.nix { + sioyek = drac.callPackage ./sioyek { inherit (inputs) sioyek-theme-src mkVersion; }; - wallpaper = drac.callPackage ./wallpaper.nix {}; + wallpaper = drac.callPackage ./wallpaper {}; }) diff --git a/scopedPackages/dracula/git.nix b/scopedPackages/dracula/git/default.nix similarity index 100% rename from scopedPackages/dracula/git.nix rename to scopedPackages/dracula/git/default.nix diff --git a/scopedPackages/dracula/gtk.nix b/scopedPackages/dracula/gtk/default.nix similarity index 100% rename from scopedPackages/dracula/gtk.nix rename to scopedPackages/dracula/gtk/default.nix diff --git a/scopedPackages/dracula/plymouth.nix b/scopedPackages/dracula/plymouth/default.nix similarity index 100% rename from scopedPackages/dracula/plymouth.nix rename to scopedPackages/dracula/plymouth/default.nix diff --git a/scopedPackages/dracula/sioyek.nix b/scopedPackages/dracula/sioyek/default.nix similarity index 100% rename from scopedPackages/dracula/sioyek.nix rename to scopedPackages/dracula/sioyek/default.nix diff --git a/scopedPackages/dracula/wallpaper.nix b/scopedPackages/dracula/wallpaper/default.nix similarity index 100% rename from scopedPackages/dracula/wallpaper.nix rename to scopedPackages/dracula/wallpaper/default.nix diff --git a/scopedPackages/mpv-scripts/default.nix b/scopedPackages/mpv-scripts/default.nix index 9b2172b5..1fe86f5c 100644 --- a/scopedPackages/mpv-scripts/default.nix +++ b/scopedPackages/mpv-scripts/default.nix @@ -7,10 +7,10 @@ pkgs.lib.makeScope pkgs.newScope (mpv: let buildLuaScript = file: mpv.callPackage file (inputs // {inherit buildLua;}); in { - modernz = buildLuaScript ./modernz.nix; - pointer-event = buildLuaScript ./pointer-event.nix; - touch-gestures = buildLuaScript ./touch-gestures.nix; - kdialog-open-files = buildLuaScript ./kdialog-open-files.nix; - persist-properties = buildLuaScript ./persist-properties.nix; - undo-redo = buildLuaScript ./undo-redo.nix; + modernz = buildLuaScript ./modernz; + pointer-event = buildLuaScript ./pointer-event; + touch-gestures = buildLuaScript ./touch-gestures; + kdialog-open-files = buildLuaScript ./kdialog-open-files; + persist-properties = buildLuaScript ./persist-properties; + undo-redo = buildLuaScript ./undo-redo; }) diff --git a/scopedPackages/mpv-scripts/kdialog-open-files.nix b/scopedPackages/mpv-scripts/kdialog-open-files/default.nix similarity index 100% rename from scopedPackages/mpv-scripts/kdialog-open-files.nix rename to scopedPackages/mpv-scripts/kdialog-open-files/default.nix diff --git a/scopedPackages/mpv-scripts/modernz.nix b/scopedPackages/mpv-scripts/modernz/default.nix similarity index 100% rename from scopedPackages/mpv-scripts/modernz.nix rename to scopedPackages/mpv-scripts/modernz/default.nix diff --git a/scopedPackages/mpv-scripts/persist-properties.nix b/scopedPackages/mpv-scripts/persist-properties/default.nix similarity index 100% rename from scopedPackages/mpv-scripts/persist-properties.nix rename to scopedPackages/mpv-scripts/persist-properties/default.nix diff --git a/scopedPackages/mpv-scripts/pointer-event.nix b/scopedPackages/mpv-scripts/pointer-event/default.nix similarity index 100% rename from scopedPackages/mpv-scripts/pointer-event.nix rename to scopedPackages/mpv-scripts/pointer-event/default.nix diff --git a/scopedPackages/mpv-scripts/touch-gestures.nix b/scopedPackages/mpv-scripts/touch-gestures/default.nix similarity index 100% rename from scopedPackages/mpv-scripts/touch-gestures.nix rename to scopedPackages/mpv-scripts/touch-gestures/default.nix diff --git a/scopedPackages/mpv-scripts/undo-redo.nix b/scopedPackages/mpv-scripts/undo-redo/default.nix similarity index 100% rename from scopedPackages/mpv-scripts/undo-redo.nix rename to scopedPackages/mpv-scripts/undo-redo/default.nix