From 6942f0759e6880b28f23e1b2fba73b39df8985ab Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Wed, 6 May 2026 20:06:46 -0400 Subject: [PATCH] bump lix --- clients/quadraticserver/lasuite-docs.nix | 4 + flake.lock | 159 +++++++++++------------ flake.nix | 3 +- modules/common/dns.nix | 1 + modules/common/lix.nix | 6 +- modules/server/caddy.nix | 2 +- 6 files changed, 90 insertions(+), 85 deletions(-) diff --git a/clients/quadraticserver/lasuite-docs.nix b/clients/quadraticserver/lasuite-docs.nix index b87b821..fee9bc0 100644 --- a/clients/quadraticserver/lasuite-docs.nix +++ b/clients/quadraticserver/lasuite-docs.nix @@ -136,4 +136,8 @@ in ''; }; }; + + nixpkgs.config.permittedInsecurePackages = [ + "minio-2025-10-15T17-29-55Z" + ]; } diff --git a/flake.lock b/flake.lock index 1fb1b53..0b88e77 100644 --- a/flake.lock +++ b/flake.lock @@ -181,11 +181,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1760703920, - "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=", + "lastModified": 1776754714, + "narHash": "sha256-E3OAK27smtATTmX45uoTSRsVD+Y+ZiVVfgM/tjpbtYg=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "d646af9b7d14bff08824538164af99d0c521b185", + "rev": "4d508123037e7851ad36ebf7d9c48b0e9e1eb581", "type": "github" }, "original": { @@ -563,11 +563,11 @@ ] }, "locked": { - "lastModified": 1773889306, - "narHash": "sha256-PAqwnsBSI9SVC2QugvQ3xeYCB0otOwCacB1ueQj2tgw=", + "lastModified": 1777713215, + "narHash": "sha256-8GzXDOXckDWwST8TY5DbwYFjdvQLlP7K9CLSVx6iTTo=", "owner": "nix-community", "repo": "disko", - "rev": "5ad85c82cc52264f4beddc934ba57f3789f28347", + "rev": "63b4e7e6cf75307c1d26ac3762b886b5b0247267", "type": "github" }, "original": { @@ -687,17 +687,18 @@ "original": { "owner": "nferhat", "repo": "fht-compositor", + "rev": "a6a03db175083749889dbcc0ab1e53fbc4e5d191", "type": "github" } }, "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1773024283, - "narHash": "sha256-6cGDN/2iSNUJWp035zzr6BZCzFtO92PIKNeWxuwPPcA=", + "lastModified": 1776136500, + "narHash": "sha256-r0gN2brVWA351zwMV0Flmlcd6SGMvYqFbvC3DfKFM8Y=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "43bc26501a637c68df723645966b77168cefa9d0", + "rev": "0f8ba203d475587f477e7ae12661bd8459e225b7", "type": "github" }, "original": { @@ -709,11 +710,11 @@ "firefox-gnome-theme_2": { "flake": false, "locked": { - "lastModified": 1764873433, - "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=", + "lastModified": 1776136500, + "narHash": "sha256-r0gN2brVWA351zwMV0Flmlcd6SGMvYqFbvC3DfKFM8Y=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92", + "rev": "0f8ba203d475587f477e7ae12661bd8459e225b7", "type": "github" }, "original": { @@ -827,11 +828,11 @@ "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { - "lastModified": 1772408722, - "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", + "lastModified": 1777898446, + "narHash": "sha256-tTEOTTjMHd8Vffn4hehLTPgOXXxJ27xfkf4DoyZgD7s=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", + "rev": "5d82aa3d6b5da25dbfec1a995750a70a03b8c659", "type": "github" }, "original": { @@ -941,11 +942,11 @@ ] }, "locked": { - "lastModified": 1767609335, - "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", + "lastModified": 1775087534, + "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "250481aafeb741edfe23d29195671c19b36b6dca", + "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "type": "github" }, "original": { @@ -1176,20 +1177,18 @@ "gnome-shell": { "flake": false, "locked": { - "host": "gitlab.gnome.org", "lastModified": 1767737596, "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", "owner": "GNOME", "repo": "gnome-shell", "rev": "ef02db02bf0ff342734d525b5767814770d85b49", - "type": "gitlab" + "type": "github" }, "original": { - "host": "gitlab.gnome.org", "owner": "GNOME", - "ref": "gnome-49", "repo": "gnome-shell", - "type": "gitlab" + "rev": "ef02db02bf0ff342734d525b5767814770d85b49", + "type": "github" } }, "haumea": { @@ -1241,11 +1240,11 @@ ] }, "locked": { - "lastModified": 1774626137, - "narHash": "sha256-1WelwA45Xm4glTG8R9IX9jYeFKDG2HbR79jAauLezUE=", + "lastModified": 1777913624, + "narHash": "sha256-4MwfrGuqjsnEORQbM3cmkmG/9cWhDV63dTDguDj4FXw=", "owner": "nix-community", "repo": "home-manager", - "rev": "9df3a639007cfe0d074433f7fc225ea94f877d08", + "rev": "a89686d115e970e200eb2caa7603f3673050e00c", "type": "github" }, "original": { @@ -1690,11 +1689,11 @@ ] }, "locked": { - "lastModified": 1777730560, - "narHash": "sha256-7+oS+i6073D+c/IhVWvgpyn/4pQkfIXQIXOfqwTKcfA=", + "lastModified": 1777913584, + "narHash": "sha256-/1VKODbp6PF5cDK0yQnI/fTxT9ACYZK/HzNaIOST0Uo=", "ref": "refs/heads/main", - "rev": "a8ae10c9ceb1bda9d9bd40ef03f46c08ef5aa4a7", - "revCount": 479, + "rev": "e310f0f60ead18c77b8da2259c8cffe7b617cffb", + "revCount": 487, "submodules": true, "type": "git", "url": "https://git.federated.nexus/nexus/Nexus" @@ -1931,11 +1930,11 @@ }, "nix-maid": { "locked": { - "lastModified": 1773936899, - "narHash": "sha256-7+yBgfNkfCIsuEf+mG7XAaYWCoFl81GF0KM3Mh2b96w=", + "lastModified": 1775372244, + "narHash": "sha256-pLCCqY/0JC7QdWqyEyDEvGl63f9aS8zrFLVJW7gUMKI=", "owner": "viperML", "repo": "nix-maid", - "rev": "c79bffc8be26c8ad04b709453670263cec66bfe0", + "rev": "993d95a0a5b2f4b06faa022b32112b699ca3bbfd", "type": "github" }, "original": { @@ -2241,11 +2240,11 @@ }, "nixpkgs-custom": { "locked": { - "lastModified": 1777829822, - "narHash": "sha256-vUejy54TKE3s7QlqqmEMlwDq5r0X7s8lX2tcdEBT9Js=", + "lastModified": 1777904289, + "narHash": "sha256-gitWNNplomLVJKXJ32Brt/lwA+ynifePesED8HikbC8=", "owner": "Henry-Hiles", "repo": "nixpkgs", - "rev": "5eb2434dc0e1d86be24ea989d594c57363ce9647", + "rev": "e9f05ae511bcc73da2ecb091546e218f72e28e89", "type": "github" }, "original": { @@ -2302,11 +2301,11 @@ }, "nixpkgs-lib_3": { "locked": { - "lastModified": 1772328832, - "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", + "lastModified": 1777168982, + "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742", + "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", "type": "github" }, "original": { @@ -2375,6 +2374,21 @@ "type": "github" } }, + "nixpkgs-master": { + "locked": { + "lastModified": 1777934504, + "narHash": "sha256-fKpD3A24MpEqCxUDXv2vdTpOq03FgH1gxVKh8XTQUFc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "80386726c34f0db4f9a990218ca3c5b37fb6ae14", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-riscv": { "locked": { "lastModified": 1752147015, @@ -2441,11 +2455,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1774386573, - "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", + "lastModified": 1777578337, + "narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", + "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab", "type": "github" }, "original": { @@ -2467,11 +2481,11 @@ ] }, "locked": { - "lastModified": 1767810917, - "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=", + "lastModified": 1777598946, + "narHash": "sha256-X239dAGaU1+gfDj8jKH8GzlqKMcxaVfXOio+uzBOkeE=", "owner": "nix-community", "repo": "NUR", - "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4", + "rev": "5d55af01c0f86be583931fe99207fc56c14134b3", "type": "github" }, "original": { @@ -2710,6 +2724,7 @@ "nix-matrix-appservices": "nix-matrix-appservices", "nixpkgs": "nixpkgs_2", "nixpkgs-custom": "nixpkgs-custom", + "nixpkgs-master": "nixpkgs-master", "nixpkgs-sable": "nixpkgs-sable", "redlib": "redlib", "run0-sudo-shim": "run0-sudo-shim", @@ -2728,11 +2743,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1774550565, - "narHash": "sha256-5MLZTT9UDFJeOrtp+VKEkWSwLsx0ZMHkuPlcLPFoxlE=", + "lastModified": 1774702115, + "narHash": "sha256-iZ0HSQwjr9nYpVn10ZI4zQTdqvSggfxhXZ1c4oSZnuc=", "owner": "lordgrimmauld", "repo": "run0-sudo-shim", - "rev": "ef368ac5a90d0cc1977deae10f4cf7373c36786c", + "rev": "c9e06e2f220ab2fcf2228d4315c0a7fc2dc6e438", "type": "github" }, "original": { @@ -2799,11 +2814,11 @@ "sable": { "flake": false, "locked": { - "lastModified": 1776983101, - "narHash": "sha256-W9YHv4EV4yfkHlJdoAKuI7LX2bMB89+LN+6960Eu3Ic=", + "lastModified": 1777931170, + "narHash": "sha256-EfZpYGeMosFegSsDfHCGgbMauczFSC6+yq3cRKUq6uQ=", "owner": "sableclient", "repo": "sable", - "rev": "cbb225168b6e262dcc2520ec5e4ca2edbff4ee59", + "rev": "3b6fd542fd740f35e8359737ba0c8e8d0a7f78e6", "type": "github" }, "original": { @@ -2930,18 +2945,17 @@ ], "nur": "nur", "systems": "systems_5", - "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1774124764, - "narHash": "sha256-Poz9WTjiRlqZIf197CrMMJfTifZhrZpbHFv0eU1Nhtg=", + "lastModified": 1777835090, + "narHash": "sha256-VLH8zPweblCOvpnQXp4fVs7f6Q79YhXF5XFKlOrvIFk=", "owner": "danth", "repo": "stylix", - "rev": "e31c79f571c5595a155f84b9d77ce53a84745494", + "rev": "7989a1054b01153212dede6005abfd1576b8328c", "type": "github" }, "original": { @@ -3025,23 +3039,6 @@ "type": "github" } }, - "tinted-foot": { - "flake": false, - "locked": { - "lastModified": 1726913040, - "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - } - }, "tinted-kitty": { "flake": false, "locked": { @@ -3061,11 +3058,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1767710407, - "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=", + "lastModified": 1777041405, + "narHash": "sha256-BAGZ7ObFV/9Z61OJZun7ifPyhkuHqNuW1QIhQ8LuzCo=", "owner": "tinted-theming", "repo": "schemes", - "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2", + "rev": "5f868b3a338b6904c47f3833b9c411be641983a8", "type": "github" }, "original": { @@ -3077,11 +3074,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1767489635, - "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=", + "lastModified": 1777169200, + "narHash": "sha256-h7dDbIzP5hDr9v97w9PL6jdAgXawmj6krcH+959rqpU=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184", + "rev": "f798c2dce44ef815bb6b8f05a82135c7942d35ac", "type": "github" }, "original": { @@ -3093,11 +3090,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1767488740, - "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=", + "lastModified": 1777463218, + "narHash": "sha256-Bhkozqtq3BKLqWTlmKm8uAptfX4aRGI8QX3eEL54Vpc=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40", + "rev": "5768d08ed2e7944a26a958868cdb073cb8856dae", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3d0c6a0..9dafc90 100755 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,7 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-custom.url = "github:Henry-Hiles/nixpkgs"; nixpkgs-sable.url = "github:fugidev/nixpkgs/sable"; + nixpkgs-master.url = "github:nixos/nixpkgs"; wrapper-manager.url = "github:viperML/wrapper-manager"; flake-parts.url = "github:hercules-ci/flake-parts"; nix-maid.url = "github:viperML/nix-maid"; @@ -76,7 +77,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; fht-compositor = { - url = "github:nferhat/fht-compositor"; + url = "github:nferhat/fht-compositor?rev=a6a03db175083749889dbcc0ab1e53fbc4e5d191"; inputs = { nixpkgs.follows = "nixpkgs"; rust-overlay.follows = ""; diff --git a/modules/common/dns.nix b/modules/common/dns.nix index ee4fe26..934e7af 100644 --- a/modules/common/dns.nix +++ b/modules/common/dns.nix @@ -16,4 +16,5 @@ }; environment.etc."resolv.conf".text = lib.mkForce "nameserver 127.0.0.1"; + networking.resolvconf.enable = false; } diff --git a/modules/common/lix.nix b/modules/common/lix.nix index 59e271b..6effbca 100644 --- a/modules/common/lix.nix +++ b/modules/common/lix.nix @@ -1,2 +1,4 @@ -{ } -# {pkgs, ...}: {nix.package = pkgs.lix;} +{ inputs, pkgs, ... }: +{ + nix.package = inputs.nixpkgs-master.legacyPackages.${pkgs.stdenv.hostPlatform.system}.lix; +} diff --git a/modules/server/caddy.nix b/modules/server/caddy.nix index bdb887b..d77ef1f 100644 --- a/modules/server/caddy.nix +++ b/modules/server/caddy.nix @@ -54,7 +54,7 @@ "github.com/ggicci/caddy-jwt@v1.1.0" "pkg.jsn.cam/caddy-defender@v0.9.0" ]; - hash = "sha256-rkT3/EdHuWkN+5fxT8+yc/BDAi05NXMYBLe9l0Am0Vc="; + hash = "sha256-yvBkB4Hrja89AVsMY6Bt1fiQDxil/nrL50lW9P5BjZU="; }; globalConfig = ''