From 502ece313e8ea58821e44a6b27351ca1e3ca48b4 Mon Sep 17 00:00:00 2001 From: fmway Date: Sun, 26 Jan 2025 09:05:23 +0700 Subject: [PATCH 1/3] chore(systems): ... --- systems/services/caddy/__domains/cgi.local.com.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/systems/services/caddy/__domains/cgi.local.com.nix b/systems/services/caddy/__domains/cgi.local.com.nix index 4e37f90..d926111 100644 --- a/systems/services/caddy/__domains/cgi.local.com.nix +++ b/systems/services/caddy/__domains/cgi.local.com.nix @@ -3,6 +3,7 @@ inherit (config.services) fcgiwrap certs; in { type = "https"; + enable = config.data.enableCGI or true; extraConfig = '' tls ${certs.cgi.cert} ${certs.cgi.key} log { From 8a0d8b27e2e066863e52df187a34d74a1bc76f06 Mon Sep 17 00:00:00 2001 From: fmway Date: Sun, 26 Jan 2025 09:24:10 +0700 Subject: [PATCH 2/3] chore(lockfile): Update flake.lock --- flake.lock | 341 +++++++++++++---------------------------------------- 1 file changed, 82 insertions(+), 259 deletions(-) diff --git a/flake.lock b/flake.lock index df32890..42ae660 100644 --- a/flake.lock +++ b/flake.lock @@ -23,20 +23,14 @@ }, "catppuccin": { "inputs": { - "catppuccin-v1_1": "catppuccin-v1_1", - "catppuccin-v1_2": "catppuccin-v1_2", - "home-manager": "home-manager_2", - "home-manager-stable": "home-manager-stable", - "nixpkgs": "nixpkgs_2", - "nixpkgs-stable": "nixpkgs-stable", - "nuscht-search": "nuscht-search" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1737343289, - "narHash": "sha256-JpPocT6RwOQCpMkYa/uSDNQHE6jUDG2Nt+qJ82N2QQI=", + "lastModified": 1737579274, + "narHash": "sha256-8kBIYfn8TI9jbffhDNS12SdbQHb9ITXflwcgIJBeGqw=", "owner": "catppuccin", "repo": "nix", - "rev": "e68bce884ee1dec26efb6bee13e33a6649be0663", + "rev": "06f0ea19334bcc8112e6d671fd53e61f9e3ad63a", "type": "github" }, "original": { @@ -45,48 +39,20 @@ "type": "github" } }, - "catppuccin-v1_1": { - "locked": { - "lastModified": 1734055249, - "narHash": "sha256-pCWJgwo77KD7EJpwynwKrWPZ//dwypHq2TfdzZWqK68=", - "rev": "7221d6ca17ac36ed20588e1c3a80177ac5843fa7", - "revCount": 326, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.1.1/0193bdc0-b045-7eed-bbec-95611a8ecdf5/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/catppuccin/nix/1.1.%2A.tar.gz" - } - }, - "catppuccin-v1_2": { - "locked": { - "lastModified": 1734734291, - "narHash": "sha256-CFX4diEQHKvZYjnhf7TLg20m3ge1O4vqgplsk/Kuaek=", - "rev": "1e4c3803b8da874ff75224ec8512cb173036bbd8", - "revCount": 344, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.2.1/0193e646-1107-7f69-a402-f2a3988ecf1d/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/catppuccin/nix/1.2.%2A.tar.gz" - } - }, "chaotic": { "inputs": { "fenix": "fenix", "flake-schemas": "flake-schemas", - "home-manager": "home-manager_3", + "home-manager": "home-manager_2", "jovian": "jovian", "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1737534778, - "narHash": "sha256-7h/lJWRzKKCmpKmgGk2ZzWbj73Dqi607grXC/EhFQMI=", + "lastModified": 1737811239, + "narHash": "sha256-X0C4HEcw3AdSgEH6YDHwC6w8xBxK0pVKyUYMoXU2f1w=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "a650b785c5d2b064777e0c5af7a414267a8fc934", + "rev": "be39fe2f8f4e922fc5f2402377531191f96f6b02", "type": "github" }, "original": { @@ -144,11 +110,11 @@ ] }, "locked": { - "lastModified": 1737394828, - "narHash": "sha256-JTEkBaZZwMIVCiSPMumI8BpgRywaOGphasZZhXqLmvo=", + "lastModified": 1737639729, + "narHash": "sha256-cQ9we+PVzEZcFlSqJDbmtVlylYwYdEToFZ+A2abzFkM=", "owner": "encoredev", "repo": "encore-flake", - "rev": "38f86df569641ba3c0e197ea3a651cad7862f72d", + "rev": "ff06dd9d2c3675981214ae5765a96a28be0a829e", "type": "github" }, "original": { @@ -181,12 +147,12 @@ }, "flake-compat": { "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "revCount": 69, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" }, "original": { "type": "tarball", @@ -195,12 +161,12 @@ }, "flake-compat_2": { "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "revCount": 69, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" }, "original": { "type": "tarball", @@ -318,24 +284,6 @@ } }, "flake-utils_2": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -350,9 +298,9 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_3": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1731533236, @@ -370,15 +318,15 @@ }, "fmpkgs": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1737548377, - "narHash": "sha256-KfP3apb0+jyi/g2quSmEsrzZgyFXZz4fzZuz19hlPK8=", + "lastModified": 1737853013, + "narHash": "sha256-DB0FKpxCeN2nNmOLHK/7mTdLlmIN3Xu2Xlecsw0eVn8=", "owner": "fmway", "repo": "fmpkgs", - "rev": "716ec7a3a84462cc8eca6d4623ec4966316e6303", + "rev": "bd21b7a1af9c926ca6b613b6868d272f5050869e", "type": "github" }, "original": { @@ -421,11 +369,11 @@ ] }, "locked": { - "lastModified": 1737043064, - "narHash": "sha256-I/OuxGwXwRi5gnFPsyCvVR+IfFstA+QXEpHu1hvsgD8=", + "lastModified": 1737465171, + "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "94ee657f6032d913fe0ef49adaa743804635b0bb", + "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", "type": "github" }, "original": { @@ -477,50 +425,7 @@ "type": "github" } }, - "home-manager-stable": { - "inputs": { - "nixpkgs": [ - "catppuccin", - "nixpkgs-stable" - ] - }, - "locked": { - "lastModified": 1736373539, - "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-24.11", - "repo": "home-manager", - "type": "github" - } - }, "home-manager_2": { - "inputs": { - "nixpkgs": [ - "catppuccin", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1736508663, - "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_3": { "inputs": { "nixpkgs": [ "chaotic", @@ -541,16 +446,16 @@ "type": "github" } }, - "home-manager_4": { + "home-manager_3": { "inputs": { "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1737480538, - "narHash": "sha256-rk/cmrvq3In0TegW9qaAxw+5YpJhRWt2p74/6JStrw0=", + "lastModified": 1737762889, + "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=", "owner": "nix-community", "repo": "home-manager", - "rev": "4481a16d1ac5bff4a77c608cefe08c9b9efe840d", + "rev": "daf04c5950b676f47a794300657f1d3d14c1a120", "type": "github" }, "original": { @@ -560,7 +465,7 @@ "type": "github" } }, - "home-manager_5": { + "home-manager_4": { "inputs": { "nixpkgs": [ "nixvim", @@ -568,11 +473,11 @@ ] }, "locked": { - "lastModified": 1737075266, - "narHash": "sha256-u1gk5I1an975FOAMMdS6oBKnSIsZza5ZKhaeBZAskVo=", + "lastModified": 1737762889, + "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=", "owner": "nix-community", "repo": "home-manager", - "rev": "12851ae7467bad8ef422b20806ab4d6d81e12d29", + "rev": "daf04c5950b676f47a794300657f1d3d14c1a120", "type": "github" }, "original": { @@ -582,34 +487,6 @@ } }, "ixx": { - "inputs": { - "flake-utils": [ - "catppuccin", - "nuscht-search", - "flake-utils" - ], - "nixpkgs": [ - "catppuccin", - "nuscht-search", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729958008, - "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.0.6", - "repo": "ixx", - "type": "github" - } - }, - "ixx_2": { "inputs": { "flake-utils": [ "nixvim", @@ -661,11 +538,11 @@ }, "master": { "locked": { - "lastModified": 1737547357, - "narHash": "sha256-oCUz3dmHN24ygfLwG8ziIP5zMCTQ1f8EYbID4CHdaCw=", + "lastModified": 1737856185, + "narHash": "sha256-dPbNT+q4p2n0mGBkAEYUyfaSC6p198y2/qJX5J2NMoE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "66292a47a4f13788e9d286f888021770a439acdc", + "rev": "01d4004e7cd43d0937c978ead682b04a2f79b263", "type": "github" }, "original": { @@ -682,11 +559,11 @@ ] }, "locked": { - "lastModified": 1736819234, - "narHash": "sha256-deQVtIH4UJueELJqluAICUtX7OosD9paTP+5FgbiSwI=", + "lastModified": 1737504076, + "narHash": "sha256-/B4XJnzYU/6K1ZZOBIgsa3K4pqDJrnC2579c44c+4rI=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "bd921223ba7cdac346477d7ea5204d6f4736fcc6", + "rev": "65cc1fa8e36ceff067daf6cfb142331f02f524d3", "type": "github" }, "original": { @@ -720,7 +597,7 @@ }, "nixgl": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs_6" }, "locked": { @@ -739,11 +616,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1737359802, - "narHash": "sha256-utplyRM6pqnN940gfaLFBb9oUCSzkan86IvmkhsVlN8=", + "lastModified": 1737751639, + "narHash": "sha256-ZEbOJ9iT72iwqXsiEMbEa8wWjyFvRA9Ugx8utmYbpz4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "61c79181e77ef774ab0468b28a24bc2647d498d6", + "rev": "dfad538f751a5aa5d4436d9781ab27a6128ec9d4", "type": "github" }, "original": { @@ -787,11 +664,11 @@ }, "nixpkgs-24_11": { "locked": { - "lastModified": 1737404927, - "narHash": "sha256-e1WgPJpIYbOuokjgylcsuoEUCB4Jl2rQXa2LUD6XAG8=", + "lastModified": 1737672001, + "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae584d90cbd0396a422289ee3efb1f1c9d141dc3", + "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8", "type": "github" }, "original": { @@ -825,22 +702,6 @@ "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1736061677, - "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1736012469, @@ -859,11 +720,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1737062831, - "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", + "lastModified": 1737632463, + "narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", + "rev": "0aa475546ed21629c4f5bbf90e38c846a99ec9e9", "type": "github" }, "original": { @@ -875,11 +736,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1737469691, - "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", + "lastModified": 1737746512, + "narHash": "sha256-nU6AezEX4EuahTO1YopzueAXfjFfmCHylYEFCagduHU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", + "rev": "825479c345a7f806485b7f00dbe3abb50641b083", "type": "github" }, "original": { @@ -891,11 +752,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "lastModified": 1737469691, + "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", "type": "github" }, "original": { @@ -922,11 +783,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1737469691, - "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", + "lastModified": 1737746512, + "narHash": "sha256-nU6AezEX4EuahTO1YopzueAXfjFfmCHylYEFCagduHU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", + "rev": "825479c345a7f806485b7f00dbe3abb50641b083", "type": "github" }, "original": { @@ -938,11 +799,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1737469691, - "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", + "lastModified": 1737746512, + "narHash": "sha256-nU6AezEX4EuahTO1YopzueAXfjFfmCHylYEFCagduHU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", + "rev": "825479c345a7f806485b7f00dbe3abb50641b083", "type": "github" }, "original": { @@ -958,7 +819,7 @@ "flake-compat": "flake-compat", "flake-parts": "flake-parts_2", "git-hooks": "git-hooks", - "home-manager": "home-manager_5", + "home-manager": "home-manager_4", "nix-darwin": "nix-darwin", "nixpkgs": [ "nixpkgs" @@ -967,11 +828,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1737547260, - "narHash": "sha256-BWJPFgLq0/3jxhkRXhiCAj8irjSkpgL1w8dUZcTy9M8=", + "lastModified": 1737832569, + "narHash": "sha256-VkK73VRVgvSQOPw9qx9HzvbulvUM9Ae4nNd3xNP+pkI=", "owner": "nix-community", "repo": "nixvim", - "rev": "e60ea678ac9a4154b641fdaacf03c600d1c661d8", + "rev": "d7df58321110d3b0e12a829bbd110db31ccd34b1", "type": "github" }, "original": { @@ -987,11 +848,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1737546262, - "narHash": "sha256-Eb33rcfVu6RqURgNz7x+O5fUae4YLVKSRgf8hbmz070=", + "lastModified": 1737857291, + "narHash": "sha256-SmVn/Ss/ZtbK2NlvrIJ5i17QEyYIzLrKQ7Jy96WAPWM=", "owner": "nix-community", "repo": "nur", - "rev": "3fd8e7e73c19d168e8d8291a4a5b40cde2d8d93a", + "rev": "a46b5671b4379a020fd0c908c2dc1ce38a05cdb9", "type": "github" }, "original": { @@ -1000,44 +861,21 @@ "type": "github" } }, - "nuscht-search": { - "inputs": { - "flake-utils": "flake-utils", - "ixx": "ixx", - "nixpkgs": [ - "catppuccin", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735854821, - "narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=", - "owner": "NuschtOS", - "repo": "search", - "rev": "836908e3bddd837ae0f13e215dd48767aee355f0", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_4", - "ixx": "ixx_2", + "flake-utils": "flake-utils_3", + "ixx": "ixx", "nixpkgs": [ "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1735854821, - "narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=", + "lastModified": 1737372689, + "narHash": "sha256-nH3zK2ki0fd5o5qvbGHxukE4qnOLJa1uCzoDObG5vrE=", "owner": "NuschtOS", "repo": "search", - "rev": "836908e3bddd837ae0f13e215dd48767aee355f0", + "rev": "570cc17bbc25650eb7d69e4fcda8cfd2f1656922", "type": "github" }, "original": { @@ -1081,7 +919,7 @@ "flake-parts": "flake-parts", "fmpkgs": "fmpkgs", "fmway-nix": "fmway-nix", - "home-manager": "home-manager_4", + "home-manager": "home-manager_3", "master": "master", "nixgl": "nixgl", "nixos-hardware": "nixos-hardware", @@ -1155,21 +993,6 @@ "type": "github" } }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1178,11 +1001,11 @@ ] }, "locked": { - "lastModified": 1737054102, - "narHash": "sha256-saLiCRQ5RtdTnznT/fja7GxcYRAzeY3k8S+IF/2s/2A=", + "lastModified": 1737483750, + "narHash": "sha256-5An1wq5U8sNycOBBg3nsDDgpwBmR9liOpDGlhliA6Xo=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "97871d416166803134ba64597a1006f3f670fbde", + "rev": "f2cc121df15418d028a59c9737d38e3a90fbaf8f", "type": "github" }, "original": { From 5275fad7bf6a7bff34357f44e5c025ef38931156 Mon Sep 17 00:00:00 2001 From: fmway Date: Sun, 26 Jan 2025 11:04:48 +0700 Subject: [PATCH 3/3] chore(actions): add some packages to cachix --- .github/workflows/ci.yml | 73 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 62fdc5b..1c0fae8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,10 +20,81 @@ jobs: with: name: nix-conf path: nix.conf - nixos: + swayfx: + runs-on: ubuntu-latest + needs: [ generate-nixconf ] + steps: + - uses: actions/checkout@v4 + with: + ref: ${{ github.head_ref }} + - uses: actions/download-artifact@v4 + with: + name: nix-conf + - name: Read nix.conf + id: nix + run: | + { + echo 'CONF<> "$GITHUB_OUTPUT" + - uses: DeterminateSystems/nix-installer-action@main + with: + github-token: ${{ secrets.GH_TOKEN }} + extra-conf: | + ${{ steps.nix.outputs.CONF }} + - uses: DeterminateSystems/magic-nix-cache-action@main + with: + use-flakehub: false + - uses: cachix/cachix-action@master + with: + name: fmcachix + authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' + skipAddingSubstituter: true + - name: Build + run: nix build .#custom.swayfx --verbose + - run: nix-collect-garbage -d + gnome-session: runs-on: ubuntu-latest needs: [ generate-nixconf ] steps: + - uses: actions/checkout@v4 + with: + ref: ${{ github.head_ref }} + - uses: actions/download-artifact@v4 + with: + name: nix-conf + - name: Read nix.conf + id: nix + run: | + { + echo 'CONF<> "$GITHUB_OUTPUT" + - uses: DeterminateSystems/nix-installer-action@main + with: + github-token: ${{ secrets.GH_TOKEN }} + extra-conf: | + ${{ steps.nix.outputs.CONF }} + - uses: DeterminateSystems/magic-nix-cache-action@main + with: + use-flakehub: false + - uses: cachix/cachix-action@master + with: + name: fmcachix + authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' + skipAddingSubstituter: true + - name: Build + run: nix build .#gnome-session --verbose + - run: nix-collect-garbage -d + nixos: + runs-on: ubuntu-latest + needs: + - generate-nixconf + - swayfx + - gnome-session + steps: - uses: actions/checkout@v4 with: ref: ${{ github.head_ref }}