Merge pull request 'Lock file maintenance' (#630) from renovate/lock-file-maintenance into main

Reviewed-on: #628

config/home-manager/base.nix

@@ -84,7 +84,6 @@ desktop: {
       ++ (
         if desktop
         then [
-          yubikey-manager
           yt-dlp
           oxipng
           jpegoptim
@@ -95,9 +94,12 @@ desktop: {
         ]
         else []
       );
-    sessionVariables = if desktop then {
+    sessionVariables =
-      QT_PLUGIN_PATH = lib.mkForce "\${QT_PLUGIN_PATH}:${config.i18n.inputMethod.package}/${pkgs.qt6.qtbase.qtPluginPrefix}:${pkgs.kdePackages.kimageformats}/${pkgs.qt6.qtbase.qtPluginPrefix}";
+      if desktop
-    } else {};
+      then {
+        QT_PLUGIN_PATH = lib.mkForce "\${QT_PLUGIN_PATH}:${config.i18n.inputMethod.package}/${pkgs.qt6.qtbase.qtPluginPrefix}:${pkgs.kdePackages.kimageformats}/${pkgs.qt6.qtbase.qtPluginPrefix}";
+      }
+      else {};
   };
 
   programs.eza = {

config/instance-20221213-1915.nix

@@ -3,7 +3,8 @@
   lib,
   modulesPath,
   ...
-} @ args: {
+}@args:
+{
   networking.hostName = "instance-20221213-1915";
   networking.hostId = "746d4523";
 
@@ -16,7 +17,7 @@
     ./services/shitalloverme.nix
     ./users/remote-build.nix
     ./services/atticd.nix
-    ./services/minecraft.nix
+    #./services/minecraft.nix
     ./services/postgres.nix
     ./services/uptime-kuma.nix
     ./services/reverse-proxy.nix
@@ -27,10 +28,14 @@
     ./services/chir-rs.nix
   ];
 
-  boot.initrd.availableKernelModules = ["xhci_pci" "virtio_pci" "usbhid"];
+  boot.initrd.availableKernelModules = [
-  boot.initrd.kernelModules = [];
+    "xhci_pci"
-  boot.kernelModules = [];
+    "virtio_pci"
-  boot.extraModulePackages = [];
+    "usbhid"
+  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
 
   fileSystems."/" = {
     device = "tank/local/root";
@@ -89,7 +94,7 @@
 
   services.postgresql.dataDir = "/persist/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}";
 
-  networking.wireguard.interfaces."wg0".ips = ["fd0d:a262:1fa6:e621:746d:4523:5c04:1453/64"];
+  networking.wireguard.interfaces."wg0".ips = [ "fd0d:a262:1fa6:e621:746d:4523:5c04:1453/64" ];
   home-manager.users.darkkirb = import ./home-manager/darkkirb.nix {
     desktop = false;
     inherit args;
@@ -122,8 +127,8 @@
     owner = "root";
     path = "/etc/secrets/initrd/ssh_host_ed25519_key";
   };
-  sops.age.sshKeyPaths = lib.mkForce ["/persist/ssh/ssh_host_ed25519_key"];
+  sops.age.sshKeyPaths = lib.mkForce [ "/persist/ssh/ssh_host_ed25519_key" ];
-  services.bind.forwarders = lib.mkForce [];
+  services.bind.forwarders = lib.mkForce [ ];
   boot.loader.systemd-boot.configurationLimit = lib.mkForce 1;
   services.tailscale.useRoutingFeatures = "server";
   services.postgresql.settings = {
@@ -145,5 +150,5 @@
     max_parallel_maintenance_workers = 2;
   };
 
-  services.restic.backups.sysbackup.paths = ["/persist"];
+  services.restic.backups.sysbackup.paths = [ "/persist" ];
 }

config/programs/builders.nix

@@ -31,7 +31,7 @@
         user = "backup";
       };
       "build-riscv" = {
-        hostname = "vf2.int.chir.rs";
+        hostname = "not522.tailbab65.ts.net";
         identitiesOnly = true;
         identityFile = "${config.home.homeDirectory}/.ssh/builder_id_ed25519";
         port = 22;

config/programs/yubikey.nix

@@ -1,5 +1,4 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
-    yubikey-manager-qt
   ];
 }

config/services/hydra.nix

@@ -35,7 +35,7 @@
       Port 22
       IdentitiesOnly yes
       User remote-build
-      HostName vf2.int.chir.rs
+      HostName not522.tailbab65.ts.net
       IdentityFile /var/lib/hydra/queue-runner/.ssh/builder_id_ed25519
 
     Host *

config/services/jellyfin.nix

@@ -1,9 +1,11 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   services.jellyfin.enable = true;
   environment.systemPackages = [
     pkgs.jellyfin
     pkgs.jellyfin-web
     pkgs.jellyfin-ffmpeg
+    pkgs.yt-dlp
   ];
   services.caddy.virtualHosts."jellyfin.int.chir.rs" = {
     useACMEHost = "int.chir.rs";

config/vf2.nix

@@ -1,123 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  nixpkgs,
-  nixos-hardware,
-  riscv-overlay,
-  lix,
-  ...
-} @ args: let
-  pkgs_x86_64 = import nixpkgs {
-    system = "x86_64-linux";
-    crossSystem.system = "riscv64-linux";
-    overlays = [lix.overlays.default];
-  };
-in {
-  networking.hostName = "vf2";
-  networking.hostId = "ad325df9";
-  imports = [
-    ./services/caddy
-    ./services/acme.nix
-    ./users/remote-build.nix
-    ./systemd-boot.nix
-    "${nixos-hardware}/starfive/visionfive/v2/default.nix"
-  ];
-
-  nixpkgs.config.allowUnsupportedSystem = true;
-
-  nixpkgs.overlays = [
-    riscv-overlay.overlays.default
-    (self: super: {
-      inherit (pkgs_x86_64) lix nixos-option;
-    })
-  ];
-
-  nix.settings.substituters = lib.mkForce [
-    "https://beam.attic.rs/riscv"
-    "https://cache.ztier.in"
-    "https://hydra.int.chir.rs"
-  ];
-
-  fileSystems = {
-    "/boot" = {
-      device = "/dev/nvme0n1p1";
-      fsType = "vfat";
-      options = ["nofail"];
-    };
-    "/" = {
-      device = "/dev/nvme0n1p2";
-      fsType = "btrfs";
-      options = ["compress=zstd"];
-    };
-  };
-  swapDevices = [
-    {
-      device = "/dev/nvme0n1p3";
-    }
-  ];
-  #  hardware.deviceTree.name = "starfive/jh7110-starfive-visionfive-2-v1.3b.dtb";
-  home-manager.users.darkkirb = import ./home-manager/darkkirb.nix {
-    desktop = false;
-    inherit args;
-  };
-  nix.settings.cores = 4;
-  nix.settings.max-jobs = 4;
-  nix.settings.system-features = [
-    "nixos-test"
-    "big-parallel"
-    "benchmark"
-    "ca-derivations"
-    # There are many more combinations but i simply do not care lol
-    "gccarch-rv64gc_zba_zbb"
-    "gccarch-rv64gc_zba"
-    "gccarch-rv64gc_zbb"
-    "gccarch-rv64gc"
-    "gccarch-rv32gc_zba_zbb"
-    "gccarch-rv32gc_zba"
-    "gccarch-rv32gc_zbb"
-    "gccarch-rv32gc"
-    "native-riscv"
-  ];
-  nix.daemonCPUSchedPolicy = "idle";
-  nix.daemonIOSchedClass = "idle";
-  services.tailscale.useRoutingFeatures = "server";
-
-  boot.binfmt.emulatedSystems = [
-    "x86_64-linux"
-  ];
-  boot.loader.efi.canTouchEfiVariables = true;
-  boot.loader.generic-extlinux-compatible.enable = false;
-  #system.requiredKernelConfig = lib.mkForce [];
-
-  system.stateVersion = "24.05";
-
-  boot.loader.systemd-boot.extraInstallCommands = ''
-    set -euo pipefail
-    ${pkgs.coreutils}/bin/cp --no-preserve=mode -r ${config.hardware.deviceTree.package} ${config.boot.loader.efi.efiSysMountPoint}/
-    for filename in ${config.boot.loader.efi.efiSysMountPoint}/loader/entries/nixos*-generation-[1-9]*.conf; do
-      if ! ${pkgs.gnugrep}/bin/grep -q 'devicetree' $filename; then
-        ${pkgs.coreutils}/bin/echo "devicetree /dtbs/${config.hardware.deviceTree.name}" >> $filename
-      fi
-    done
-  '';
-  hardware.deviceTree.name = "starfive/jh7110-starfive-visionfive-2-v1.3b.dtb";
-  boot.initrd.kernelModules = [
-    "dw_mmc-starfive"
-    "motorcomm"
-    "dwmac-starfive"
-    "cdns3-starfive"
-    "jh7110-trng"
-    "phy-jh7110-usb"
-    "clk-starfive-jh7110-aon"
-    "clk-starfive-jh7110-stg"
-    "clk-starfive-jh7110-vout"
-    "clk-starfive-jh7110-isp"
-    "clk-starfive-jh7100-audio"
-    "phy-jh7110-pcie"
-    "pcie-starfive"
-    "nvme"
-  ];
-  systemd.network.enable = true;
-  networking.useNetworkd = true;
-}

flake.lock

@@ -329,11 +329,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727826117,
+        "lastModified": 1730504689,
-        "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
+        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
+        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
         "type": "github"
       },
       "original": {
@@ -464,11 +464,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730016908,
+        "lastModified": 1731235328,
-        "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=",
+        "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e83414058edd339148dc142a8437edb9450574c8",
+        "rev": "60bb110917844d354f3c18e05450606a435d2d10",
         "type": "github"
       },
       "original": {
@@ -499,11 +499,11 @@
     },
     "impermanence": {
       "locked": {
-        "lastModified": 1729068498,
+        "lastModified": 1731242966,
-        "narHash": "sha256-C2sGRJl1EmBq0nO98TNd4cbUy20ABSgnHWXLIJQWRFA=",
+        "narHash": "sha256-B3C3JLbGw0FtLSWCjBxU961gLNv+BOOBC6WvstKLYMw=",
         "owner": "nix-community",
         "repo": "impermanence",
-        "rev": "e337457502571b23e449bf42153d7faa10c0a562",
+        "rev": "3ed3f0eaae9fcc0a8331e77e9319c8a4abd8a71a",
         "type": "github"
       },
       "original": {
@@ -522,11 +522,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730031145,
+        "lastModified": 1731240728,
-        "narHash": "sha256-GZz0LGkeduajnF7zUuPu5evNyoOATcSsRZCkG1OqiwY=",
+        "narHash": "sha256-a0xQE3cwZLMsycd9NneFC3z29E+z1PSD/ozhISM7qYQ=",
         "owner": "nix-community",
         "repo": "lib-aggregate",
-        "rev": "7d235f23a84b54c39b1579b68b13e1ff83f5b1ad",
+        "rev": "807ab623e6d01e931269a28a07c59dcfd6474173",
         "type": "github"
       },
       "original": {
@@ -576,11 +576,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727752861,
+        "lastModified": 1731185731,
-        "narHash": "sha256-jowmo2aEzrEpPSM96IWtajuogdJm7DjAWxFTEb7Ct0s=",
+        "narHash": "sha256-RNaIu43b9PoXEhW4OqXUNZKY/jezQyCYWwdv1M0VjsA=",
         "ref": "refs/heads/main",
-        "rev": "fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d",
+        "rev": "691193879d96bdfd1e6ab5ebcca2fadc7604cf34",
-        "revCount": 116,
+        "revCount": 117,
         "type": "git",
         "url": "https://git.lix.systems/lix-project/nixos-module"
       },
@@ -606,11 +606,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730069651,
+        "lastModified": 1731235488,
-        "narHash": "sha256-DVzb3RlFOuR72K6BWMRKoJ4mfJmVOUDVjUJKQ/yXMNA=",
+        "narHash": "sha256-RMv1RqyGy88LnKx3XWqVuKlTxdZW6oB4K72LdndM2ZM=",
         "ref": "refs/heads/main",
-        "rev": "f55ed8399186c25b7d26a8c51f31ba25f5f26a50",
+        "rev": "d1d96cc4c8bd661a65c6159039a9d7e7e8fdf771",
-        "revCount": 16400,
+        "revCount": 16476,
         "type": "git",
         "url": "https://git.lix.systems/lix-project/lix"
       },
