diff --git a/pkgs/editor/clan-edit-codium.nix b/pkgs/editor/clan-edit-codium.nix index d85ea11ba..d9d1d1c4e 100644 --- a/pkgs/editor/clan-edit-codium.nix +++ b/pkgs/editor/clan-edit-codium.nix @@ -37,4 +37,6 @@ writeShellApplication { exec ${lib.getExe codium} --user-data-dir "$DATA_DIR" "$@" ''; + + derivationArgs.passthru.completion-options = import ./completion-options.nix; } diff --git a/options.nix b/pkgs/editor/completion-options.nix similarity index 85% rename from options.nix rename to pkgs/editor/completion-options.nix index 7a5612c3d..17d9c8c41 100644 --- a/options.nix +++ b/pkgs/editor/completion-options.nix @@ -1,7 +1,7 @@ let flake = builtins.getFlake "https://git.clan.lol/clan/clan-core/archive/main.tar.gz"; nixpkgs = flake.inputs.nixpkgs; - pkgs = flake.inputs.nixpkgs.legacyPackages.${builtins.currentSystem}; + pkgs = nixpkgs.legacyPackages.${builtins.currentSystem}; clanCore = flake.outputs.nixosModules.clanCore; clanModules = flake.outputs.clanModules; allNixosModules = (import "${nixpkgs}/nixos/modules/module-list.nix") ++ [ @@ -10,7 +10,7 @@ let ]; clanCoreNixosModules = [ clanCore - { clanCore.clanDir = ./.; } + # { clanCore.clanDir = ./.; } ] ++ allNixosModules ++ (builtins.attrValues clanModules); clanCoreNixos = pkgs.nixos { imports = clanCoreNixosModules; }; in diff --git a/pkgs/editor/settings.json b/pkgs/editor/settings.json index eba9bba8b..31e414ccf 100644 --- a/pkgs/editor/settings.json +++ b/pkgs/editor/settings.json @@ -14,9 +14,12 @@ = (import ) ++ [ ({...}: { nixpkgs.hostPlatform = builtins.currentSystem;} ) ] ; })).options" }, - "home-manager": { - "expr": "(builtins.getFlake \"github:nix-community/home-manager\").homeConfigurations..options" - } + "clan": { + "expr": "let pkgs = import { }; flake = builtins.getFlake \"https://git.clan.lol/clan/clan-core/archive/main.tar.gz\"; clanCore = flake.outputs.nixosModules.clanCore; clanModules = flake.outputs.clanModules; allNixosModules = (import ) ++ [ {nixpkgs.hostPlatform = \"x86_64-linux\";}]; clanCoreNixosModules = [clanCore] ++ allNixosModules ++ (builtins.attrValues clanModules); clanCoreNixos = pkgs.nixos { imports = clanCoreNixosModules;}; in clanCoreNixos.options" + }, + "clan-core": { + "expr": "(builtins.getFlake \"/home/kenji/git/clan-projects/clan-core\").packages.x86_64-linux.editor.passthru.completion-options", + }, } } }