From 52549832bc91ffc1bf69fcd7815a575458a51359 Mon Sep 17 00:00:00 2001 From: Christoph Schmatzler Date: Sat, 16 Aug 2025 17:57:30 +0000 Subject: [PATCH] up Signed-off-by: Christoph Schmatzler --- modules/darwin/default.nix | 2 +- modules/{home/darwin => darwin/home}/default.nix | 4 ++-- modules/{home/darwin => darwin/home}/ghostty.nix | 0 modules/nixos/default.nix | 2 +- modules/{home/nixos => nixos/home}/default.nix | 2 +- modules/{home/nixos => nixos/home}/zellij.nix | 0 6 files changed, 5 insertions(+), 5 deletions(-) rename modules/{home/darwin => darwin/home}/default.nix (69%) rename modules/{home/darwin => darwin/home}/ghostty.nix (100%) rename modules/{home/nixos => nixos/home}/default.nix (55%) rename modules/{home/nixos => nixos/home}/zellij.nix (100%) diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix index b4bf5e7..c4e8f85 100644 --- a/modules/darwin/default.nix +++ b/modules/darwin/default.nix @@ -50,7 +50,7 @@ imports = [ nixvim.homeModules.nixvim ../home/default.nix - ../home/darwin/default.nix + ./home/default.nix ]; fonts.fontconfig.enable = true; }; diff --git a/modules/home/darwin/default.nix b/modules/darwin/home/default.nix similarity index 69% rename from modules/home/darwin/default.nix rename to modules/darwin/home/default.nix index 3e9d46a..39700d0 100644 --- a/modules/home/darwin/default.nix +++ b/modules/darwin/home/default.nix @@ -5,14 +5,14 @@ constants, ... }: let - setWallpaperScript = import ../../darwin/lib/wallpaper.nix {inherit pkgs;}; + setWallpaperScript = import ../lib/wallpaper.nix {inherit pkgs;}; in { imports = [ ./ghostty.nix ]; home = { - packages = pkgs.callPackage ../../darwin/packages.nix {}; + packages = pkgs.callPackage ../packages.nix {}; activation = { "setWallpaper" = lib.hm.dag.entryAfter ["revealHomeLibraryDirectory"] '' echo "[+] Setting wallpaper" diff --git a/modules/home/darwin/ghostty.nix b/modules/darwin/home/ghostty.nix similarity index 100% rename from modules/home/darwin/ghostty.nix rename to modules/darwin/home/ghostty.nix diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 69ee099..5ab441d 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -58,7 +58,7 @@ imports = [ nixvim.homeModules.nixvim ../home/default.nix - ../home/nixos/default.nix + ./home/default.nix ]; }; }; diff --git a/modules/home/nixos/default.nix b/modules/nixos/home/default.nix similarity index 55% rename from modules/home/nixos/default.nix rename to modules/nixos/home/default.nix index 4b21ce3..1ab86c0 100644 --- a/modules/home/nixos/default.nix +++ b/modules/nixos/home/default.nix @@ -7,6 +7,6 @@ ]; home = { - packages = pkgs.callPackage ../../nixos/packages.nix {}; + packages = pkgs.callPackage ../packages.nix {}; }; } diff --git a/modules/home/nixos/zellij.nix b/modules/nixos/home/zellij.nix similarity index 100% rename from modules/home/nixos/zellij.nix rename to modules/nixos/home/zellij.nix