@@ -695,11 +695,11 @@
         "umu": "umu"
       },
       "locked": {
-        "lastModified": 1729993301,
+        "lastModified": 1731202990,
-        "narHash": "sha256-1SJ5Ky+HSMXAf+uij34MIB2jii0RZwFmOaJg1/e9Rzg=",
+        "narHash": "sha256-Ac3ff4w9+xePGX6TF90zEVyhdHJkhg58pUafvoAjVEY=",
         "owner": "fufexan",
         "repo": "nix-gaming",
-        "rev": "655bf9e689c9f7b15ba6521b849321120c0af616",
+        "rev": "faf26ec552997488d75a0fdb07783c0c2edd3d5f",
         "type": "github"
       },
       "original": {
@@ -756,11 +756,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1729339656,
+        "lastModified": 1730479402,
-        "narHash": "sha256-smV7HQ/OqZeRguQxNjsb3uQDwm0p6zKDbSDbPCav/oY=",
+        "narHash": "sha256-79NLeNjpCa4mSasmFsE3QA6obURezF0TUO5Pm+1daog=",
         "owner": "nlewo",
         "repo": "nix2container",
-        "rev": "cc96df7c3747c61c584d757cfc083922b4f4b33e",
+        "rev": "5fb215a1564baa74ce04ad7f903d94ad6617e17a",
         "type": "github"
       },
       "original": {
@@ -771,11 +771,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1730068391,
+        "lastModified": 1730919458,
-        "narHash": "sha256-jlAGtfMuI8pUUoUmNkm2P/38pOtHZdcAf3Az8XQLAf4=",
+        "narHash": "sha256-yMO0T0QJlmT/x4HEyvrCyigGrdYfIXX3e5gWqB64wLg=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "6906ac67a1078cf950b8527341e229eeecb5bc30",
+        "rev": "e1cc1f6483393634aee94514186d21a4871e78d7",
         "type": "github"
       },
       "original": {
@@ -903,11 +903,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1730073370,
+        "lastModified": 1731242223,
-        "narHash": "sha256-mwxs/E4rDthy85D1oVE4loxTK3Phttl77HUT+VYZ0N8=",
+        "narHash": "sha256-ASCKkiPc9lJ9AcIL+dcLzgQzGyUvdtRiIkSWh1EEhLs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "31513aaf6ff15663f89b0554826e59f86206e453",
+        "rev": "8213a8a557f80086dac25ae2c613794ce9f0b4eb",
         "type": "github"
       },
       "original": {
@@ -948,11 +948,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1729104314,
+        "lastModified": 1730814269,
-        "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=",
+        "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6",
+        "rev": "d70155fdc00df4628446352fc58adc640cd705c2",
         "type": "github"
       },
       "original": {
@@ -961,26 +961,6 @@
         "type": "github"
       }
     },
