From 1767debfd8543beafe6eabc90524540cb0667eb4 Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Thu, 16 Apr 2026 12:38:07 -0500 Subject: [PATCH] upd --- flake.lock | 123 ++++++++---------- flake.nix | 6 +- .../x86_64-linux/admin@jallen-nas/default.nix | 4 + .../homeassistant/services/thread/default.nix | 10 +- modules/nixos/system/default.nix | 1 - modules/nixos/user/default.nix | 1 + modules/nixos/virtualization/default.nix | 8 +- packages/bcachefs/default.nix | 2 +- packages/bcachefs/version.json | 6 +- packages/hueforge/default.nix | 31 ++++- .../macbook-pro-nixos/default.nix | 2 +- systems/x86_64-linux/jallen-nas/boot.nix | 3 +- systems/x86_64-linux/jallen-nas/default.nix | 2 +- 13 files changed, 104 insertions(+), 95 deletions(-) diff --git a/flake.lock b/flake.lock index 8c09c0b..0a6d062 100755 --- a/flake.lock +++ b/flake.lock @@ -151,11 +151,11 @@ "cachyos-kernel": { "flake": false, "locked": { - "lastModified": 1775145950, - "narHash": "sha256-AfVja9nvYHm0BHbuTvn+K8rKfLmPl5QjoiNecp9HOJU=", + "lastModified": 1776183001, + "narHash": "sha256-lvLKB5dTqjO1S/YonS9ZyWemEjO6QXtN4D76rYEYy4s=", "owner": "CachyOS", "repo": "linux-cachyos", - "rev": "b91624f68ceaf5394ef1571f60290dca6ba22b45", + "rev": "4224303b6d7a50dd1cc3ffa78864050cc9536eec", "type": "github" }, "original": { @@ -167,11 +167,11 @@ "cachyos-kernel-patches": { "flake": false, "locked": { - "lastModified": 1775157685, - "narHash": "sha256-g8HgH7gADoEnrBN30BK3pz7+M2pT/p3xtfRFEuEov5w=", + "lastModified": 1776181525, + "narHash": "sha256-g07GhYlAOH0agNE8dIOT33vZ0eviF/HY5xgAQRwLytk=", "owner": "CachyOS", "repo": "kernel-patches", - "rev": "c1ba300617a12d257b5721572b9bbe28efae182f", + "rev": "fcd21edaf0ff9b69f9d32ea8590002d6acd1c503", "type": "github" }, "original": { @@ -584,11 +584,11 @@ ] }, "locked": { - "lastModified": 1776046499, - "narHash": "sha256-Wzc4nn07/0RL21ypPHRzNDQZcjhIC8LaYo7QJQjM5T4=", + "lastModified": 1776184304, + "narHash": "sha256-No6QGBmIv5ChiwKCcbkxjdEQ/RO2ZS1gD7SFy6EZ7rc=", "owner": "nix-community", "repo": "home-manager", - "rev": "287f84846c1eb3b72c986f5f6bebcff0bd67440d", + "rev": "3c7524c68348ef79ce48308e0978611a050089b2", "type": "github" }, "original": { @@ -604,11 +604,11 @@ ] }, "locked": { - "lastModified": 1776046499, - "narHash": "sha256-Wzc4nn07/0RL21ypPHRzNDQZcjhIC8LaYo7QJQjM5T4=", + "lastModified": 1776184304, + "narHash": "sha256-No6QGBmIv5ChiwKCcbkxjdEQ/RO2ZS1gD7SFy6EZ7rc=", "owner": "nix-community", "repo": "home-manager", - "rev": "287f84846c1eb3b72c986f5f6bebcff0bd67440d", + "rev": "3c7524c68348ef79ce48308e0978611a050089b2", "type": "github" }, "original": { @@ -658,11 +658,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1776091050, - "narHash": "sha256-Eod3J7BQDA1al3aJ70AIEqXz5XETswBuV0jdMpW23Qo=", + "lastModified": 1776349441, + "narHash": "sha256-sPW2azc9C0OVmljFhq7fD9U3VEleGpDDp5kLoeXeb98=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "012ea40303ebf19a16a6befd39719a7f0cea352a", + "rev": "b72ceb562b44d72ccdf03cb7f3880e8d12612fd2", "type": "github" }, "original": { @@ -674,11 +674,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1776088143, - "narHash": "sha256-zWgSMGJrraKv7OfYrlts1hV3a8wPDI7QnJTNCcDreuo=", + "lastModified": 1776354881, + "narHash": "sha256-x1bZjiZp4QR1TO9vWCF7m9IVCyAnAUM9dQqVDd/AQ9A=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "203767edd9c63888156f13f1e83a282d242a0035", + "rev": "92422aabae8232a54948f0767c81b780502f5910", "type": "github" }, "original": { @@ -714,11 +714,11 @@ ] }, "locked": { - "lastModified": 1775841957, - "narHash": "sha256-oHxj9I82v+axW1lj+jUj2t8V++E6A9x54K5lq+liNAk=", + "lastModified": 1776335039, + "narHash": "sha256-2lkQhrv6YUCeMlC/lclzq9vkTALv/ptv7d0jIhZnrPQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "67d55e61fe5e4d88d3fb90c0888cfced04a0589d", + "rev": "cbdf76c063b48d5d755fb26540367b8c2457c2ca", "type": "github" }, "original": { @@ -757,11 +757,11 @@ ] }, "locked": { - "lastModified": 1776082891, - "narHash": "sha256-TpXoozA/HlrTb4VCJ2J+zFzDbzQErZE1cWc4P0Riisk=", + "lastModified": 1776354094, + "narHash": "sha256-R6ZO138jIeK66DRCopc3ZLtHuhHk7WBH9Gmkmmq6qfI=", "owner": "ggml-org", "repo": "llama.cpp", - "rev": "75f3bc94e649616162981c322e8e6b88ca5491e8", + "rev": "9db77a020c97ac3b13b7c1bf4e0c5787001533e7", "type": "github" }, "original": { @@ -825,11 +825,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1775239578, - "narHash": "sha256-MKJmDHlaxwBcnfCUEA89AwKOOONjOjbjHNNWdSdg5RA=", + "lastModified": 1776278748, + "narHash": "sha256-mLvw1+fa6vr0C87XfX0ja8yZMx0H+HWL0ena2SBMdp8=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "beaf7a533ae106c2681de2624da94707f9857f1f", + "rev": "65eaf1492a6f0850ef2f08943c6bfc59b144e72a", "type": "github" }, "original": { @@ -943,11 +943,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1776051332, - "narHash": "sha256-u17gFUARTdA9ZtODdrep0QyIAaGNHjKscFLkB/jFTQQ=", + "lastModified": 1776310443, + "narHash": "sha256-XQo/vlS6xak3iT3xS2Q3TUMbreeeqe+PR99feUoV0UQ=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "81915eb135b9b56b691a34e432768a349531b951", + "rev": "3a6d0ea13d092493b285b9093b5ce81e79df5cee", "type": "github" }, "original": { @@ -962,11 +962,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1775887459, - "narHash": "sha256-aUC+iK8zpMxdZLMhQpmUz9XBzKrQnFWzveB9IK18n3w=", + "lastModified": 1776147994, + "narHash": "sha256-c5F8jYiB0fjWsP4j/yeszqszA3laflzDj6/pmoJTeG4=", "owner": "nix-community", "repo": "nixos-apple-silicon", - "rev": "b6d1d07d55831902cb188a40692a5c7b5529e9e0", + "rev": "81439a7fb8067ab43641efd79c84607701da1ccd", "type": "github" }, "original": { @@ -1049,22 +1049,6 @@ "type": "github" } }, - "nixpkgs-otbr": { - "locked": { - "lastModified": 1766776257, - "narHash": "sha256-MG9DnzBn6TdAztaMPVhW9sjYj2bi9Jcux0F0fJ6LeO4=", - "owner": "mrene", - "repo": "nixpkgs", - "rev": "0c4c97066d555b7d27a0a56ee400130ec51f02ee", - "type": "github" - }, - "original": { - "owner": "mrene", - "ref": "openthread-border-router", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1751048012, @@ -1083,11 +1067,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1775811116, - "narHash": "sha256-t+HZK42pB6N+i5RGbuy7Xluez/VvWbembBdvzsc23Ss=", + "lastModified": 1776067740, + "narHash": "sha256-B35lpsqnSZwn1Lmz06BpwF7atPgFmUgw1l8KAV3zpVQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "54170c54449ea4d6725efd30d719c5e505f1c10e", + "rev": "7e495b747b51f95ae15e74377c5ce1fe69c1765f", "type": "github" }, "original": { @@ -1099,16 +1083,16 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1775710090, - "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", + "lastModified": 1776268487, + "narHash": "sha256-oGUKCRR4qQGTgicxkiAHDd7w2YWCLtG9n8IWtNZPxo4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4c1018dae018162ec878d42fec712642d214fdfa", + "rev": "6b3fb3b76b5c78cc108553d18bc949c7fad671c8", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } @@ -1163,11 +1147,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1775231746, - "narHash": "sha256-EFaDQ0rnuSjKfC/DUKHS4toV4rEBuWhSgyX2Yy0kp00=", + "lastModified": 1776268487, + "narHash": "sha256-oGUKCRR4qQGTgicxkiAHDd7w2YWCLtG9n8IWtNZPxo4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0eac666efaa8a9afea2821f9efc7921b4ef39b4e", + "rev": "6b3fb3b76b5c78cc108553d18bc949c7fad671c8", "type": "github" }, "original": { @@ -1243,16 +1227,16 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1775710090, - "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", + "lastModified": 1776268487, + "narHash": "sha256-oGUKCRR4qQGTgicxkiAHDd7w2YWCLtG9n8IWtNZPxo4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4c1018dae018162ec878d42fec712642d214fdfa", + "rev": "6b3fb3b76b5c78cc108553d18bc949c7fad671c8", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } @@ -1424,7 +1408,6 @@ "nixos-apple-silicon": "nixos-apple-silicon", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_9", - "nixpkgs-otbr": "nixpkgs-otbr", "nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-unstable": "nixpkgs-unstable", "plasma-manager": "plasma-manager", @@ -1505,11 +1488,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1775971308, - "narHash": "sha256-VKp9bhVSm0bT6JWctFy06ocqxGGnWHi1NfoE90IgIcY=", + "lastModified": 1776119890, + "narHash": "sha256-Zm6bxLNnEOYuS/SzrAGsYuXSwk3cbkRQZY0fJnk8a5M=", "owner": "Mic92", "repo": "sops-nix", - "rev": "31ac5fe5d015f76b54058c69fcaebb66a55871a4", + "rev": "d4971dd58c6627bfee52a1ad4237637c0a2fb0cd", "type": "github" }, "original": { @@ -1561,11 +1544,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1775936757, - "narHash": "sha256-KJO/7qoxJ+hlsb3WlFSl6IGrExBIf1GvKdrhOlnGdKY=", + "lastModified": 1776170745, + "narHash": "sha256-Tl1aZVP5EIlT+k0+iAKH018GLHJpLz3hhJ0LNQOWxCc=", "owner": "nix-community", "repo": "stylix", - "rev": "d3e447786b74d62c75f665e17cb3e681c66e90c7", + "rev": "e3861617645a43c9bbefde1aa6ac54dd0a44bfa9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ff21fbe..fc7a523 100755 --- a/flake.nix +++ b/flake.nix @@ -1,12 +1,8 @@ { inputs = rec { - nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable-small"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.11"; - # Fork required: openthread-border-router is not yet in nixpkgs-unstable. - # Used by modules/nixos/homeassistant/services/thread/default.nix - nixpkgs-otbr.url = "github:mrene/nixpkgs/openthread-border-router"; - home-manager-unstable = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs-unstable"; diff --git a/homes/x86_64-linux/admin@jallen-nas/default.nix b/homes/x86_64-linux/admin@jallen-nas/default.nix index 0287886..dcd6ac6 100755 --- a/homes/x86_64-linux/admin@jallen-nas/default.nix +++ b/homes/x86_64-linux/admin@jallen-nas/default.nix @@ -30,6 +30,7 @@ in jq ] ++ (with pkgs.${namespace}; [ + hueforge moondeck-buddy ]); }; @@ -83,11 +84,14 @@ in viAlias = true; vimAlias = true; defaultEditor = true; + withRuby = false; + withPython3 = true; plugins = [ pkgs.vimPlugins.nvim-tree-lua { plugin = pkgs.vimPlugins.vim-startify; config = "let g:startify_change_to_vcs_root = 0"; + type = "lua"; } ]; }; diff --git a/modules/nixos/homeassistant/services/thread/default.nix b/modules/nixos/homeassistant/services/thread/default.nix index 3fd8104..5fb28b5 100755 --- a/modules/nixos/homeassistant/services/thread/default.nix +++ b/modules/nixos/homeassistant/services/thread/default.nix @@ -11,10 +11,6 @@ let name = "otbr"; cfg = config.${namespace}.services.${name}; - otbrPackage = - pkgs.callPackage "${inputs.nixpkgs-otbr}/pkgs/by-name/op/openthread-border-router/package.nix" - { }; - otbrConfig = lib.${namespace}.mkModule { inherit config name; description = "Openthread border router"; @@ -24,8 +20,9 @@ let moduleConfig = { services.openthread-border-router = { enable = true; - backboneInterface = "enp2s0"; - package = otbrPackage; + backboneInterfaces = [ + "enp2s0" + ]; rest = { inherit (cfg) listenAddress; listenPort = cfg.restPort; @@ -45,7 +42,6 @@ let in { imports = [ - "${inputs.nixpkgs-otbr}/nixos/modules/services/home-automation/openthread-border-router.nix" otbrConfig ]; } diff --git a/modules/nixos/system/default.nix b/modules/nixos/system/default.nix index b25e2b3..d721db9 100755 --- a/modules/nixos/system/default.nix +++ b/modules/nixos/system/default.nix @@ -31,7 +31,6 @@ in nil nix-output-monitor nixos-anywhere - qemu udisks2 unzip ] diff --git a/modules/nixos/user/default.nix b/modules/nixos/user/default.nix index 0c911c7..7b80f15 100755 --- a/modules/nixos/user/default.nix +++ b/modules/nixos/user/default.nix @@ -110,6 +110,7 @@ in extraGroups = [ "dialout" + "uucp" "wheel" "keys" "networkmanager" diff --git a/modules/nixos/virtualization/default.nix b/modules/nixos/virtualization/default.nix index 71bae1f..b73370f 100755 --- a/modules/nixos/virtualization/default.nix +++ b/modules/nixos/virtualization/default.nix @@ -1,8 +1,12 @@ -{ lib, ... }: +{ lib, pkgs, ... }: { # Virtualisation configuration virtualisation = { - libvirtd.enable = lib.mkDefault true; + libvirtd = { + enable = lib.mkForce false; + package = pkgs.stable.libvirt; + qemu.package = pkgs.stable.qemu; + }; podman.enable = lib.mkDefault true; waydroid.enable = lib.mkDefault false; }; diff --git a/packages/bcachefs/default.nix b/packages/bcachefs/default.nix index 5c26ded..cc7eb0a 100755 --- a/packages/bcachefs/default.nix +++ b/packages/bcachefs/default.nix @@ -36,7 +36,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "bcachefs-tools"; - version = "1.37.2"; + version = "1.37.5"; src = sources.bcachefs-tools; diff --git a/packages/bcachefs/version.json b/packages/bcachefs/version.json index e2aed72..a29faa0 100755 --- a/packages/bcachefs/version.json +++ b/packages/bcachefs/version.json @@ -4,11 +4,11 @@ "bcachefs-tools": { "fetcher": "git", "url": "https://github.com/koverstreet/bcachefs-tools", - "rev": "v1.37.4", - "hash": "sha256-VlljE+xoKg6GryVuebUA1v9x2shMBUb7veCtD68MBJw=" + "rev": "v1.37.5", + "hash": "sha256-x/hpOTvLYyNIsC8ZM0zmTwL8GsiqaTg0ZjQNiS7Y2Wo=" }, "cargoDeps": { - "hash": "sha256-t6ghsIRJFR2Kqism4tdizhnJ8qcE2ZZwH6c3nYogHlo=" + "hash": "sha256-+9vy+StbFxN+2sNrObLUhvn0BhPZLW6zXuw0uUbaRmw=" } } } diff --git a/packages/hueforge/default.nix b/packages/hueforge/default.nix index fd676d9..e6185bf 100644 --- a/packages/hueforge/default.nix +++ b/packages/hueforge/default.nix @@ -1,7 +1,32 @@ { + stdenv, writeShellScriptBin, appimage-run }: -writeShellScriptBin "hueforge" '' - exec ${appimage-run}/bin/appimage-run HueForge_Linux_v0.9.3.1.AppImage "$@" - ''; \ No newline at end of file +let + src = ./HueForge_Linux_v0.9.3.1.AppImage; + wrapperScript = writeShellScriptBin "hueforge" '' + exec ${appimage-run}/bin/appimage-run ${src} "$@" + ''; +in +stdenv.mkDerivation rec { + inherit src; + pname = "hueforge"; + version = "0.9.3.1"; + + dontUnpack = true; + dontConfigure = true; + dontPatch = true; + dontFixup = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/{share,bin} + + cp $src $out/share/HueForge_Linux_v0.9.3.1.AppImage + cp ${wrapperScript}/bin/hueforge $out/bin/hueforge + + runHook postInstall + ''; +} diff --git a/systems/aarch64-linux/macbook-pro-nixos/default.nix b/systems/aarch64-linux/macbook-pro-nixos/default.nix index fc73d84..b615b7c 100755 --- a/systems/aarch64-linux/macbook-pro-nixos/default.nix +++ b/systems/aarch64-linux/macbook-pro-nixos/default.nix @@ -126,7 +126,7 @@ nixpkgs.config.allowUnsupportedSystem = true; virtualisation = { - libvirtd.enable = true; + libvirtd.enable = false; # efi = { # OVMF = (pkgs.OVMF.override { # secureBoot = true; diff --git a/systems/x86_64-linux/jallen-nas/boot.nix b/systems/x86_64-linux/jallen-nas/boot.nix index 427e576..7540262 100755 --- a/systems/x86_64-linux/jallen-nas/boot.nix +++ b/systems/x86_64-linux/jallen-nas/boot.nix @@ -3,12 +3,13 @@ ... }: let - kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-latest-lto-zen4; + kernelPackages = pkgs.linuxPackages_latest; in { boot = { inherit kernelPackages; + # https://github.com/artmoty-dev/n5pro-jmb585-fix kernelParams = [ "amd_iommu=on" ]; initrd = { diff --git a/systems/x86_64-linux/jallen-nas/default.nix b/systems/x86_64-linux/jallen-nas/default.nix index ce1253f..ba3f8a7 100755 --- a/systems/x86_64-linux/jallen-nas/default.nix +++ b/systems/x86_64-linux/jallen-nas/default.nix @@ -361,7 +361,7 @@ in # Configure programs programs = { kdeconnect.enable = lib.mkForce false; - virt-manager.enable = true; + virt-manager.enable = config.virtualisation.libvirtd.enable; steam.gamescopeSession.enable = lib.mkForce false; }; }