diff --git a/checks/default.nix b/checks/default.nix index 1ea5427..376d792 100644 --- a/checks/default.nix +++ b/checks/default.nix @@ -16,7 +16,7 @@ treefmt.config = { projectRootFile = ".git/config"; programs = { - nixfmt-rfc-style.enable = true; + nixfmt.enable = true; deadnix.enable = false; }; }; @@ -32,9 +32,7 @@ build = _: nc: nc.config.system.build.toplevel; in { - x86_64-linux = lib.mapAttrs build { - inherit (self.nixosConfigurations) picard; - }; + x86_64-linux = lib.mapAttrs build { inherit (self.nixosConfigurations) picard; }; aarch64-linux = lib.mapAttrs build { inherit (self.nixosConfigurations) sisko; # pbp; }; diff --git a/flake.lock b/flake.lock index 8a2a579..05e2f22 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1726952185, - "narHash": "sha256-l/HbsQjJMT6tlf8KCooFYi3J6wjIips3n6/aWAoLY4g=", + "lastModified": 1730458408, + "narHash": "sha256-JQ+SphQn13bdibKUrBBBznYehXX4xJrxD1ifBp6vSWw=", "owner": "catppuccin", "repo": "nix", - "rev": "630b559cc1cb4c0bdd525af506935323e4ccd5d1", + "rev": "191fbf2d81a63fad8f62f1233c0051f09b75d0ad", "type": "github" }, "original": { @@ -37,18 +37,12 @@ } }, "crane": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] - }, "locked": { - "lastModified": 1721842668, - "narHash": "sha256-k3oiD2z2AAwBFLa4+xfU+7G5fisRXfkvrMTCJrjZzXo=", + "lastModified": 1730652660, + "narHash": "sha256-+XVYfmVXAiYA0FZT7ijHf555dxCe+AoAT5A6RU+6vSo=", "owner": "ipetkov", "repo": "crane", - "rev": "529c1a0b1f29f0d78fa3086b8f6a134c71ef3aaf", + "rev": "a4ca93905455c07cb7e3aca95d4faf7601cba458", "type": "github" }, "original": { @@ -86,11 +80,11 @@ ] }, "locked": { - "lastModified": 1727156717, - "narHash": "sha256-Ef7UgoTdOB4PGQKSkHGu6SOxnTiArPHGcRf8qGFC39o=", + "lastModified": 1731060864, + "narHash": "sha256-aYE7oAYZ+gPU1mPNhM0JwLAQNgjf0/JK1BF1ln2KBgk=", "owner": "nix-community", "repo": "disko", - "rev": "c61e50b63ad50dda5797b1593ad7771be496efbb", + "rev": "5e40e02978e3bd63c2a6a9fa6fa8ba0e310e747f", "type": "github" }, "original": { @@ -106,11 +100,11 @@ "pyproject-nix": "pyproject-nix" }, "locked": { - "lastModified": 1726523340, - "narHash": "sha256-Av5mdR2lAGUVdA6DJ8Anon3/FZg3DX4gl1Ff72rCpKU=", + "lastModified": 1730723587, + "narHash": "sha256-3ewuvm7VB/q3sxn9vzzQ0902PlSdqKqqagr8XbC1hIo=", "owner": "nix-community", "repo": "dream2nix", - "rev": "b76c529f377100516c40c5b6e239a4525fdcabe0", + "rev": "51943fca6b95cb9649236bacf5d7c8d9af4c3bec", "type": "github" }, "original": { @@ -121,16 +115,15 @@ }, "emacs-overlay": { "inputs": { - "flake-utils": "flake-utils", "nixpkgs": "nixpkgs_3", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1728638138, - "narHash": "sha256-9BNhvMzh/bQmm0VhhRrl3fmiIjQnvRrVUwXIM5mtYY4=", + "lastModified": 1731057136, + "narHash": "sha256-/E0UgOD6LnDfJPqCwqa1WVEgwDQ6NXXH+Wq89cMUris=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "b3101a3a0f3883f97fa867ef56b0f29fa2b2b7f1", + "rev": "2313c4189eaef014d01fb260313f58554ddb5e31", "type": "github" }, "original": { @@ -187,6 +180,22 @@ "type": "github" } }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -195,11 +204,11 @@ ] }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -209,6 +218,27 @@ } }, "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "lix-eval-jobs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_2" }, @@ -226,7 +256,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "nixThePlanet", @@ -247,7 +277,7 @@ "type": "indirect" } }, - "flake-parts_4": { + "flake-parts_5": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_3" }, @@ -287,24 +317,6 @@ "inputs": { "systems": "systems_3" }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_4" - }, "locked": { "lastModified": 1681202837, "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", @@ -324,11 +336,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -354,7 +366,7 @@ }, "git-hooks-nix": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "gitignore": "gitignore", "nixpkgs": [ "nixpkgs" @@ -362,11 +374,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1726745158, - "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=", + "lastModified": 1730814269, + "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74", + "rev": "d70155fdc00df4628446352fc58adc640cd705c2", "type": "github" }, "original": { @@ -420,7 +432,7 @@ }, "hercules-ci-effects": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_4", "nixpkgs": "nixpkgs_6" }, "locked": { @@ -486,11 +498,11 @@ ] }, "locked": { - "lastModified": 1727111745, - "narHash": "sha256-EYLvFRoTPWtD+3uDg2wwQvlz88OrIr3zld+jFE5gDcY=", + "lastModified": 1730837930, + "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", "owner": "nix-community", "repo": "home-manager", - "rev": "21c021862fa696c8199934e2153214ab57150cb6", + "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", "type": "github" }, "original": { @@ -522,11 +534,11 @@ }, "impermanence": { "locked": { - "lastModified": 1727198257, - "narHash": "sha256-/qMVI+SG9zvhLbQFOnqb4y4BH6DdK3DQHZU5qGptehc=", + "lastModified": 1730403150, + "narHash": "sha256-W1FH5aJ/GpRCOA7DXT/sJHFpa5r8sq2qAUncWwRZ3Gg=", "owner": "nix-community", "repo": "impermanence", - "rev": "8514fff0f048557723021ffeb31ca55f69b67de3", + "rev": "0d09341beeaa2367bac5d718df1404bf2ce45e6f", "type": "github" }, "original": { @@ -555,7 +567,7 @@ "lanzaboote": { "inputs": { "crane": "crane", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "flake-parts": "flake-parts", "nixpkgs": [ "nixpkgs" @@ -564,11 +576,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1725379389, - "narHash": "sha256-qS1H/5/20ewJIXmf8FN2A5KTOKKU9elWvCPwdBi1P/U=", + "lastModified": 1730739295, + "narHash": "sha256-aYeJ/P/9AuK6Kee63ZdsmDjEwhnksF+gIv/OyGtlBJE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "e7bd94e0b5ff3c1e686f2101004ebf4fcea9d871", + "rev": "cef39a78679c266300874e7a7000b4da066228d4", "type": "github" }, "original": { @@ -580,22 +592,49 @@ "lix": { "flake": false, "locked": { - "lastModified": 1726905313, - "narHash": "sha256-jsOyXonevsNaKxM9burYc2S4JVle+VMCJ8+AAp0MDCc=", + "lastModified": 1728951119, + "narHash": "sha256-vUBgL8zJBDyj2serxdEVbNqe6pBN4YgWwhtg3XP8mpQ=", "ref": "refs/heads/main", - "rev": "5f298f74c92402a8390b01c736463b17b36277e3", - "revCount": 16254, + "rev": "f6077314fa6aff862758095bb55fe844e9162a1d", + "revCount": 16344, "type": "git", "url": "https://git@git.lix.systems/lix-project/lix" }, "original": { + "rev": "f6077314fa6aff862758095bb55fe844e9162a1d", "type": "git", "url": "https://git@git.lix.systems/lix-project/lix" } }, + "lix-eval-jobs": { + "inputs": { + "flake-parts": "flake-parts_2", + "lix": [ + "lix" + ], + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1723579251, + "narHash": "sha256-xnHtfw0gRhV+2S9U7hQwvp2klTy1Iv7FlMMO0/WiMVc=", + "ref": "refs/heads/main", + "rev": "42a160bce2fd9ffebc3809746bc80cc7208f9b08", + "revCount": 609, + "type": "git", + "url": "https://git.lix.systems/lix-project/nix-eval-jobs" + }, + "original": { + "type": "git", + "url": "https://git.lix.systems/lix-project/nix-eval-jobs" + } + }, "lix-module": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "flakey-profile": "flakey-profile", "lix": [ "lix" @@ -605,11 +644,11 @@ ] }, "locked": { - "lastModified": 1726631249, - "narHash": "sha256-b2rMO8+jKjY55d8uynX7FjV4NIPu/WzPux0kWOAzwoo=", + "lastModified": 1727752861, + "narHash": "sha256-jowmo2aEzrEpPSM96IWtajuogdJm7DjAWxFTEb7Ct0s=", "ref": "refs/heads/main", - "rev": "b0e6f359500d66670cc16f521e4f62d6a0a4864e", - "revCount": 110, + "rev": "fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d", + "revCount": 116, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, @@ -621,11 +660,11 @@ "mobile-nixos": { "flake": false, "locked": { - "lastModified": 1726960027, - "narHash": "sha256-BJe+6Gpqu98Mhi1oAfrJK25SZvvQgfYqpmLaXvXgQ9g=", + "lastModified": 1730912712, + "narHash": "sha256-T5A9I6Tfh9zrv9sRWfu/ZKN6VkE670YQ6bjC5sbpTzk=", "owner": "NixOS", "repo": "mobile-nixos", - "rev": "a386813d9ec46fa32e51488f7d48c0e1bde77f8e", + "rev": "2268e358ed407d9c0a4499ae767d105eeaeec586", "type": "github" }, "original": { @@ -660,6 +699,27 @@ "type": "github" } }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "lix-eval-jobs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1720066371, + "narHash": "sha256-uPlLYH2S0ACj0IcgaK9Lsf4spmJoGejR9DotXiXSBZQ=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "622f829f5fe69310a866c8a6cd07e747c44ef820", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, "nix-on-droid": { "inputs": { "home-manager": "home-manager_2", @@ -688,11 +748,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1727003835, - "narHash": "sha256-Cfllbt/ADfO8oxbT984MhPHR6FJBaglsr1SxtDGbpec=", + "lastModified": 1731032247, + "narHash": "sha256-OjLft7fwkmiRLXQsGAudGFZxEYXOT0nHwrQ9GbsBqJ4=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "bd7d1e3912d40f799c5c0f7e5820ec950f1e0b3d", + "rev": "2fbf4a8417c28cf45bae6e6e97248cbbd9b78632", "type": "github" }, "original": { @@ -703,7 +763,7 @@ }, "nixThePlanet": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "hercules-ci-effects": "hercules-ci-effects", "nixpkgs": [ "nixpkgs" @@ -726,11 +786,11 @@ }, "nixosHardware": { "locked": { - "lastModified": 1727040444, - "narHash": "sha256-19FNN5QT9Z11ZUMfftRplyNN+2PgcHKb3oq8KMW/hDA=", + "lastModified": 1730919458, + "narHash": "sha256-yMO0T0QJlmT/x4HEyvrCyigGrdYfIXX3e5gWqB64wLg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d0cb432a9d28218df11cbd77d984a2a46caeb5ac", + "rev": "e1cc1f6483393634aee94514186d21a4871e78d7", "type": "github" }, "original": { @@ -805,14 +865,14 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1725233747, - "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", + "lastModified": 1730504152, + "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" } }, "nixpkgs-lib_2": { @@ -853,11 +913,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1728500571, - "narHash": "sha256-dOymOQ3AfNI4Z337yEwHGohrVQb4yPODCW9MDUyAc4w=", + "lastModified": 1730883749, + "narHash": "sha256-mwrFF0vElHJP8X3pFCByJR365Q2463ATp2qGIrDUdlE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d51c28603def282a24fa034bcb007e2bcb5b5dd0", + "rev": "dba414932936fde69f0606b4f1d87c5bc0003ede", "type": "github" }, "original": { @@ -869,11 +929,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", "type": "github" }, "original": { @@ -901,11 +961,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1720181791, - "narHash": "sha256-i4vJL12/AdyuQuviMMd1Hk2tsGt02hDNhA0Zj1m16N8=", + "lastModified": 1729850857, + "narHash": "sha256-WvLXzNNnnw+qpFOmgaM3JUlNEH+T4s22b5i2oyyCpXE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4284c2b73c8bce4b46a6adf23e16d9e2ec8da4bb", + "rev": "41dea55321e5a999b17033296ac05fe8a8b5a257", "type": "github" }, "original": { @@ -917,11 +977,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { @@ -948,10 +1008,12 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 0, - "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", - "path": "/nix/store/y6205wq8hxvpqvl8l9d1n9xah01kg0lq-source", - "type": "path" + "lastModified": 1718149104, + "narHash": "sha256-Ds1QpobBX2yoUDx9ZruqVGJ/uQPgcXoYuobBguyKEh8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e913ae340076bbb73d9f4d3d065c2bca7caafb16", + "type": "github" }, "original": { "id": "nixpkgs", @@ -976,11 +1038,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { @@ -1104,11 +1166,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1721042469, - "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", + "lastModified": 1730302582, + "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", + "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf", "type": "github" }, "original": { @@ -1119,6 +1181,7 @@ }, "purescript-overlay": { "inputs": { + "flake-compat": "flake-compat", "nixpkgs": [ "dream2nix", "nixpkgs" @@ -1126,11 +1189,11 @@ "slimlock": "slimlock" }, "locked": { - "lastModified": 1696022621, - "narHash": "sha256-eMjFmsj2G1E0Q5XiibUNgFjTiSz0GxIeSSzzVdoN730=", + "lastModified": 1728546539, + "narHash": "sha256-Sws7w0tlnjD+Bjck1nv29NjC5DbL6nH5auL9Ex9Iz2A=", "owner": "thomashoneyman", "repo": "purescript-overlay", - "rev": "047c7933abd6da8aa239904422e22d190ce55ead", + "rev": "4ad4c15d07bd899d7346b331f377606631eb0ee4", "type": "github" }, "original": { @@ -1159,13 +1222,13 @@ "rock5b": { "inputs": { "fan-control": "fan-control", - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_5", "kernel-src": "kernel-src", "nixpkgs": "nixpkgs_8", "nixpkgs-kernel": "nixpkgs-kernel", "panfork": "panfork", "tow-boot": "tow-boot", - "treefmt-nix": "treefmt-nix" + "treefmt-nix": "treefmt-nix_2" }, "locked": { "lastModified": 1685695782, @@ -1195,6 +1258,7 @@ "impermanence": "impermanence", "lanzaboote": "lanzaboote", "lix": "lix", + "lix-eval-jobs": "lix-eval-jobs", "lix-module": "lix-module", "mobile-nixos": "mobile-nixos", "nix-on-droid": "nix-on-droid", @@ -1203,7 +1267,7 @@ "nixosHardware": "nixosHardware", "nixpkgs": "nixpkgs_7", "rock5b": "rock5b", - "treefmt-nix": "treefmt-nix_2", + "treefmt-nix": "treefmt-nix_3", "vscode-server": "vscode-server" } }, @@ -1215,11 +1279,11 @@ ] }, "locked": { - "lastModified": 1722219664, - "narHash": "sha256-xMOJ+HW4yj6e69PvieohUJ3dBSdgCfvI0nnCEe6/yVc=", + "lastModified": 1730601085, + "narHash": "sha256-Sgax33jGuvVHTjl1P78IwzlhAGyOxtx5Q26inKja8S4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a6fbda5d9a14fb5f7c69b8489d24afeb349c7bb4", + "rev": "8d1b40f8dfd7539aaa3de56e207e22b3cc451825", "type": "github" }, "original": { @@ -1253,11 +1317,11 @@ ] }, "locked": { - "lastModified": 1688610262, - "narHash": "sha256-Wg0ViDotFWGWqKIQzyYCgayeH8s4U1OZcTiWTQYdAp4=", + "lastModified": 1688756706, + "narHash": "sha256-xzkkMv3neJJJ89zo3o2ojp7nFeaZc2G0fYwNXNJRFlo=", "owner": "thomashoneyman", "repo": "slimlock", - "rev": "b5c6cdcaf636ebbebd0a1f32520929394493f1a6", + "rev": "cf72723f59e2340d24881fd7bf61cb113b4c407c", "type": "github" }, "original": { @@ -1311,21 +1375,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" - } - }, "tow-boot": { "flake": false, "locked": { @@ -1344,6 +1393,27 @@ } }, "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "lix-eval-jobs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1723454642, + "narHash": "sha256-S0Gvsenh0II7EAaoc9158ZB4vYyuycvMGKGxIbERNAM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "349de7bc435bdff37785c2466f054ed1766173be", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_2": { "inputs": { "nixpkgs": [ "rock5b", @@ -1364,18 +1434,18 @@ "type": "github" } }, - "treefmt-nix_2": { + "treefmt-nix_3": { "inputs": { "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1727098951, - "narHash": "sha256-gplorAc0ISAUPemUNOnRUs7jr3WiLiHZb3DJh++IkZs=", + "lastModified": 1730321837, + "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "35dfece10c642eb52928a48bee7ac06a59f93e9a", + "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", "type": "github" }, "original": { @@ -1386,15 +1456,15 @@ }, "vscode-server": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1713958148, - "narHash": "sha256-8PDNi/dgoI2kyM7uSiU4eoLBqUKoA+3TXuz+VWmuCOc=", + "lastModified": 1729422940, + "narHash": "sha256-DlvJv33ml5UTKgu4b0HauOfFIoDx6QXtbqUF3vWeRCY=", "owner": "nix-community", "repo": "nixos-vscode-server", - "rev": "fc900c16efc6a5ed972fb6be87df018bcf3035bc", + "rev": "8b6db451de46ecf9b4ab3d01ef76e59957ff549f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 72b2a1f..e62a744 100644 --- a/flake.nix +++ b/flake.nix @@ -38,7 +38,7 @@ }; nix-on-droid.url = "github:nix-community/nix-on-droid"; lix = { - url = "git+https://git@git.lix.systems/lix-project/lix"; + url = "git+https://git@git.lix.systems/lix-project/lix?rev=f6077314fa6aff862758095bb55fe844e9162a1d"; # FIXME update flake = false; }; lix-module = { @@ -46,6 +46,11 @@ inputs.lix.follows = "lix"; inputs.nixpkgs.follows = "nixpkgs"; }; + lix-eval-jobs = { + url = "git+https://git.lix.systems/lix-project/nix-eval-jobs"; + inputs.lix.follows = "lix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; mobile-nixos = { url = "github:NixOS/mobile-nixos"; flake = false; diff --git a/hmModules/emacs/init.el b/hmModules/emacs/init.el index 1dee394..154a4bc 100644 --- a/hmModules/emacs/init.el +++ b/hmModules/emacs/init.el @@ -1,11 +1,10 @@ ;; package --- My Emacs config -*- lexical-binding:t -*- ;; Author: Andrea Ciceri ;;; Commentary: -;; TODO -;; - org-roam -;; - org goodies -;; - persp-mode? -;; - understand how to configure cape +;; TODO org goodies +;; TODO understand how to configure cape +;; TODO org-roam-protocol to capture notes from the browser +;; TODO attach documents (like PDFs) to my Zettelkasten notes ;;; Code: @@ -720,7 +719,13 @@ This is meant to be an helper to be called from the window manager." (set-face-attribute face nil :inherit 'fixed-pitch)) (org-babel-do-load-languages - 'org-babel-load-languages '((haskell . t)))) + 'org-babel-load-languages '((haskell . t))) + + (defun ccr/org-attach-save-file-list-to-property (dir) + "Save list of attachments to ORG_ATTACH_FILES property." + (when-let* ((files (org-attach-file-list dir))) + (org-set-property "ORG_ATTACH_FILES" (mapconcat #'identity files ", ")))) + (add-hook 'org-attach-after-change-hook #'ccr/org-attach-save-file-list-to-property)) (use-package org-agenda :custom @@ -764,7 +769,7 @@ This is meant to be an helper to be called from the window manager." '( ("d" "Generic entry" entry "* %?" - :target (file+head "%<%Y-%m-%d>.org" "#+title %<%Y-%m-%d>")) + :target (file+head "%<%Y-%m-%d>.org" "#+TITLE: %<%Y-%m-%d>")) ("b" "Billable entry" entry "* TODO ${Entry} :billable:${Client}:\n:PROPERTIES:\n:SPENT: ${Spent}\n:END:\n%?" :target (file+head "%<%Y-%m-%d>.org" "#+title %<%Y-%m-%d>") @@ -869,7 +874,7 @@ This is meant to be an helper to be called from the window manager." (end-pos (line-end-position))) (gptel-request (buffer-substring-no-properties start-pos end-pos) ;the prompt - :system "You are proficient with emacs shell (eshell), translate the following to something I could directly prompt to the shell. Your responses should only be code, without explanation or formatting." + :system "You are proficient with emacs shell (eshell), translate the following to something I could directly prompt to the shell. Your responses should only be code, without explanation or formatting or quoting." :buffer (current-buffer) :context (cons (set-marker (make-marker) start-pos) (set-marker (make-marker) end-pos)) diff --git a/hmModules/hyprland/default.nix b/hmModules/hyprland/default.nix index 92ffe67..bcc035e 100644 --- a/hmModules/hyprland/default.nix +++ b/hmModules/hyprland/default.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: +{ config, pkgs, ... }: let screenshotScript = pkgs.writeShellScriptBin "screenshot.sh" '' filename="$HOME/shots/$(date --iso-8601=seconds).png" @@ -28,7 +24,7 @@ in ../swayidle ../gammastep # ../wezterm - ../wayvnc + # ../wayvnc ../swaync ../foot ]; @@ -61,11 +57,11 @@ in name = "Adwaita"; package = pkgs.adwaita-icon-theme; }; - # cursorTheme = { - # name = "catppuccin-mocha-sapphire"; - # package = pkgs.catppuccin-cursors; - # size = 48; - # }; + cursorTheme = { + name = "catppuccin-mocha-sapphire"; + package = pkgs.catppuccin-cursors; + size = 40; + }; }; qt = { diff --git a/hmModules/hyprland/hyprland.conf b/hmModules/hyprland/hyprland.conf index 79ef97a..1243b85 100644 --- a/hmModules/hyprland/hyprland.conf +++ b/hmModules/hyprland/hyprland.conf @@ -5,9 +5,9 @@ cursor { } env = HYPRCURSOR_THEME,catppuccin-mocha-sapphire -env = HYPRCURSOR_SIZE,48 +env = HYPRCURSOR_SIZE,40 env = XCURSOR_THEME,catppuccin-mocha-sapphire -env = XCURSOR_SIZE,48 +env = XCURSOR_SIZE,40 $mod = SUPER @@ -35,6 +35,7 @@ bind = $mod, t, exec, footclient $SHELL bind = $mod, RETURN, exec, emacsclient -c --eval "(ccr/start-eshell)" bind = $mod, m, exec, emacsclient -c --eval '(notmuch-search "tag:new")' bind = $mod, g, exec, emacsclient -c --eval '(switch-to-buffer (gptel "*ChatGPT*"))' +bind = $mod, c, exec, emacsclient -c --eval '(org-roam-dailies-capture-today)' bind = $mod, d, exec, fuzzel --background-color=253559cc --border-radius=5 --border-width=0 bind = $mod, s, exec, screenshot.sh bind = $mod, n, exec, logseq diff --git a/hosts/kirk/default.nix b/hosts/kirk/default.nix index e2321fa..3b17a67 100644 --- a/hosts/kirk/default.nix +++ b/hosts/kirk/default.nix @@ -36,9 +36,7 @@ "promtail" "syncthing" ] - ++ [ - ./disko.nix - ]; + ++ [ ./disko.nix ]; ccr = { enable = true; @@ -86,11 +84,9 @@ "usb_storage" "sd_mod" ]; - boot.kernelModules = [ - "kvm-intel" - ]; + boot.kernelModules = [ "kvm-intel" ]; - boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_10; + boot.kernelPackages = pkgs.linuxPackages; boot.loader.efi.canTouchEfiVariables = true; boot.loader.systemd-boot = { diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix index 0501993..fd17130 100644 --- a/hosts/picard/default.nix +++ b/hosts/picard/default.nix @@ -43,9 +43,7 @@ "prometheus-exporters" "promtail" ] - ++ [ - ./disko.nix - ]; + ++ [ ./disko.nix ]; ccr = { enable = true; @@ -126,17 +124,17 @@ })) ]; - systemd.services.ddcci = { - script = '' - echo 'ddcci 0x37' > /sys/bus/i2c/devices/i2c-2/new_device - ''; - wantedBy = [ "graphical.target" ]; - restartIfChanged = false; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - }; - }; + # systemd.services.ddcci = { + # script = '' + # echo 'ddcci 0x37' > /sys/bus/i2c/devices/i2c-2/new_device + # ''; + # wantedBy = [ "graphical.target" ]; + # restartIfChanged = false; + # serviceConfig = { + # Type = "oneshot"; + # RemainAfterExit = true; + # }; + # }; boot.loader.efi.canTouchEfiVariables = true; boot.loader.systemd-boot = { @@ -148,7 +146,7 @@ configurationLimit = 20; }; - boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_10; + boot.kernelPackages = pkgs.linuxPackages; networking.hostId = "5b02e763"; diff --git a/modules/nix/default.nix b/modules/nix/default.nix index cf855e4..84e36c4 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -5,6 +5,14 @@ ... }: { + nixpkgs.overlays = [ + (final: _: { + nix-eval-job = fleetFlake.inputs.lix-eval-jobs.packages.${final.system}.nix-eval-jobs // { + nix = final.nix; + }; + }) + ]; + nix = { optimise.automatic = true; diff --git a/packages/emacs/packages.nix b/packages/emacs/packages.nix index ea483fd..2f30f68 100644 --- a/packages/emacs/packages.nix +++ b/packages/emacs/packages.nix @@ -2,89 +2,114 @@ pkgs: epkgs: let inherit (epkgs) melpaPackages nongnuPackages elpaPackages; - # *Attrset* containig extra emacs packages from flake inputs + buildEmacsPackage = + args: + epkgs.trivialBuild { + pname = args.name; + inherit (args) src; + version = args.src.rev; + propagatedUserEnvPkgs = args.deps; + buildInputs = args.deps; + }; + + # *Attrset* containig extra emacs packages + extraPackages = { + combobulate = buildEmacsPackage { + name = "combobulate"; + src = pkgs.fetchFromGitHub { + owner = "mickeynp"; + repo = "combobulate"; + rev = "e9c5be84062e8183f556d7133d5a477a57e37e51"; + hash = "sha256-r6jObsYx7RRTJUmrCN5h3+0WcHqJA67emhr4/W3rBrM="; + }; + deps = [ ]; + }; + }; # *List* containing emacs packages from (M)ELPA mainPackages = - # builtins.filter - # if an extra package has the same name then give precedence to it - # (package: ! builtins.elem package.pname (builtins.attrNames extraPackages)) - (with melpaPackages; [ - meow - meow-tree-sitter - dracula-theme - nord-theme - catppuccin-theme - modus-themes - # solaire-mode - nerd-icons - nerd-icons-completion - nerd-icons-ibuffer - nerd-icons-dired - ligature - treemacs-nerd-icons - eshell-syntax-highlighting - fish-completion # fish completion for eshell - eshell-prompt-extras - eshell-atuin - eshell-command-not-found - clipetty - sideline - consult-eglot - # sideline-flymake - rainbow-delimiters - vertico - marginalia - consult - orderless - embark - embark-consult - magit - magit-delta - magit-todos - difftastic - with-editor - diff-hl - corfu - cape - which-key - nix-mode - nix-ts-mode - agenix - zig-mode - unisonlang-mode - purescript-mode - dhall-mode - envrc - inheritenv - popper - paredit - yaml-mode - hl-todo - markdown-mode - haskell-mode - terraform-mode - diredfl - org-modern - org-roam - org-roam-ql - org-roam-ui - visual-fill-column - consult-org-roam - pass - password-store-otp - eldoc-box - go-translate - notmuch - consult-notmuch - poly-org - casual-calc - gptel - agenix - solidity-mode - # org-re-reveal # FIXME very not nice hash mismatch when building - # gptel # TODO uncomment when there will be a new release including GPT-4o - ]) + builtins.filter + # if an extra package has the same name then give precedence to it + (package: !builtins.elem package.pname (builtins.attrNames extraPackages)) + ( + with melpaPackages; + [ + meow + meow-tree-sitter + dracula-theme + nord-theme + catppuccin-theme + modus-themes + # solaire-mode + nerd-icons + nerd-icons-completion + nerd-icons-ibuffer + nerd-icons-dired + ligature + treemacs-nerd-icons + eshell-syntax-highlighting + fish-completion # fish completion for eshell + eshell-prompt-extras + eshell-atuin + eshell-command-not-found + clipetty + sideline + consult-eglot + # sideline-flymake + rainbow-delimiters + vertico + marginalia + consult + orderless + embark + embark-consult + magit + magit-delta + magit-todos + difftastic + with-editor + diff-hl + corfu + cape + which-key + nix-mode + nix-ts-mode + agenix + zig-mode + unisonlang-mode + purescript-mode + dhall-mode + envrc + inheritenv + popper + paredit + yaml-mode + hl-todo + markdown-mode + haskell-mode + terraform-mode + diredfl + org-modern + org-roam + org-roam-ql + org-roam-ui + visual-fill-column + consult-org-roam + pass + password-store-otp + eldoc-box + go-translate + notmuch + consult-notmuch + poly-org + casual + gptel + agenix + solidity-mode + # org-re-reveal # FIXME very not nice hash mismatch when building + # gptel # TODO uncomment when there will be a new release including GPT-4o + ] + ) ++ (with elpaPackages; [ delight kind-icon @@ -98,13 +123,4 @@ let haskell-ts-mode ]); in -mainPackages -# ++ (builtins.attrValues extraPackages) -# Playing with EAF -++ [ - # Disabled because pymupdf was broken - # (pkgs.callPackage ./eaf.nix { - # inherit (epkgs) melpaBuild; - # inherit (melpaPackages) ctable deferred epc s; - # }) -] +mainPackages ++ (builtins.attrValues extraPackages)