-    "riscv-overlay": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1728672381,
-        "narHash": "sha256-7zs+Kb4FaClPojFHIv7Wg4YH6B9/PpP2f0o9+5QIA7U=",
-        "owner": "DarkKirb",
-        "repo": "riscv-overlay",
-        "rev": "47b3b0e989ff06046004be0c76d24af9a46a0c29",
-        "type": "github"
-      },
-      "original": {
-        "owner": "DarkKirb",
-        "repo": "riscv-overlay",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "admin-fe": "admin-fe",
@@ -1012,7 +992,6 @@
         "nixos-vscode-server": "nixos-vscode-server",
         "nixpkgs": "nixpkgs_4",
         "pre-commit-hooks": "pre-commit-hooks_2",
-        "riscv-overlay": "riscv-overlay",
         "rust-overlay": "rust-overlay",
         "sops-nix": "sops-nix",
         "systems": "systems"
@@ -1025,11 +1004,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1729996302,
+        "lastModified": 1731119076,
-        "narHash": "sha256-QEU1NQq1+7s1na69Chig9K0iDDTKN0O4Zreo9A9rccA=",
+        "narHash": "sha256-2eVhmocCZHJlFAz6Mt3EwPdFFVAtGgIySJc1EHQVxcc=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "a1b337569f334ff0a01b57627f17b201d746d24c",
+        "rev": "23c4b3ba5f806fcf25d5a3b6b54fa0d07854c032",
         "type": "github"
       },
       "original": {
@@ -1048,11 +1027,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1729999681,
+        "lastModified": 1731213149,
-        "narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=",
+        "narHash": "sha256-jR8i6nFLmSmm0cIoeRQ8Q4EBARa3oGaAtEER/OMMxus=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56",
+        "rev": "f1675e3b0e1e663a4af49be67ecbc9e749f85eb7",
         "type": "github"
       },
       "original": {
@@ -1128,11 +1107,11 @@
       },
       "locked": {
         "dir": "packaging/nix",
-        "lastModified": 1729978972,
+        "lastModified": 1730836236,
-        "narHash": "sha256-Zox0iAi4CRPn4rxrhOetFFZ2jcSipe8tGD8nMTgcjhE=",
+        "narHash": "sha256-8jrg1DQrgYVaO4hpPRxRTAVluo8cE1Lcuvyv2EXuXpA=",
         "ref": "refs/heads/main",
-        "rev": "72499f349ca81cb2838eced9d7c465b2cf71c4a2",
+        "rev": "90352466d502c40e147cfd11a428dde6c2899ab3",
-        "revCount": 825,
+        "revCount": 833,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/Open-Wine-Components/umu-launcher/"

flake.nix

@@ -150,10 +150,6 @@ rec {
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.nixpkgs-stable.follows = "nixpkgs";
     };
-    riscv-overlay = {
-      url = "github:DarkKirb/riscv-overlay";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     rust-overlay = {
       url = "github:oxalica/rust-overlay";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -179,30 +175,14 @@ rec {
         name = "nixos-8gb-fsn1-1"; # Hetzner Server
         system = "x86_64-linux";
       }
-      {
-        name = "thinkrac"; # Thinkpad T470
-        system = "x86_64-linux";
-      }
       {
         name = "nas"; # My nas
         system = "x86_64-linux";
       }
-      {
-        name = "installer"; # Installer iso
-        system = "x86_64-linux";
-      }
       {
         name = "instance-20221213-1915"; # Oracle server
         system = "aarch64-linux";
       }
-      {
-        name = "rainbow-resort"; # PC
-        system = "x86_64-linux";
-      }
-      {
-        name = "vf2"; # vision five 2
-        system = "riscv64-linux";
-      }
       /*
         {
         name = "devterm";
@@ -324,7 +304,6 @@ rec {
     overlays = {
       x86_64-linux = import ./overlays args "x86_64-linux";
       aarch64-linux = import ./overlays args "aarch64-linux";
-      riscv64-linux = import ./overlays args "riscv64-linux";
     };
     devShell.x86_64-linux = let
       pkgs = import nixpkgs {

packages/emulator/mgba-dev/source.json

@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/mgba-emu/mgba",
-  "rev": "279485fc3ed54b0dafbbff448e901be47b25ef2f",
+  "rev": "cfd30b7a95edf1dafaf5cfb6d691578d8b6554c5",
-  "date": "2024-10-20T18:04:30-07:00",
+  "date": "2024-11-08T21:38:25-08:00",
-  "path": "/nix/store/39kcg0bzsn0p3kj26q52ifphdam91378-mgba",
+  "path": "/nix/store/jcsrdhn7a1cxpy96sgjyc11j0gzlcc6m-mgba",
-  "sha256": "13nm2bc6krahfbzl9bml5pjr6rq7i2zf308s4wfnxmk9j73yzxbc",
+  "sha256": "1q83dgsnf4pdz2li2ip6z7rnf1c7w8qf82jr1q5ck499rhv3v689",
-  "hash": "sha256-bPXvx5Fp1m4dJxqB4b6IB2eT5S20rkT/clDladgS1Y4=",
+  "hash": "sha256-CZk9NswpkckKDlkK5DDihwVn8/nmRhGp+O0SZ/VrA+E=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,

packages/minecraft/papermc/paper.json

@@ -1,6 +1,6 @@
 {
   "version": "1.21.1",
-  "build": 128,
+  "build": 131,
-  "name": "paper-1.21.1-128.jar",
+  "name": "paper-1.21.1-131.jar",
-  "sha256": "4dab63990686350dbf713f9044991f112cebadb64a44865cd79a5a750b820d91"
+  "sha256": "dc7dd1b6a3093641f182e874e52637682e9fa9bbcc8025a1f761c5bbec2dd341"
 }