From 7730c2e89c16f0089ed7942316926b43cf9f6fd7 Mon Sep 17 00:00:00 2001 From: Nick Date: Sat, 18 Jan 2025 23:55:33 -0600 Subject: [PATCH] feat: forgejo test --- config/instances/config/forgejo.nix | 17 ++-- flake.lock | 90 +++++++++---------- .../userSettings/config/lsp/default.nix | 8 ++ nixos/modules/nix.nix | 15 ++-- secrets/secrets.yaml | 10 +-- 5 files changed, 76 insertions(+), 64 deletions(-) diff --git a/config/instances/config/forgejo.nix b/config/instances/config/forgejo.nix index b2a18d8..79ff43e 100755 --- a/config/instances/config/forgejo.nix +++ b/config/instances/config/forgejo.nix @@ -1,7 +1,7 @@ -{instancesFunctions}: let - inherit - (instancesFunctions) - domain1 +{ instancesFunctions }: +let + inherit (instancesFunctions) + domain3 servicePath sslPath sopsPath @@ -10,11 +10,12 @@ forgejoLabel = "Forgejo"; forgejoName = "forgejo"; forgejoSubdomain = "source"; -in { +in +{ label = forgejoLabel; name = forgejoName; email = { - address0 = "noreply@${forgejoSubdomain}.${domain1}"; + address0 = "noreply@${domain3}"; }; sops = { path0 = "${sopsPath}/${forgejoName}"; @@ -27,7 +28,7 @@ in { port0 = 3033; }; ssl = { - cert = "${sslPath}/${forgejoSubdomain}.${domain1}/fullchain.pem"; - key = "${sslPath}/${forgejoSubdomain}.${domain1}/key.pem"; + cert = "${sslPath}/${forgejoSubdomain}.${domain3}/fullchain.pem"; + key = "${sslPath}/${forgejoSubdomain}.${domain3}/key.pem"; }; } diff --git a/flake.lock b/flake.lock index 21b68cf..e57833a 100755 --- a/flake.lock +++ b/flake.lock @@ -609,11 +609,11 @@ "systems": "systems_13" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -836,11 +836,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1737072630, - "narHash": "sha256-eAcGSaqAHCTtSW8Y1ipK9/KagOPjHvaHmeSKXjXk+Cw=", + "lastModified": 1737226203, + "narHash": "sha256-maMmVQQzdd92LHiI24NyIF3QblnIUJSESDPpnDThtNU=", "owner": "helix-editor", "repo": "helix", - "rev": "ffdfb59033a4a6a8d931618f4e685c90928bd931", + "rev": "7cc93eb1c554e72a5aa0c18d244c0fd3ec07d97f", "type": "github" }, "original": { @@ -883,11 +883,11 @@ ] }, "locked": { - "lastModified": 1737075266, - "narHash": "sha256-u1gk5I1an975FOAMMdS6oBKnSIsZza5ZKhaeBZAskVo=", + "lastModified": 1737221749, + "narHash": "sha256-igllW0yG+UbetvhT11jnt9RppSHXYgMykYhZJeqfHs0=", "owner": "nix-community", "repo": "home-manager", - "rev": "12851ae7467bad8ef422b20806ab4d6d81e12d29", + "rev": "97d7946b5e107dd03cc82f21165251d4e0159655", "type": "github" }, "original": { @@ -1045,11 +1045,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1737038559, - "narHash": "sha256-irqN8zKwpQ0NFxEvV/wQRdopClwkyZXCQoF7mgX/Uss=", + "lastModified": 1737197318, + "narHash": "sha256-dzG7PTu2TvBhrVbx5ouFGclQBgfrLobiMH1LWGKSR+I=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "0dc7367a7006cc3cc877d52bf34c4998144bff84", + "rev": "f56153a9c1b0a00fac0932a95e0cfa5a4f6c681f", "type": "github" }, "original": { @@ -1416,11 +1416,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1737071825, - "narHash": "sha256-P9n4HP0XPlXTViw7g3lBRX3Eix0sgcnhanV0ddB08SA=", + "lastModified": 1737250613, + "narHash": "sha256-0QcnnQZ/il9UPVmhJtDqjPDCCcW5vTCz7QaLu+rlrRQ=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "c92ead1ab77f8be697a44ca855d06c5957ee2a62", + "rev": "6ec08f11bbf0e936ad82f1bb532f3757f8b5e3c2", "type": "github" }, "original": { @@ -1479,11 +1479,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1736867362, - "narHash": "sha256-i/UJ5I7HoqmFMwZEH6vAvBxOrjjOJNU739lnZnhUln8=", + "lastModified": 1737165118, + "narHash": "sha256-s40Kk/OulP3J/1JvC3VT16U4r/Xw6Qdi7SRw3LYkPWs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9c6b49aeac36e2ed73a8c472f1546f6d9cf1addc", + "rev": "6a3ae7a5a12fb8cac2d59d7df7cbd95f9b2f0566", "type": "github" }, "original": { @@ -1511,11 +1511,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1736883708, - "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", + "lastModified": 1737062831, + "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", + "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", "type": "github" }, "original": { @@ -1527,11 +1527,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1736883708, - "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", + "lastModified": 1737062831, + "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", + "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", "type": "github" }, "original": { @@ -1543,11 +1543,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1729265718, - "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", + "lastModified": 1737003892, + "narHash": "sha256-RCzJE9wKByLCXmRBp+z8LK9EgdW+K+W/DXnJS4S/NVo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ccc0c2126893dd20963580b6478d1a10a4512185", + "rev": "ae06b9c2d83cb5c8b12d7d0e32692e93d1379713", "type": "github" }, "original": { @@ -1566,11 +1566,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1737085947, - "narHash": "sha256-HuPSp3eBpfsOmyuP9AT1az5R1s6ygmbT11zVSb1xriE=", + "lastModified": 1737258869, + "narHash": "sha256-Ue2TumKTw+6VUSKdgHE93gViUTOJDmS2I0HjLbmrHls=", "owner": "nix-community", "repo": "NUR", - "rev": "44c5207494e7e52a3d213635bfdcf42aba402dda", + "rev": "0b2b53ac3bd61384876cf8461d32e698064297ea", "type": "github" }, "original": { @@ -1764,11 +1764,11 @@ ] }, "locked": { - "lastModified": 1729391507, - "narHash": "sha256-as0I9xieJUHf7kiK2a9znDsVZQTFWhM1pLivII43Gi0=", + "lastModified": 1737080704, + "narHash": "sha256-n+J2h9GM9ZpFOQUmtZoCr1+DFF/iO5UlmLJeHIxbZGY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "784981a9feeba406de38c1c9a3decf966d853cca", + "rev": "f9953fe89f8b65401fc4d4a288940bc2cb072949", "type": "github" }, "original": { @@ -1849,11 +1849,11 @@ ] }, "locked": { - "lastModified": 1736808430, - "narHash": "sha256-wlgdf/n7bJMLBheqt1jmPoxJFrUP6FByKQFXuM9YvIk=", + "lastModified": 1737107480, + "narHash": "sha256-GXUE9+FgxoZU8v0p6ilBJ8NH7k8nKmZjp/7dmMrCv3o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "553c7cb22fed19fd60eb310423fdc93045c51ba8", + "rev": "4c4fb93f18b9072c6fa1986221f9a3d7bf1fe4b6", "type": "github" }, "original": { @@ -1884,11 +1884,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1736993991, - "narHash": "sha256-kPDt3QgeIsct9f375LIGmSoZKl7Z4AVzXX+9U0VV5PI=", + "lastModified": 1737207873, + "narHash": "sha256-XTCuMv753lpm8DvdVf9q2mH3rhlfsKrCUYbaADPC/bA=", "owner": "danth", "repo": "stylix", - "rev": "a88c4d264a4379b7fe5a9e75ed51bea96f8dd407", + "rev": "51ad2cec11e773a949bdbec88bed2524f098f49a", "type": "github" }, "original": { @@ -2292,11 +2292,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1737047842, - "narHash": "sha256-gVdbw3reThRxfwmx4MQ1gsq5waHthpg4e64crT2YXqg=", + "lastModified": 1737214812, + "narHash": "sha256-r46PRML09iEcdh+Oi7xheyQwLE7zSDPvXPhyMQDQhe4=", "owner": "sxyazi", "repo": "yazi", - "rev": "6c94227d40b150cf5446ee5577bffc805d107e29", + "rev": "0a5c9b61a3bca0ed6c16f8e51a657e6976fcd39d", "type": "github" }, "original": { @@ -2315,11 +2315,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1737086077, - "narHash": "sha256-jLl+8zdU3yQKblyGqkBIKlrabOwI8XoNujOBxDEgLIs=", + "lastModified": 1737239450, + "narHash": "sha256-ckA2nKlqWhQ/E8KXy4939b5uxNdCoof90/X6uFT6M+g=", "owner": "zed-industries", "repo": "zed", - "rev": "21e7765a482d8231906e67ff4cc997d1cabc6077", + "rev": "ac8220bb2e03a94e8c62022fa0efe9ff9adf1c1c", "type": "github" }, "original": { diff --git a/home/modules/zed/config/userSettings/config/lsp/default.nix b/home/modules/zed/config/userSettings/config/lsp/default.nix index 96a962c..5e4b491 100755 --- a/home/modules/zed/config/userSettings/config/lsp/default.nix +++ b/home/modules/zed/config/userSettings/config/lsp/default.nix @@ -5,6 +5,14 @@ }; }; + elm-language-server = { + initialization_options = { + disableElmLSDiagnostics = true; + onlyUpdateDiagnosticsOnSave = false; + elmReviewDiagnostics = "warning"; + }; + }; + elm = { binary = { path_lookup = true; diff --git a/nixos/modules/nix.nix b/nixos/modules/nix.nix index d0ec8c8..b671942 100755 --- a/nixos/modules/nix.nix +++ b/nixos/modules/nix.nix @@ -2,12 +2,14 @@ config, lib, ... -}: { +}: +{ nixpkgs = { config = { allowUnfree = true; permittedInsecurePackages = [ "electron-unwrapped-33.0.2" + "electron-31.7.7" ]; }; }; @@ -31,12 +33,13 @@ }; }; # Print package list - environment.etc."current-system-packages".text = let - packages = builtins.map (p: "${p.name}") config.environment.systemPackages; + environment.etc."current-system-packages".text = + let + packages = builtins.map (p: "${p.name}") config.environment.systemPackages; - sortedUnique = builtins.sort builtins.lessThan (lib.unique packages); + sortedUnique = builtins.sort builtins.lessThan (lib.unique packages); - formatted = builtins.concatStringsSep "\n" sortedUnique; - in + formatted = builtins.concatStringsSep "\n" sortedUnique; + in formatted; } diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml index 313cc22..cf315b4 100755 --- a/secrets/secrets.yaml +++ b/secrets/secrets.yaml @@ -16,8 +16,8 @@ peertube-redis: ENC[AES256_GCM,data:SQoPzPjgf4YN9dhvO0wo2DEra7cTgfZBx4vCBpNVSXI= peertube-root: ENC[AES256_GCM,data:BR0pmqEYYJuDqK7fstyW/hvh8V1GQXVHP24iz2eDeho500IbWaMuDxkNQyfInmIfjC3YvfsHME3S,iv:EgaLKBHYrklF+q5jBPvGKFYJosZxFFMXElTcyKU0ypQ=,tag:PztyBdK5OzeEDvQi/yqRIg==,type:str] peertube-secret: ENC[AES256_GCM,data:Of4UsWGTXd+uzHE4XkxQOLKBbDd0sQHWQrLgxmn8C9bHgEB85ZnSqOe04IZ4chYKheuzBQ4Vg7pYfGFVBDjx8Q==,iv:cXuVrmQOEHtq7Q6+vzPXKdiuYjLx9hjsd3bCHpBQBqw=,tag:xL8us1XLJsdON/O+BG+xpQ==,type:str] forgejo-database: ENC[AES256_GCM,data:Stnd+vsoBDK0eLmfgaNaSdO6qY0vF1d0WgrAw1U451I=,iv:7CHPXUPXkTXP0GVqHPK3KavysbSOKuUhJ5EoeAh5Mp4=,tag:iqASITas49wrqCRN8TjLIQ==,type:str] -forgejo-smtp: ENC[AES256_GCM,data:ofHzPrwS8lN74jSr/T9hXQ==,iv:Eu75NqRV+FLQtFL0A1Rj/5ywyPC8PTSwNdelPYaTqAo=,tag:DFrSYC6k7YP52rkDCxfFiQ==,type:str] -castopod-smtp: ENC[AES256_GCM,data:E6vOqbWACLQUwDIHVsJ3ZPmfVC5jWvesXQ==,iv:IQUXjIdnmG2EtrIdOMLsAPO9VFJNjHbcHtocp3EmGbE=,tag:Tu4H+4k7DG5rkgvjl4nVZw==,type:str] +forgejo-smtp: ENC[AES256_GCM,data:p+ARltehYqMTsiBg665PBg==,iv:uTM6Sps+4F4lEGSYUrnZYHcYSNNgpUEsxGT1TxEPUyY=,tag:pz3PN+63i/C6BPdZgy6Q5A==,type:str] +websitecastopod-smtp: ENC[AES256_GCM,data:4uyom6zG4z24f1UZywzNNq5YN94fXsu3bA==,iv:e/XsyU3QVlMxYwZ4c5iiUd4MzJZ7TZm+Wl6Zmo4II1I=,tag:lTLizICQQJaKgcj+o8Z30A==,type:str] castopod-database: ENC[AES256_GCM,data:Yn2pHEzoEC1ZH0LVaFooHX2TzkM0V6PUboXrziIIYA0=,iv:U+oXBBmn5Yohq5Gx6N5jo2x/eRMXK8pjnxBDCMxD2Oo=,tag:i+xZW7S+tLdive+cyZpTew==,type:str] discord-token: ENC[AES256_GCM,data:PQ4VEKZUCFdSau9hHj52GkdKTnc1sdNIOrJjWbW0Wu9gNAluOutbEYd21UjP9nW/8ayPrId5dSGs6pqXQEIxT8KmnYVQXQYQ6i5xx9Ciq77pU1MipXE=,iv:lpOWnuySeLDiZMSjbsnQJCgsC3PG3v9hmaPVenlmF5g=,tag:Wdpwagj6iiiif5MZiW+yzQ==,type:str] minecraft-pass: ENC[AES256_GCM,data:0natV6dEpItFp5zsUKqgVMZLLmqRLBEf,iv:Bc7RTXnpdec0wn25Rb7SkVTf5BjXzq3YCXcjwrC7V9k=,tag:Og5qN94G6pHdpIk6YDg1ZA==,type:str] @@ -49,8 +49,8 @@ sops: bXBOa1VSakoyaWxpODJEOU11QUZCaUEK8Ch9Ten3DdrPHF1DTH2qei85AlHUOaLD aNfzakake7ej+MxJYdKEU0bcWofNMKzIlZa2uM10KZSENDP8d8qlig== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-01-16T09:06:48Z" - mac: ENC[AES256_GCM,data:slXuk7bq+TbygmCTZ7XFFjw5Y11a+ezpRLA5333H25E/qz9eABZR7WiJE1VJ6kRFQf8Oz6Od5/JDsSF743cC4dgLWsIWBBxKdARM/lvQWIpNn7GIGFV96nFTsz0MTLMDfx6lAFPlbGnU8TYbsiMmGeUlcAh0Lqmkfc5MN2JPXjo=,iv:oovhE2b7+ozZnjV06VLUdlqftBDoZDEHITLx1BVu8/E=,tag:979Rr3eiMn8Gle9mGqfsQw==,type:str] + lastmodified: "2025-01-19T05:53:28Z" + mac: ENC[AES256_GCM,data:53u+E1aSLpBL4fpZ92Hd2V995SQWV6vIMwmixBjh8Bljn0FYld9leFc9aLh8Acjx05QdPu6FCGrd9ggjPVwg59jUh4WUrptHsrO+tzPi8tuw91udLWp4navKRTU8eEH8qqu6X5x72i6j6BkvaTLk5ljyZvWfRBs7+QUmc7saTg0=,iv:ttuIjOfIzqiW660ERJ5ilIJ0578cyh363glwqYBrD/Q=,tag:CGERhUo857XVHCad+PFKkw==,type:str] pgp: [] unencrypted_suffix: _unencrypted - version: 3.9.2 + version: 3.9.3