mjallen/nix-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upd

Browse Source
This commit is contained in:
mjallen18
2026-04-16 12:38:07 -05:00
parent 95f08a258e
commit 1767debfd8
13 changed files with 104 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
flake.lock generated
View File

@@ -151,11 +151,11 @@
"cachyos-kernel": { "cachyos-kernel": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1775145950, "lastModified": 1776183001,
"narHash": "sha256-AfVja9nvYHm0BHbuTvn+K8rKfLmPl5QjoiNecp9HOJU=", "narHash": "sha256-lvLKB5dTqjO1S/YonS9ZyWemEjO6QXtN4D76rYEYy4s=",
"owner": "CachyOS", "owner": "CachyOS",
"repo": "linux-cachyos", "repo": "linux-cachyos",
"rev": "b91624f68ceaf5394ef1571f60290dca6ba22b45", "rev": "4224303b6d7a50dd1cc3ffa78864050cc9536eec",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -167,11 +167,11 @@
"cachyos-kernel-patches": { "cachyos-kernel-patches": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1775157685, "lastModified": 1776181525,
"narHash": "sha256-g8HgH7gADoEnrBN30BK3pz7+M2pT/p3xtfRFEuEov5w=", "narHash": "sha256-g07GhYlAOH0agNE8dIOT33vZ0eviF/HY5xgAQRwLytk=",
"owner": "CachyOS", "owner": "CachyOS",
"repo": "kernel-patches", "repo": "kernel-patches",
"rev": "c1ba300617a12d257b5721572b9bbe28efae182f", "rev": "fcd21edaf0ff9b69f9d32ea8590002d6acd1c503",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -584,11 +584,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1776046499, "lastModified": 1776184304,
"narHash": "sha256-Wzc4nn07/0RL21ypPHRzNDQZcjhIC8LaYo7QJQjM5T4=", "narHash": "sha256-No6QGBmIv5ChiwKCcbkxjdEQ/RO2ZS1gD7SFy6EZ7rc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "287f84846c1eb3b72c986f5f6bebcff0bd67440d", "rev": "3c7524c68348ef79ce48308e0978611a050089b2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -604,11 +604,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1776046499, "lastModified": 1776184304,
"narHash": "sha256-Wzc4nn07/0RL21ypPHRzNDQZcjhIC8LaYo7QJQjM5T4=", "narHash": "sha256-No6QGBmIv5ChiwKCcbkxjdEQ/RO2ZS1gD7SFy6EZ7rc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "287f84846c1eb3b72c986f5f6bebcff0bd67440d", "rev": "3c7524c68348ef79ce48308e0978611a050089b2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -658,11 +658,11 @@
"homebrew-cask": { "homebrew-cask": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1776091050, "lastModified": 1776349441,
"narHash": "sha256-Eod3J7BQDA1al3aJ70AIEqXz5XETswBuV0jdMpW23Qo=", "narHash": "sha256-sPW2azc9C0OVmljFhq7fD9U3VEleGpDDp5kLoeXeb98=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-cask", "repo": "homebrew-cask",
"rev": "012ea40303ebf19a16a6befd39719a7f0cea352a", "rev": "b72ceb562b44d72ccdf03cb7f3880e8d12612fd2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -674,11 +674,11 @@
"homebrew-core": { "homebrew-core": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1776088143, "lastModified": 1776354881,
"narHash": "sha256-zWgSMGJrraKv7OfYrlts1hV3a8wPDI7QnJTNCcDreuo=", "narHash": "sha256-x1bZjiZp4QR1TO9vWCF7m9IVCyAnAUM9dQqVDd/AQ9A=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-core", "repo": "homebrew-core",
"rev": "203767edd9c63888156f13f1e83a282d242a0035", "rev": "92422aabae8232a54948f0767c81b780502f5910",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -714,11 +714,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775841957, "lastModified": 1776335039,
"narHash": "sha256-oHxj9I82v+axW1lj+jUj2t8V++E6A9x54K5lq+liNAk=", "narHash": "sha256-2lkQhrv6YUCeMlC/lclzq9vkTALv/ptv7d0jIhZnrPQ=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "67d55e61fe5e4d88d3fb90c0888cfced04a0589d", "rev": "cbdf76c063b48d5d755fb26540367b8c2457c2ca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -757,11 +757,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1776082891, "lastModified": 1776354094,
"narHash": "sha256-TpXoozA/HlrTb4VCJ2J+zFzDbzQErZE1cWc4P0Riisk=", "narHash": "sha256-R6ZO138jIeK66DRCopc3ZLtHuhHk7WBH9Gmkmmq6qfI=",
"owner": "ggml-org", "owner": "ggml-org",
"repo": "llama.cpp", "repo": "llama.cpp",
"rev": "75f3bc94e649616162981c322e8e6b88ca5491e8", "rev": "9db77a020c97ac3b13b7c1bf4e0c5787001533e7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -825,11 +825,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1775239578, "lastModified": 1776278748,
"narHash": "sha256-MKJmDHlaxwBcnfCUEA89AwKOOONjOjbjHNNWdSdg5RA=", "narHash": "sha256-mLvw1+fa6vr0C87XfX0ja8yZMx0H+HWL0ena2SBMdp8=",
"owner": "xddxdd", "owner": "xddxdd",
"repo": "nix-cachyos-kernel", "repo": "nix-cachyos-kernel",
"rev": "beaf7a533ae106c2681de2624da94707f9857f1f", "rev": "65eaf1492a6f0850ef2f08943c6bfc59b144e72a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -943,11 +943,11 @@
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1776051332, "lastModified": 1776310443,
"narHash": "sha256-u17gFUARTdA9ZtODdrep0QyIAaGNHjKscFLkB/jFTQQ=", "narHash": "sha256-XQo/vlS6xak3iT3xS2Q3TUMbreeeqe+PR99feUoV0UQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "81915eb135b9b56b691a34e432768a349531b951", "rev": "3a6d0ea13d092493b285b9093b5ce81e79df5cee",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -962,11 +962,11 @@
"nixpkgs": "nixpkgs_8" "nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
"lastModified": 1775887459, "lastModified": 1776147994,
"narHash": "sha256-aUC+iK8zpMxdZLMhQpmUz9XBzKrQnFWzveB9IK18n3w=", "narHash": "sha256-c5F8jYiB0fjWsP4j/yeszqszA3laflzDj6/pmoJTeG4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-apple-silicon", "repo": "nixos-apple-silicon",
"rev": "b6d1d07d55831902cb188a40692a5c7b5529e9e0", "rev": "81439a7fb8067ab43641efd79c84607701da1ccd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1049,22 +1049,6 @@
"type": "github" "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": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1751048012, "lastModified": 1751048012,
@@ -1083,11 +1067,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1775811116, "lastModified": 1776067740,
"narHash": "sha256-t+HZK42pB6N+i5RGbuy7Xluez/VvWbembBdvzsc23Ss=", "narHash": "sha256-B35lpsqnSZwn1Lmz06BpwF7atPgFmUgw1l8KAV3zpVQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "54170c54449ea4d6725efd30d719c5e505f1c10e", "rev": "7e495b747b51f95ae15e74377c5ce1fe69c1765f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1099,16 +1083,16 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1775710090, "lastModified": 1776268487,
"narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", "narHash": "sha256-oGUKCRR4qQGTgicxkiAHDd7w2YWCLtG9n8IWtNZPxo4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4c1018dae018162ec878d42fec712642d214fdfa", "rev": "6b3fb3b76b5c78cc108553d18bc949c7fad671c8",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixos-unstable-small",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@@ -1163,11 +1147,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1775231746, "lastModified": 1776268487,
"narHash": "sha256-EFaDQ0rnuSjKfC/DUKHS4toV4rEBuWhSgyX2Yy0kp00=", "narHash": "sha256-oGUKCRR4qQGTgicxkiAHDd7w2YWCLtG9n8IWtNZPxo4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0eac666efaa8a9afea2821f9efc7921b4ef39b4e", "rev": "6b3fb3b76b5c78cc108553d18bc949c7fad671c8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1243,16 +1227,16 @@
}, },
"nixpkgs_9": { "nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1775710090, "lastModified": 1776268487,
"narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", "narHash": "sha256-oGUKCRR4qQGTgicxkiAHDd7w2YWCLtG9n8IWtNZPxo4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4c1018dae018162ec878d42fec712642d214fdfa", "rev": "6b3fb3b76b5c78cc108553d18bc949c7fad671c8",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixos-unstable-small",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@@ -1424,7 +1408,6 @@
"nixos-apple-silicon": "nixos-apple-silicon", "nixos-apple-silicon": "nixos-apple-silicon",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_9", "nixpkgs": "nixpkgs_9",
"nixpkgs-otbr": "nixpkgs-otbr",
"nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-stable": "nixpkgs-stable_2",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"plasma-manager": "plasma-manager", "plasma-manager": "plasma-manager",
@@ -1505,11 +1488,11 @@
"nixpkgs": "nixpkgs_10" "nixpkgs": "nixpkgs_10"
}, },
"locked": { "locked": {
"lastModified": 1775971308, "lastModified": 1776119890,
"narHash": "sha256-VKp9bhVSm0bT6JWctFy06ocqxGGnWHi1NfoE90IgIcY=", "narHash": "sha256-Zm6bxLNnEOYuS/SzrAGsYuXSwk3cbkRQZY0fJnk8a5M=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "31ac5fe5d015f76b54058c69fcaebb66a55871a4", "rev": "d4971dd58c6627bfee52a1ad4237637c0a2fb0cd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1561,11 +1544,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1775936757, "lastModified": 1776170745,
"narHash": "sha256-KJO/7qoxJ+hlsb3WlFSl6IGrExBIf1GvKdrhOlnGdKY=", "narHash": "sha256-Tl1aZVP5EIlT+k0+iAKH018GLHJpLz3hhJ0LNQOWxCc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "stylix", "repo": "stylix",
"rev": "d3e447786b74d62c75f665e17cb3e681c66e90c7", "rev": "e3861617645a43c9bbefde1aa6ac54dd0a44bfa9",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
flake.nix
View File

@@ -1,12 +1,8 @@
{ {
inputs = rec { 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"; 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 = { home-manager-unstable = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.nixpkgs.follows = "nixpkgs-unstable";

4
homes/x86_64-linux/admin@jallen-nas/default.nix
View File

@@ -30,6 +30,7 @@ in
jq jq
] ]
++ (with pkgs.${namespace}; [ ++ (with pkgs.${namespace}; [
hueforge
moondeck-buddy moondeck-buddy
]); ]);
}; };
@@ -83,11 +84,14 @@ in
viAlias = true; viAlias = true;
vimAlias = true; vimAlias = true;
defaultEditor = true; defaultEditor = true;
withRuby = false;
withPython3 = true;
plugins = [ plugins = [
pkgs.vimPlugins.nvim-tree-lua pkgs.vimPlugins.nvim-tree-lua
{ {
plugin = pkgs.vimPlugins.vim-startify; plugin = pkgs.vimPlugins.vim-startify;
config = "let g:startify_change_to_vcs_root = 0"; config = "let g:startify_change_to_vcs_root = 0";
type = "lua";
} }
]; ];
}; };

