From 59d0d2e37df9f89009466f63a61c3b78198f17c6 Mon Sep 17 00:00:00 2001 From: jackjohn7 <70782491+jackjohn7@users.noreply.github.com> Date: Wed, 22 Jul 2026 10:40:34 -0500 Subject: [PATCH] feat: add compose --- flake.lock | 130 ++++++++++------------------ modules/features/layers/compose.nix | 70 +++++++++++++++ 2 files changed, 115 insertions(+), 85 deletions(-) create mode 100644 modules/features/layers/compose.nix diff --git a/flake.lock b/flake.lock index a417891..ef9f0dd 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1778446047, - "narHash": "sha256-oQvcadh2BCkrog+SGrG6YffKJrveYpjj3TdQJWaKhaM=", + "lastModified": 1784665499, + "narHash": "sha256-9BMxlTxCCDAeoNLtb1a/st7udtTIJep+wpUzquA29VU=", "owner": "nix-community", "repo": "bun2nix", - "rev": "f2bc12af1a6369648aac41041ceeaa0b866599c6", + "rev": "0f2a1f0b6f42cebe3b149bf62d38754c5e0e9729", "type": "github" }, "original": { @@ -47,11 +47,11 @@ ] }, "locked": { - "lastModified": 1777988971, - "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=", + "lastModified": 1782949081, + "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff", + "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", "type": "github" }, "original": { @@ -65,11 +65,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1778716662, - "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", + "lastModified": 1782949081, + "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", + "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", "type": "github" }, "original": { @@ -105,11 +105,11 @@ ] }, "locked": { - "lastModified": 1779997040, - "narHash": "sha256-lAVg9lIgZmmsBZEZgsI9LkO6sRz6iQVDNo67R5eWCM8=", + "lastModified": 1784361323, + "narHash": "sha256-TsyHMkAx9V9Hq9kVbke16pm+3iehM656x/yTSvyz8KU=", "owner": "AlvaroParker", "repo": "helium-nix", - "rev": "a1d540d5b211897367eec8acd0ed189adbd48489", + "rev": "06afa4dddfab3f88bea5c10edaa4a509a7fa01b3", "type": "github" }, "original": { @@ -120,17 +120,16 @@ }, "hjem": { "inputs": { - "nix-darwin": "nix-darwin", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1780199518, - "narHash": "sha256-NhtWx0youXYRvcqtL+sjdqoZinMcnjcwRsh6eBJUZLg=", + "lastModified": 1784601896, + "narHash": "sha256-rkpUOBv9pVG+GxhK90ebCrFpvjnfP4u2y/iGrzA42K4=", "owner": "feel-co", "repo": "hjem", - "rev": "ffa433dd86e761de45ef985d4293f31a4d2a775d", + "rev": "35e95ebb9557ac41a72fe00dd55218d1a7f21679", "type": "github" }, "original": { @@ -141,11 +140,11 @@ }, "import-tree": { "locked": { - "lastModified": 1778781969, - "narHash": "sha256-Jjuz5CmSkur8KvLDoGa+vylEp+RkQtv4mt/qcMznpH0=", + "lastModified": 1784254960, + "narHash": "sha256-iI88R3wHz8wTKQb5orvpc51L/Xr64AJyxid/0MKa/b8=", "owner": "vic", "repo": "import-tree", - "rev": "d321337efd0f23a9eb14a42adb7b2c29313ab274", + "rev": "4ebb10ae17d5f1ad366e7aef5b92cb8eecf24f69", "type": "github" }, "original": { @@ -154,26 +153,8 @@ "type": "github" } }, - "luajit-src": { - "flake": false, - "locked": { - "lastModified": 1763177035, - "narHash": "sha256-oYD86MqmlJpiCuEs4LwVtxvarPtz1RPWm8nJqNE0sBs=", - "owner": "SteamClientHomebrew", - "repo": "LuaJIT", - "rev": "89550023569c3e195e75e12951c067fe5591e0d2", - "type": "github" - }, - "original": { - "owner": "SteamClientHomebrew", - "ref": "v2.1", - "repo": "LuaJIT", - "type": "github" - } - }, "millennium": { "inputs": { - "luajit-src": "luajit-src", "millennium-src": "millennium-src", "nixpkgs": [ "nixpkgs" @@ -181,11 +162,11 @@ }, "locked": { "dir": "packages/nix", - "lastModified": 1780205271, - "narHash": "sha256-+mwIFqTNYRNVK9YOPY0SvuTTlAAkpSkRNVZaxg3qGS0=", + "lastModified": 1784048235, + "narHash": "sha256-ar1xg5HFbz6XJ/BAOo37ewfnMcsLHj0/088soIvXKIo=", "owner": "SteamClientHomebrew", "repo": "Millennium", - "rev": "33e0e3101806c89be2e1338014d92c5e5532c21e", + "rev": "df5a3572fd2366b4aa689abd655ee48296ba1afd", "type": "github" }, "original": { @@ -198,48 +179,27 @@ "millennium-src": { "flake": false, "locked": { - "lastModified": 1780199538, - "narHash": "sha256-ocI23Pl2OpezwafivNC0/f2vlQg1XOc+BmGQWTCqwBg=", + "lastModified": 1783268941, + "narHash": "sha256-MJLJ0I48HXgfOpISTAbDMYMUdWj9A6M+jGQz4uAvwyw=", "owner": "SteamClientHomebrew", "repo": "Millennium", - "rev": "76f9012b6ac14c454cfe3d4ad726ebddccff16e7", + "rev": "f37f05bdbd4727d873a1ad83ce72d062ef9a0c48", "type": "github" }, "original": { "owner": "SteamClientHomebrew", "repo": "Millennium", - "rev": "76f9012b6ac14c454cfe3d4ad726ebddccff16e7", - "type": "github" - } - }, - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "hjem", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1777780666, - "narHash": "sha256-8wURyQMdDkGUarSTKOGdCuFfYiwa3HbzwscUfn3STDE=", - "owner": "nix-darwin", - "repo": "nix-darwin", - "rev": "8c62fba0854ba15c8917aed18894dbccb48a3777", - "type": "github" - }, - "original": { - "owner": "nix-darwin", - "repo": "nix-darwin", + "rev": "f37f05bdbd4727d873a1ad83ce72d062ef9a0c48", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1779560665, - "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", + "lastModified": 1784497964, + "narHash": "sha256-vlHUuqAcbcH2RKmHbPiuQzbv1pnzzavXnI62RD0bqCU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", + "rev": "241313f4e8e508cb9b13278c2b0fa25b9ca27163", "type": "github" }, "original": { @@ -251,11 +211,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1777168982, - "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", + "lastModified": 1782614948, + "narHash": "sha256-ePjCwr1sNm9NYUqywL7QfK3JnlS015msC+eBu2zKlp8=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", + "rev": "db3f255737b94216eb71cce308e2912cf6bc2d7c", "type": "github" }, "original": { @@ -266,11 +226,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1779536132, - "narHash": "sha256-q+fF42iv/geEbHfgSzy3tS0FF/EyD6XTZ98E6yxiBO8=", + "lastModified": 1780336545, + "narHash": "sha256-vhVhuXzFrIOfcssC/9hDHx7MHzDKjF3keHuREOQqQiQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3d8f0f3f72a6cd4d93d0ad13203f2ea1cb7e1456", + "rev": "4df1b885d76a54e1aa1a318f8d16fd6005b6401f", "type": "github" }, "original": { @@ -294,16 +254,16 @@ }, "systems": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1776166891, + "narHash": "sha256-bI8yrEGjrohR5hkQox7UrxDH7XqrYMwI8SL/LrJ1+S8=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "triplet", + "rev": "6de7bc09397911ce03636afbcf6118745ab2cda0", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "triplet", "type": "github" } }, @@ -330,11 +290,11 @@ ] }, "locked": { - "lastModified": 1775636079, - "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", + "lastModified": 1784369104, + "narHash": "sha256-47cxbcZODibHv3rELFQ9vZly0vUNkND/atn/U7HLeb0=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", + "rev": "df3c0640565d04a0261253cdd89fce78ec50168a", "type": "github" }, "original": { @@ -348,11 +308,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1779886850, - "narHash": "sha256-Udj+9DzeLccvPKoW9Q8xFdqIhrw2jhYMoqxBv+8iWzo=", + "lastModified": 1782135443, + "narHash": "sha256-vAmbArdCyjqpVW+37aCy/PMBOLIqukUXLQuEKLwUhA4=", "owner": "BirdeeHub", "repo": "nix-wrapper-modules", - "rev": "168fd6f514a9f8fa47df4fdcf9ecd61db10aec68", + "rev": "6e7f66fa2cdf4d63162580b438f7fcf87c28a46f", "type": "github" }, "original": { diff --git a/modules/features/layers/compose.nix b/modules/features/layers/compose.nix new file mode 100644 index 0000000..8e4a9e6 --- /dev/null +++ b/modules/features/layers/compose.nix @@ -0,0 +1,70 @@ +{ + self, + inputs, + config, + ... +}: +{ + flake.nixosModules.compose = + { pkgs, lib, ... }: + { + config = { + hjem.users.${config.username}.files.".XCompose".source = pkgs.writeTextFile { + name = "compose-config"; + text = '' + include "%L" + + : "α" U03B1 + : "Α" U0391 + : "β" U03B2 + : "Β" U0392 + : "γ" U03B3 + : "Γ" U0393 + : "δ" U03B4 + : "Δ" U0394 + : "ε" U03B5 + : "Ε" U0395 + : "ζ" U03B6 + : "Ζ" U0396 + : "η" U03B7 + : "Η" U0397 + : "θ" U03B8 + : "Θ" U0398 + : "ι" U03B9 + : "Ι" U0399 + : "κ" U03BA + : "Κ" U039A + : "λ" U03BB + : "Λ" U039B + : "μ" U03BC + : "Μ" U039C + : "ν" U03BD + : "Ν" U039D + : "ξ" U03BE + : "Ξ" U039E + : "ο" U03BF + : "Ο" U039F +

: "π" U03C0 +

: "Π" U03A0 + : "ρ" U03C1 + : "Ρ" U03A1 + : "σ" U03C3 + : "Σ" U03A3 + : "ς" U03C2 + : "τ" U03C4 + : "Τ" U03A4 + : "υ" U03C5 + : "Υ" U03A5 + : "φ" U03C6 + : "Φ" U03A6 + : "χ" U03C7 + : "Χ" U03A7 + : "ψ" U03C8 + : "Ψ" U03A8 + : "ω" U03C9 + : "Ω" U03A9 + ''; + }; + }; + }; +}