v/infrastructure
1
0
Fork 0
Code Issues 13 Pull requests 1 Projects Releases Packages Activity Actions

Merge branch 'main' of ssh://git.0x76.dev:42/v/infrastructure

Browse source
This commit is contained in:
Vivian 2023-12-06 19:58:48 +01:00
commit d54752bb2d
3 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
flake.lock generated
View file

@ -687,11 +687,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1701369906, "lastModified": 1701433070,
"narHash": "sha256-WwICfQ661I2hL2m9s449PjCR74d+9JtrhQeBoIaQ8/Q=", "narHash": "sha256-Gf9JStfENaUQ7YWFz3V7x/srIwr4nlnVteqaAxtwpgM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "ef9088253c120d9b4dc26c5e41dd6c3c781ee9f0", "rev": "4a8545f5e737a6338814a4676dc8e18c7f43fc57",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1184,11 +1184,11 @@
}, },
"nixpkgs_stable": { "nixpkgs_stable": {
"locked": { "locked": {
"lastModified": 1701268161, "lastModified": 1701362232,
"narHash": "sha256-hL4jGGwMHHmyx6G9wi6IrYa8RLkoEtzCb4zWITH1B40=", "narHash": "sha256-GVdzxL0lhEadqs3hfRLuj+L1OJFGiL/L7gCcelgBlsw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "67be70a859530f6f7c358568eaa6ab0d84b36b01", "rev": "d2332963662edffacfddfad59ff4f709dde80ffe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1220,11 +1220,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1701429346, "lastModified": 1701525157,
"narHash": "sha256-Y4tIQiX+tiuE6mUR6K360U+ln9iB7RKwbGLoo/Wh0a0=", "narHash": "sha256-GVE2K1UcVRBOghRWmgpIwKjziwfmqSMMLYzec8CHCzA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "f4318c2621d55b05ce2787a2645053082dfe340c", "rev": "2852283c5f07fdb12fa595d0d2d5fa27d8557586",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
nixos/common/hm-modules/vscode.nix
View file

@ -24,6 +24,9 @@ in {
"rust-analyzer.checkOnSave.command" = "clippy"; "rust-analyzer.checkOnSave.command" = "clippy";
"debug.allowBreakpointsEverywhere" = true; "debug.allowBreakpointsEverywhere" = true;
"C_Cpp.clang_format_fallbackStyle" = "{ BasedOnStyle: Google, IndentWidth: 4, ColumnLimit: 0}"; "C_Cpp.clang_format_fallbackStyle" = "{ BasedOnStyle: Google, IndentWidth: 4, ColumnLimit: 0}";
"crates.compatibleDecorator" = "✓";
"crates.errorDecorator" = "✗";
"crates.incompatibleDecorator" = "🛇";
# Don't index unecessary things # Don't index unecessary things
"files.exclude" = { "files.exclude" = {
"**/.vscode" = true; "**/.vscode" = true;
@ -64,6 +67,7 @@ in {
xaver.clang-format xaver.clang-format
sumneko.lua sumneko.lua
davidlday.languagetool-linter davidlday.languagetool-linter
serayuzgur.crates
]; ];
}; };

3
nixos/hosts/olympus/grist/configuration.nix
View file

@ -24,7 +24,7 @@ in {
oci-containers.containers.grist = { oci-containers.containers.grist = {
image = image =
"gristlabs/grist:1.1.8"; "gristlabs/grist:1.1.9";
environment = { environment = {
APP_HOME_URL = "https://grist.0x76.dev"; APP_HOME_URL = "https://grist.0x76.dev";
GRIST_SUPPORT_ANON = "false"; GRIST_SUPPORT_ANON = "false";
@ -43,6 +43,7 @@ in {
PYTHON_VERSION_ON_CREATION = "3"; PYTHON_VERSION_ON_CREATION = "3";
GRIST_OIDC_IDP_ISSUER = "https://dex.0x76.dev"; GRIST_OIDC_IDP_ISSUER = "https://dex.0x76.dev";
GRIST_OIDC_IDP_SKIP_END_SESSION_ENDPOINT= "true";
}; };
environmentFiles = [ "${vs.grist}/environment" ]; environmentFiles = [ "${vs.grist}/environment" ];
ports = [ "8484:8484" ]; ports = [ "8484:8484" ];