10
modules/nixos/homeassistant/services/thread/default.nix
View File

@@ -11,10 +11,6 @@ let
name = "otbr"; name = "otbr";
cfg = config.${namespace}.services.${name}; cfg = config.${namespace}.services.${name};
otbrPackage =
pkgs.callPackage "${inputs.nixpkgs-otbr}/pkgs/by-name/op/openthread-border-router/package.nix"
{ };
otbrConfig = lib.${namespace}.mkModule { otbrConfig = lib.${namespace}.mkModule {
inherit config name; inherit config name;
description = "Openthread border router"; description = "Openthread border router";
@@ -24,8 +20,9 @@ let
moduleConfig = { moduleConfig = {
services.openthread-border-router = { services.openthread-border-router = {
enable = true; enable = true;
backboneInterface = "enp2s0"; backboneInterfaces = [
package = otbrPackage; "enp2s0"
];
rest = { rest = {
inherit (cfg) listenAddress; inherit (cfg) listenAddress;
listenPort = cfg.restPort; listenPort = cfg.restPort;
@@ -45,7 +42,6 @@ let
in in
{ {
imports = [ imports = [
"${inputs.nixpkgs-otbr}/nixos/modules/services/home-automation/openthread-border-router.nix"
otbrConfig otbrConfig
]; ];
} }

1
modules/nixos/system/default.nix
View File

@@ -31,7 +31,6 @@ in
nil nil
nix-output-monitor nix-output-monitor
nixos-anywhere nixos-anywhere
qemu
udisks2 udisks2
unzip unzip
] ]

1
modules/nixos/user/default.nix
View File

@@ -110,6 +110,7 @@ in
extraGroups = [ extraGroups = [
"dialout" "dialout"
"uucp"
"wheel" "wheel"
"keys" "keys"
"networkmanager" "networkmanager"

8
modules/nixos/virtualization/default.nix
View File

@@ -1,8 +1,12 @@
{ lib, ... }: { lib, pkgs, ... }:
{ {
# Virtualisation configuration # Virtualisation configuration
virtualisation = { 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; podman.enable = lib.mkDefault true;
waydroid.enable = lib.mkDefault false; waydroid.enable = lib.mkDefault false;
}; };

2
packages/bcachefs/default.nix
View File

@@ -36,7 +36,7 @@ let
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "bcachefs-tools"; pname = "bcachefs-tools";
version = "1.37.2"; version = "1.37.5";
src = sources.bcachefs-tools; src = sources.bcachefs-tools;

6
packages/bcachefs/version.json
View File

@@ -4,11 +4,11 @@
"bcachefs-tools": { "bcachefs-tools": {
"fetcher": "git", "fetcher": "git",
"url": "https://github.com/koverstreet/bcachefs-tools", "url": "https://github.com/koverstreet/bcachefs-tools",
"rev": "v1.37.4", "rev": "v1.37.5",
"hash": "sha256-VlljE+xoKg6GryVuebUA1v9x2shMBUb7veCtD68MBJw=" "hash": "sha256-x/hpOTvLYyNIsC8ZM0zmTwL8GsiqaTg0ZjQNiS7Y2Wo="
}, },
"cargoDeps": { "cargoDeps": {
"hash": "sha256-t6ghsIRJFR2Kqism4tdizhnJ8qcE2ZZwH6c3nYogHlo=" "hash": "sha256-+9vy+StbFxN+2sNrObLUhvn0BhPZLW6zXuw0uUbaRmw="
} }
} }
} }

31
packages/hueforge/default.nix
View File

@@ -1,7 +1,32 @@
{ {
stdenv,
writeShellScriptBin, writeShellScriptBin,
appimage-run appimage-run
}: }:
writeShellScriptBin "hueforge" '' let
exec ${appimage-run}/bin/appimage-run HueForge_Linux_v0.9.3.1.AppImage "$@" 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
'';
}

2
systems/aarch64-linux/macbook-pro-nixos/default.nix
View File

@@ -126,7 +126,7 @@
nixpkgs.config.allowUnsupportedSystem = true; nixpkgs.config.allowUnsupportedSystem = true;
virtualisation = { virtualisation = {
libvirtd.enable = true; libvirtd.enable = false;
# efi = { # efi = {
# OVMF = (pkgs.OVMF.override { # OVMF = (pkgs.OVMF.override {
# secureBoot = true; # secureBoot = true;

3
systems/x86_64-linux/jallen-nas/boot.nix
View File

@@ -3,12 +3,13 @@
... ...
}: }:
let let
kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-latest-lto-zen4; kernelPackages = pkgs.linuxPackages_latest;
in in
{ {
boot = { boot = {
inherit kernelPackages; inherit kernelPackages;
# https://github.com/artmoty-dev/n5pro-jmb585-fix
kernelParams = [ "amd_iommu=on" ]; kernelParams = [ "amd_iommu=on" ];
initrd = { initrd = {

2
systems/x86_64-linux/jallen-nas/default.nix
View File

@@ -361,7 +361,7 @@ in
# Configure programs # Configure programs
programs = { programs = {
kdeconnect.enable = lib.mkForce false; kdeconnect.enable = lib.mkForce false;
virt-manager.enable = true; virt-manager.enable = config.virtualisation.libvirtd.enable;
steam.gamescopeSession.enable = lib.mkForce false; steam.gamescopeSession.enable = lib.mkForce false;
}; };
} }