diff --git a/applications/thunar/default.nix b/applications/thunar/default.nix index 26a748c6..15605aad 100644 --- a/applications/thunar/default.nix +++ b/applications/thunar/default.nix @@ -6,7 +6,7 @@ environment.systemPackages = with pkgs; [ xfce.exo # Open with kitty support glib - (pkgs.callPackage ./go-thumbnailer {}) + (pkgs.callPackage ../../packages/go-thumbnailer { }) ]; services.gvfs.enable = true; # Trash support services.gnome.gnome-keyring.enable = true; # Mount support diff --git a/desktop/default.nix b/desktop/default.nix index 5252fa0c..272996d7 100644 --- a/desktop/default.nix +++ b/desktop/default.nix @@ -7,7 +7,6 @@ ./fcitx5-mozc ./fonts ./hyprland - ./nwg-dock ./pipewire ./rofi ./stylix @@ -25,6 +24,7 @@ swww kickoff greetd.tuigreet + (pkgs.callPackage ../packages/nwg-dock { }) ]; services.greetd = { diff --git a/desktop/nwg-dock/default.nix b/desktop/nwg-dock/default.nix deleted file mode 100644 index 8a02169c..00000000 --- a/desktop/nwg-dock/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ pkgs, ... }: - -{ - environment.systemPackages = with pkgs; [ - (pkgs.callPackage ./package {}) - ]; -} diff --git a/desktop/rofi/default.nix b/desktop/rofi/default.nix index e0a70e73..c4b84717 100644 --- a/desktop/rofi/default.nix +++ b/desktop/rofi/default.nix @@ -5,8 +5,8 @@ programs.rofi = { enable = true; - package = (pkgs.callPackage ./package/wrapper.nix { - rofi-unwrapped = (pkgs.callPackage ./package/wayland.nix { }); + package = (pkgs.callPackage ../../packages/rofi/wrapper.nix { + rofi-unwrapped = (pkgs.callPackage ../../packages/rofi/wayland.nix { }); }); cycle = false; diff --git a/desktop/waybar/default.nix b/desktop/waybar/default.nix index 9726bac6..3ab7ce3f 100644 --- a/desktop/waybar/default.nix +++ b/desktop/waybar/default.nix @@ -4,7 +4,7 @@ home-manager.sharedModules = [{ programs.waybar = { enable = true; - package = (pkgs.callPackage ./package { }); + package = (pkgs.callPackage ../../packages/waybar { }); settings = { mainBar = { diff --git a/games/srb2/default.nix b/games/srb2/default.nix index 870baaea..84a212dc 100644 --- a/games/srb2/default.nix +++ b/games/srb2/default.nix @@ -2,7 +2,7 @@ { environment.systemPackages = with pkgs; [ - (pkgs.callPackage ./package {}) + (pkgs.callPackage ../../packages/srb2 { }) slade ]; } diff --git a/applications/thunar/go-thumbnailer/default.nix b/packages/go-thumbnailer/default.nix similarity index 100% rename from applications/thunar/go-thumbnailer/default.nix rename to packages/go-thumbnailer/default.nix diff --git a/applications/thunar/go-thumbnailer/go.thumbnailer b/packages/go-thumbnailer/go.thumbnailer similarity index 100% rename from applications/thunar/go-thumbnailer/go.thumbnailer rename to packages/go-thumbnailer/go.thumbnailer diff --git a/terminal/joshuto/package/default.nix b/packages/joshuto/default.nix similarity index 100% rename from terminal/joshuto/package/default.nix rename to packages/joshuto/default.nix diff --git a/desktop/nwg-dock/package/default.nix b/packages/nwg-dock/default.nix similarity index 100% rename from desktop/nwg-dock/package/default.nix rename to packages/nwg-dock/default.nix diff --git a/desktop/rofi/package/default.nix b/packages/rofi/default.nix similarity index 100% rename from desktop/rofi/package/default.nix rename to packages/rofi/default.nix diff --git a/desktop/rofi/package/wayland.nix b/packages/rofi/wayland.nix similarity index 100% rename from desktop/rofi/package/wayland.nix rename to packages/rofi/wayland.nix diff --git a/desktop/rofi/package/wrapper.nix b/packages/rofi/wrapper.nix similarity index 100% rename from desktop/rofi/package/wrapper.nix rename to packages/rofi/wrapper.nix diff --git a/games/srb2/package/cmake.patch b/packages/srb2/cmake.patch similarity index 100% rename from games/srb2/package/cmake.patch rename to packages/srb2/cmake.patch diff --git a/games/srb2/package/default.nix b/packages/srb2/default.nix similarity index 100% rename from games/srb2/package/default.nix rename to packages/srb2/default.nix diff --git a/desktop/waybar/package/default.nix b/packages/waybar/default.nix similarity index 100% rename from desktop/waybar/package/default.nix rename to packages/waybar/default.nix diff --git a/terminal/joshuto/default.nix b/terminal/joshuto/default.nix index 94e290a5..51da4476 100644 --- a/terminal/joshuto/default.nix +++ b/terminal/joshuto/default.nix @@ -2,7 +2,7 @@ { environment.systemPackages = [ - (pkgs.callPackage ./package {}) + (pkgs.callPackage ../../packages/joshuto { }) ]; home-manager.sharedModules = [{