From 54c32312323bf7c22dd95ceada3c5ffbf549cd91 Mon Sep 17 00:00:00 2001 From: Ɓukasz Niemier <~@hauleth.dev> Date: Mon, 10 Nov 2025 13:59:08 +0000 Subject: [PATCH] Upgrade Flakes and fix Lexical to use OTP 27 --- flake.lock | 55 +++++++++++++++++++++++++++---------------------------- flake.nix | 2 +- modules/irc.nix | 16 ++++++++++++++++ modules/nvim.nix | 8 ++++++-- 4 file(s) changed, 50 insertion(s)(+), 31 deletion(s)(-) diff --git a/flake.lock b/flake.lock --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ "nixpkgs" ] }, "locked": { - "lastModified": 1758805352, - "narHash": "sha256-BHdc43Lkayd+72W/NXRKHzX5AZ+28F3xaUs3a88/Uew=", + "lastModified": 1762627886, + "narHash": "sha256-/QLk1bzmbcqJt9sU43+y/3tHtXhAy0l8Ck0MoO2+evQ=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "c48e963a5558eb1c3827d59d21c5193622a1477c", + "rev": "5125a3cd414dc98bbe2c528227aa6b62ee61f733", "type": "github" }, "original": { @@ -43,11 +43,11 @@ } }, "darwin-stable": { "locked": { - "lastModified": 1759829640, - "narHash": "sha256-+JzTuQct41bA8+ggQU/gOGwa6T5fRt0bEN5OZYtumX8=", + "lastModified": 1762554677, + "narHash": "sha256-U+fP0JeohDFGRU30jeIAeQFAl6/PVfWJPabWPzUmRFI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "037b75c96038e4b2da1bf38291436896a7ac5317", + "rev": "dd11e87513e1efcd62fd9ac27acaded5b49b63ab", "type": "github" }, "original": { @@ -94,11 +94,11 @@ "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1759362264, - "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", + "lastModified": 1762440070, + "narHash": "sha256-xxdepIcb39UJ94+YydGP221rjnpkDZUlykKuF54PsqI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", + "rev": "26d05891e14c88eb4a5d5bee659c0db5afb609d8", "type": "github" }, "original": { @@ -228,11 +228,11 @@ "nixpkgs" ] }, "locked": { - "lastModified": 1760005512, - "narHash": "sha256-xJ/pn6d9aYa9Eco+zjX7OoxSmaFf82q22u1Rjii9Bp0=", + "lastModified": 1762721397, + "narHash": "sha256-E428EuouA4nFTNlLuqlL4lVR78X+EbBIqDqsBFnB79w=", "owner": "nix-community", "repo": "home-manager", - "rev": "685d8d85d051820164c809fbbc4c67474ee93d67", + "rev": "b8645b18b0f5374127bbade6de7381ef0b3d5720", "type": "github" }, "original": { @@ -264,11 +264,10 @@ }, "lix": { "flake": false, "locked": { - "lastModified": 1759842985, - "narHash": "sha256-/mpSKcHQdQ2zXXcmOhhlA39pz4Eh4s8Q0ROwdE7Xlmg=", - "rev": "9bfef6a06c806c813b2c6ebcea9c8c4abc7c5298", + "lastModified": 1759940703, + "narHash": "sha256-/dXDCzYnQbkqCsvUDIxgIH4BS/fyxIu73m2v4ftJLXQ=", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/9bfef6a06c806c813b2c6ebcea9c8c4abc7c5298.tar.gz?rev=9bfef6a06c806c813b2c6ebcea9c8c4abc7c5298" + "url": "https://git.lix.systems/lix-project/lix/archive/release-2.93.tar.gz" }, "original": { "type": "tarball", @@ -301,11 +300,11 @@ }, "neorg": { "flake": false, "locked": { - "lastModified": 1758674675, - "narHash": "sha256-DFpbdBfyW32d4QhH59+melM7cHK9tzm9awKjTDPJOvs=", + "lastModified": 1761838636, + "narHash": "sha256-aypMPbtBhhcFLMmdnUh/8e6cOQM7bVfezpXoLwVt1ak=", "owner": "nvim-neorg", "repo": "neorg", - "rev": "4da2159b3f3420d43613f43e159f4253b8544474", + "rev": "59775af2fadb85cec6bff08a584c2c98a1694ea6", "type": "github" }, "original": { @@ -326,11 +325,11 @@ "norg": "norg", "norg-meta": "norg-meta" }, "locked": { - "lastModified": 1759972722, - "narHash": "sha256-kq3jIt1oeiG57/nNnfep5XVicLGXoESCgDYj6E5HVBg=", + "lastModified": 1762669532, + "narHash": "sha256-uvAShvbTAuHho2IspvXlPRkTER0noha5VWig64CSJqs=", "owner": "nvim-neorg", "repo": "nixpkgs-neorg-overlay", - "rev": "cae63debfba88f262a1cffe98dc8fb326e07cdc5", + "rev": "543c60e7804e700ff3bae31f44ecccf7e8c07b4a", "type": "github" }, "original": { @@ -371,11 +370,11 @@ } }, "nixpkgs-lib": { "locked": { - "lastModified": 1754788789, - "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", + "lastModified": 1761765539, + "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "a73b9c743612e4244d865a2fdee11865283c04e6", + "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc", "type": "github" }, "original": { @@ -430,11 +429,11 @@ } }, "nixpkgs_4": { "locked": { - "lastModified": 1759917807, - "narHash": "sha256-WoSazth5EXIJmveWf0zbTMycrgpbLYOth6KhmltMuv0=", + "lastModified": 1762482733, + "narHash": "sha256-g/da4FzvckvbiZT075Sb1/YDNDr+tGQgh4N8i5ceYMg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fb5cf53218b987f2703a5bbc292a030c0fe33443", + "rev": "e1ebeec86b771e9d387dd02d82ffdc77ac753abc", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix --- a/flake.nix +++ b/flake.nix @@ -63,7 +63,7 @@ flake = { lib = import ./lib.nix inputs; # TODO: Automatically discover and build that - darwinConfigurations."NiunioBook" = + darwinConfigurations."Niuniobook" = (import ./hosts/niuniobook.nix {inherit inputs;}) .system; diff --git a/modules/irc.nix b/modules/irc.nix new file mode 100644 --- /dev/null +++ b/modules/irc.nix @@ -0,0 +1,16 @@ +{ + pkgs, + ... +}: { + programs.halloy = { + enable = true; + # Managed externally + package = null; + + config = { + "servers.senpai" = { + server = "heimdall.hauleth.dev"; + }; + }; + }; +} diff --git a/modules/nvim.nix b/modules/nvim.nix --- a/modules/nvim.nix +++ b/modules/nvim.nix @@ -9,13 +9,17 @@ configure = { # Add Fennel to Lua path and require basic implementation # # runtimepath editing is not yet perfect, but works good enough so far - customRC = '' + customRC = let + lexical = pkgs.lexical.override { + beamPackages = pkgs.beam27Packages; + }; + in '' set runtimepath+=${./nvim}/after set runtimepath^=${./nvim} lua << EOF vim.g.lsp_paths = { ['rust_analyzer'] = "${pkgs.rust-analyzer}/bin/rust-analyzer", - ['lexical'] = "${pkgs.lexical}/bin/lexical", + ['lexical'] = "${lexical}/bin/lexical", ['typos_lsp'] = "${pkgs.typos-lsp}/bin/typos-lsp" } package.path = package.path .. ";${pkgs.luajitPackages.fennel}/share/lua/5.1/?.lua" -- tangled.sh