Commit Graph

6972 Commits

Author SHA1 Message Date
lassulus
47ba924b6b Merge pull request 'clan_cli flake: get selectLib as path: as well' (#3675) from select-as-path into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3675
2025-05-16 10:22:24 +00:00
lassulus
89c59b5358 clan_cli flake: get selectLib as path: as well
This is needed so older nix versions can get select in a pure way. Since
non path: paths can never be pure on older nix versions
2025-05-16 11:37:22 +02:00
hsjobeki
2544e8df8c Merge pull request 'clan-cli: Unify list_machines and use flake caching' (#3673) from Qubasa/clan-core:fix_ui_stuff into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3673
2025-05-16 09:08:59 +00:00
Qubasa
2f0114a236 clan-cli: Unify list_machines and use flake caching 2025-05-16 10:47:49 +02:00
renovate[bot]
507fba8ede chore(deps): update nix-darwin digest to 8817b00 2025-05-16 03:40:10 +00:00
clan-bot
a5f27f926e Merge pull request 'Update Clan Core for Checks' (#3671) from update-clan-core-for-checks into main 2025-05-16 03:00:46 +00:00
clan-bot
219daad626 Update pinned clan-core for checks 2025-05-16 02:51:34 +00:00
renovate[bot]
c9199a5874 chore(deps): update data-mesher digest to 7afcd6f 2025-05-15 17:50:25 +00:00
renovate[bot]
b5ad166cf7 chore(deps): update nixpkgs digest to b1bebd0 2025-05-15 17:30:26 +00:00
Mic92
1d35c5241c Merge pull request 'Merge clan-app and ui environment into one' (#3661) from feat/web-ui-process-compose into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3661
Reviewed-by: brianmcgee <brian@bmcgee.ie>
2025-05-15 13:19:31 +00:00
Jörg Thalheim
9e8fefc64b clan-app/devshell: remove duplicate python3
we already get python3 from the frontend.
2025-05-15 15:03:35 +02:00
Jörg Thalheim
70409070e6 fix references in reload-python-api script 2025-05-15 15:03:05 +02:00
Jörg Thalheim
a2d86844b8 remove generated files from git. 2025-05-15 14:56:04 +02:00
Jörg Thalheim
f5249a6448 clan-app/README: more robust process-compose command
I had port conflicts with tcp, so let's use unix socket by default.
Also added --keep-project to make trouble-shouting easier in case
something is wrong.
2025-05-15 14:56:04 +02:00
Jörg Thalheim
28972a60d1 clan-app/ui: remove unused .envrc
this has been merged into clan-app's envrc
2025-05-15 14:56:04 +02:00
Jörg Thalheim
de0f78b0d2 clan-ui: remove intermediate app directory 2025-05-15 14:56:04 +02:00
Jörg Thalheim
3f7894ef03 clan-app: filter out unrelated files from build
this should help for faster ci builds.
2025-05-15 14:43:51 +02:00
Jörg Thalheim
3369e56d35 process-compose: simplify environment
we already are in the right devshell for clan-app, so we no longer need
direnv exec. Instead of depending on implicit enviroment variables we
can run change the directory based on the git root as this is easier to
read and follow.
2025-05-15 14:43:51 +02:00
Jörg Thalheim
bebab7691f devshells.clan-app: require less environment variables
also sort shellHook by component
2025-05-15 14:43:51 +02:00
Jörg Thalheim
354353f941 rename devshells.ui to clan-app 2025-05-15 14:15:59 +02:00
Jörg Thalheim
57dcd47992 rename ui to clan-app and move clan-app one layer up 2025-05-15 14:15:59 +02:00
renovate[bot]
5753109b80 chore(deps): update dependency @types/node to v20.17.47 2025-05-15 11:10:14 +00:00
Mic92
528070d9aa Merge pull request 'feat: use process-compose to run ui dev environment' (#3646) from feat/web-ui-process-compose into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3646
2025-05-15 11:08:37 +00:00
Jörg Thalheim
7d1d0c3c3f process-compose: integrate with direnv 2025-05-15 13:01:36 +02:00
Brian McGee
9f81d299d9 feat: use process-compose to run ui dev environment 2025-05-15 12:00:27 +01:00
Brian McGee
6df4705efc fix: move vendoring of nixpkgs and select into root devshell 2025-05-15 12:00:26 +01:00
Brian McGee
faf8689ab1 feat: group ui related packages under a ui directory 2025-05-15 12:00:24 +01:00
Mic92
f2464af5a5 Merge pull request 'clan-app: set title and icon' (#3658) from clan-app-title into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3658
2025-05-15 10:42:06 +00:00
Jörg Thalheim
30ff0a622a clan-app: prepare icon support on linux
For some reason the icon is not shown when using the gtk backend but at
least the API calls look correct.
2025-05-15 12:36:30 +02:00
Jörg Thalheim
2f2ebdb41f clan-app: set title 2025-05-15 12:36:24 +02:00
Jörg Thalheim
e5e10354ef webview-lib: extend to support setting icons on Linux 2025-05-15 12:36:11 +02:00
Mic92
3ae7d72851 Merge pull request 'chore(deps): update data-mesher digest to ca961db' (#3655) from renovate/data-mesher-digest into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3655
2025-05-15 10:18:13 +00:00
Mic92
8e98040f71 Merge pull request 'chore(deps): update nix-darwin digest to b6fff20' (#3653) from renovate/nix-darwin-digest into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3653
2025-05-15 10:18:03 +00:00
hsjobeki
6ad61e583c Merge pull request 'Chore: remove spurious module.nix' (#3657) from hsjobeki/clan-core:chores-1 into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3657
2025-05-15 10:15:29 +00:00
Johannes Kirschbauer
ef6eba9df2 Chore: remove spurious module.nix 2025-05-15 12:08:44 +02:00
renovate[bot]
eae91fd863 chore(deps): update nix-darwin digest to b6fff20 2025-05-15 10:00:22 +00:00
renovate[bot]
bc920e402b chore(deps): update data-mesher digest to ca961db 2025-05-15 10:00:20 +00:00
renovate[bot]
068b39141b chore(deps): update nixpkgs digest to 2e1da60 2025-05-15 09:30:30 +00:00
renovate[bot]
b17eb57fb9 chore(deps): update treefmt-nix digest to e758f27 2025-05-15 09:10:13 +00:00
Mic92
e4394b8dc7 Merge pull request 'Add multiline-hidden-prompt' (#3632) from multiline-hidden-prompt into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3632
Reviewed-by: hsjobeki <hsjobeki@gmail.com>
Reviewed-by: lopter <louis@opter.org>
2025-05-15 08:10:34 +00:00
lassulus
f9b910b5cb clan-cli vars upload: create dir if provided 2025-05-15 06:42:24 +00:00
clan-bot
86da7060cd Merge pull request 'Update Clan Core for Checks' (#3652) from update-clan-core-for-checks into main 2025-05-15 03:01:17 +00:00
clan-bot
a0a7eb423b Update pinned clan-core for checks 2025-05-15 02:51:34 +00:00
renovate[bot]
2337eeb3ad chore(deps): update disko digest to ec7c109 2025-05-15 02:40:09 +00:00
Mic92
4058c8aede Merge pull request 'fix ssh master on macos' (#3649) from ssh-master into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3649
2025-05-14 22:19:51 +00:00
Jörg Thalheim
50dc6c4c50 fix ssh master on macos 2025-05-14 20:30:36 +02:00
Jörg Thalheim
31cb76721f prompt: handle KeyboardInterrupt more gracefully 2025-05-14 19:53:36 +02:00
Jörg Thalheim
b5d132b193 do not instantiate vars_generators several times
We should really not have any property that has side effects i.e.
spawning processes.
2025-05-14 19:53:36 +02:00
Jörg Thalheim
75fa7ac609 add multiline-hidden prompt for both ui and cli 2025-05-14 19:53:36 +02:00
hsjobeki
410e01399e Merge pull request 'feat(clanModules): add deprecation feature that generates a warning if the module is used' (#3648) from hsjobeki/clan-core:persistence-1 into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3648
2025-05-14 15:13:51 +00:00