From be865cc86fa669b7337bfc5d1f1f02ff918ebd4e Mon Sep 17 00:00:00 2001 From: matt1432 Date: Sat, 3 Aug 2024 20:30:23 -0400 Subject: [PATCH] fix(desktop): adjust paths to newest refactor --- .gitignore | 2 +- apps/update/default.nix | 2 +- nixosModules/ags/default.nix | 4 ++-- nixosModules/desktop/environment/modules/packages.nix | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 6a0138f6..75f521b8 100644 --- a/.gitignore +++ b/.gitignore @@ -13,7 +13,7 @@ result* .nixd.json ## AGS -modules/ags/config/ts/lockscreen/vars.ts +nixosModules/ags/config/ts/lockscreen/vars.ts **/config.js *icons **/types diff --git a/apps/update/default.nix b/apps/update/default.nix index 08146a64..395a42e3 100644 --- a/apps/update/default.nix +++ b/apps/update/default.nix @@ -22,7 +22,7 @@ in npmDepsHash = "sha256-qpnQSJNl68LrsU8foJYxdBXpoFj7VKQahC9DFmleWTs="; runtimeInputs = [ - (callPackage ../../modules/docker/updateImage.nix {}) + (callPackage ../../nixosModules/docker/updateImage.nix {}) mozilla-addons-to-nix.packages.${system}.default ]; nativeBuildInputs = [makeWrapper]; diff --git a/nixosModules/ags/default.nix b/nixosModules/ags/default.nix index 74a3ec4a..010f89f6 100644 --- a/nixosModules/ags/default.nix +++ b/nixosModules/ags/default.nix @@ -46,7 +46,7 @@ in { ''; agsPkg = config.programs.ags.finalPackage; - agsConfigDir = "${removePrefix "/home/${mainUser}/" flakeDir}/modules/ags"; + agsConfigDir = "${removePrefix "/home/${mainUser}/" flakeDir}/nixosModules/ags"; in { assertions = [ { @@ -87,7 +87,7 @@ in { // (mkType astalTray "AstalTray-0.1") // { # Out of store symlinks - ".config/ags".source = mkOutOfStoreSymlink "${flakeDir}/modules/ags/config"; + ".config/ags".source = mkOutOfStoreSymlink "${flakeDir}/nixosModules/ags/config"; # Generated JavaScript files "${agsConfigDir}/config/config.js".text = configJs; diff --git a/nixosModules/desktop/environment/modules/packages.nix b/nixosModules/desktop/environment/modules/packages.nix index e653924b..3cb89756 100644 --- a/nixosModules/desktop/environment/modules/packages.nix +++ b/nixosModules/desktop/environment/modules/packages.nix @@ -43,7 +43,7 @@ in { ({config, ...}: let symlink = config.lib.file.mkOutOfStoreSymlink; - configDir = "${flakeDir}/modules/desktop/desktop-environment/config"; + configDir = "${flakeDir}/nixosModules/desktop/desktop-environment/config"; in { xdg = { configFile = {