+1 -1

base/nushell.nix

··· 74 74 75 75 source ${init-starship} 76 76 77 77 - plugin add ${pkgs.callPackage "${inputs.self}/pkgs/nu_plugin_dbus.nix" {}}/bin/nu_plugin_dbus 77 77 + plugin add ${inputs.nu_plugin_dbus.packages.${pkgs.stdenv.hostPlatform.system}.default}/bin/nu_plugin_dbus 78 78 79 79 ''; 80 80 };

-1

base/shell.nix

··· 51 51 ripgrep.enable = true; 52 52 bat = { 53 53 enable = true; 54 54 - # Broken 55 54 extraPackages = with pkgs.bat-extras; [batman batgrep batwatch]; 56 55 }; 57 56 };

+67 -24

flake.lock

··· 7 7 ] 8 8 }, 9 9 "locked": { 10 10 - "lastModified": 1737579274, 11 11 - "narHash": "sha256-8kBIYfn8TI9jbffhDNS12SdbQHb9ITXflwcgIJBeGqw=", 10 10 + "lastModified": 1738834647, 11 11 + "narHash": "sha256-NdetLk2Ie+syABcq/1MWSpqInhkODItR0xRkwDvWlpk=", 12 12 "owner": "catppuccin", 13 13 "repo": "nix", 14 14 - "rev": "06f0ea19334bcc8112e6d671fd53e61f9e3ad63a", 14 14 + "rev": "7f2e0e709ad3e47a2ae0e735168438144c134947", 15 15 "type": "github" 16 16 }, 17 17 "original": { ··· 146 146 "type": "github" 147 147 } 148 148 }, 149 149 + "flakelight": { 150 150 + "inputs": { 151 151 + "nixpkgs": [ 152 152 + "nu_plugin_dbus", 153 153 + "nixpkgs" 154 154 + ] 155 155 + }, 156 156 + "locked": { 157 157 + "lastModified": 1738586370, 158 158 + "narHash": "sha256-oNDm2sfLm9jdfOskRq2ABn85gwXusbsHEOC181peno4=", 159 159 + "owner": "nix-community", 160 160 + "repo": "flakelight", 161 161 + "rev": "d05bcabfc1efb84a7d8689de6e50b84d7f23b427", 162 162 + "type": "github" 163 163 + }, 164 164 + "original": { 165 165 + "owner": "nix-community", 166 166 + "repo": "flakelight", 167 167 + "type": "github" 168 168 + } 169 169 + }, 149 170 "gh-grader-preview": { 150 171 "inputs": { 151 172 "nixpkgs": [ ··· 153 174 ] 154 175 }, 155 176 "locked": { 156 156 - "lastModified": 1707583719, 157 157 - "narHash": "sha256-KARiQihK1riA0qIp788iH/sem4oLUvu0UHkqLZ/k5zk=", 177 177 + "lastModified": 1738957558, 178 178 + "narHash": "sha256-LrsAvqQZPyFCQkcjpiJsUAmobxM5Xartbo4OMO+T63k=", 158 179 "owner": "Bwc9876", 159 180 "repo": "gh-grader-preview", 160 160 - "rev": "10ffee561c1e8bf046c6f3d4b438a8cb31387b23", 181 181 + "rev": "ce471fcc8a6f4e786db709abacbd3b39cecd0e74", 161 182 "type": "github" 162 183 }, 163 184 "original": { ··· 243 264 ] 244 265 }, 245 266 "locked": { 246 246 - "lastModified": 1738789832, 247 247 - "narHash": "sha256-HdlMPfObPu5y7oDfH/w3vvlU3UTQ/bQjSULChZARm5M=", 267 267 + "lastModified": 1739002622, 268 268 + "narHash": "sha256-PtJV5OYQF7XO6XkDYypsYJS3+OsgYaYSmkO3I/A7lZo=", 248 269 "owner": "nix-community", 249 270 "repo": "home-manager", 250 250 - "rev": "30ea6fed4e4b41693cebc2263373dd810de4de49", 271 271 + "rev": "947eef9e99c42346cf0aac2bebe1cd94924c173b", 251 272 "type": "github" 252 273 }, 253 274 "original": { ··· 367 388 }, 368 389 "nixos-hardware": { 369 390 "locked": { 370 370 - "lastModified": 1738638143, 371 371 - "narHash": "sha256-ZYMe4c4OCtIUBn5hx15PEGr0+B1cNEpl2dsaLxwY2W0=", 391 391 + "lastModified": 1738816619, 392 392 + "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=", 372 393 "owner": "NixOS", 373 394 "repo": "nixos-hardware", 374 374 - "rev": "9bdd53f5908453e4d03f395eb1615c3e9a351f70", 395 395 + "rev": "2eccff41bab80839b1d25b303b53d339fbb07087", 375 396 "type": "github" 376 397 }, 377 398 "original": { ··· 382 403 }, 383 404 "nixpkgs": { 384 405 "locked": { 385 385 - "lastModified": 1738680400, 386 386 - "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", 406 406 + "lastModified": 1738961098, 407 407 + "narHash": "sha256-yWNBf6VDW38tl179FEuJ0qukthVfB02kv+mRsfUsWC0=", 387 408 "owner": "NixOS", 388 409 "repo": "nixpkgs", 389 389 - "rev": "799ba5bffed04ced7067a91798353d360788b30d", 410 410 + "rev": "a3eaf5e8eca7cab680b964138fb79073704aca75", 390 411 "type": "github" 391 412 }, 392 413 "original": { ··· 429 450 "treefmt-nix": "treefmt-nix" 430 451 }, 431 452 "locked": { 432 432 - "lastModified": 1738807015, 433 433 - "narHash": "sha256-cITxk7u1n+if4Lyd5dGmPVZF8usHWuUspGOv65L3FXs=", 453 453 + "lastModified": 1738966895, 454 454 + "narHash": "sha256-OXOh35rTEnFSO4vj/SDMIlDvFPGW0ba1XhZkfx+AlL0=", 434 455 "owner": "nix-community", 435 456 "repo": "nixvim", 436 436 - "rev": "2ecc5359f804bc98901dee0c95999ac3fa308388", 457 457 + "rev": "e7f20a602f6e08a70045f36c531bc44ba1baed07", 437 458 "type": "github" 438 459 }, 439 460 "original": { ··· 442 463 "type": "github" 443 464 } 444 465 }, 466 466 + "nu_plugin_dbus": { 467 467 + "inputs": { 468 468 + "flakelight": "flakelight", 469 469 + "nixpkgs": [ 470 470 + "nixpkgs" 471 471 + ] 472 472 + }, 473 473 + "locked": { 474 474 + "lastModified": 1739030097, 475 475 + "narHash": "sha256-8mp8nKbbhtXG2rDbT868XV63UXH4fOXFtOSa0TFGSDI=", 476 476 + "owner": "Bwc9876", 477 477 + "repo": "nu_plugin_dbus", 478 478 + "rev": "363d0d4ac4b67000565a8c18b602a42b63f7de20", 479 479 + "type": "github" 480 480 + }, 481 481 + "original": { 482 482 + "owner": "Bwc9876", 483 483 + "repo": "nu_plugin_dbus", 484 484 + "type": "github" 485 485 + } 486 486 + }, 445 487 "nuschtosSearch": { 446 488 "inputs": { 447 489 "flake-utils": "flake-utils", ··· 503 545 "nixos-hardware": "nixos-hardware", 504 546 "nixpkgs": "nixpkgs", 505 547 "nixvim": "nixvim", 548 548 + "nu_plugin_dbus": "nu_plugin_dbus", 506 549 "rust-overlay": "rust-overlay_2", 507 550 "wayland-mpris-idle-inhibit": "wayland-mpris-idle-inhibit" 508 551 } ··· 535 578 ] 536 579 }, 537 580 "locked": { 538 538 - "lastModified": 1738808867, 539 539 - "narHash": "sha256-m5rbY/ck0NAlfSBxo++vl7EZn8fkZ02H3kGGc7q883c=", 581 581 + "lastModified": 1738981474, 582 582 + "narHash": "sha256-YIELTXxfATG0g1wXjyaOWA4qrlubds3MG4FvMPCxSGg=", 540 583 "owner": "oxalica", 541 584 "repo": "rust-overlay", 542 542 - "rev": "ae46f37fb727030ddc2ef65a675b751484c90032", 585 585 + "rev": "5c571e5ff246d8fc5f76ba6e38dc8edb6e4002fe", 543 586 "type": "github" 544 587 }, 545 588 "original": { ··· 591 634 ] 592 635 }, 593 636 "locked": { 594 594 - "lastModified": 1715354337, 595 595 - "narHash": "sha256-5SnbsGN0TXOqILGdDqvWaY0s66cmt6Y+py/prZWoyrw=", 637 637 + "lastModified": 1738957449, 638 638 + "narHash": "sha256-12ix4EuQ8f6DxBbJ8bCVUqYTBnFi474OVHaVBXgiLMI=", 596 639 "owner": "Bwc9876", 597 640 "repo": "wayland-mpris-idle-inhibit", 598 598 - "rev": "c211735d40e6a485b01b30e232de4de7d71a8318", 641 641 + "rev": "0085e928fcd3186fd3c4066e8c90288bd70fde9e", 599 642 "type": "github" 600 643 }, 601 644 "original": {

+3

flake.nix

··· 22 22 nixvim.inputs.nixpkgs.follows = "nixpkgs"; 23 23 nixvim.inputs.home-manager.follows = "hm"; 24 24 imperm.url = "github:nix-community/impermanence"; 25 25 + nu_plugin_dbus.url = "github:Bwc9876/nu_plugin_dbus"; 26 26 + nu_plugin_dbus.inputs.nixpkgs.follows = "nixpkgs"; 25 27 }; 26 28 27 29 outputs = inputs @ { ··· 37 39 catppuccin, 38 40 nixvim, 39 41 imperm, 42 42 + nu_plugin_dbus, 40 43 }: let 41 44 lib = (import ./lib.nix) nixpkgs.lib; 42 45 pkgsFor = system:

-39

pkgs/nu_plugin_dbus.nix

··· 1 1 - { 2 2 - rustPlatform, 3 3 - dbus, 4 4 - nushell, 5 5 - pkg-config, 6 6 - fetchFromGitHub, 7 7 - lib, 8 8 - }: 9 9 - rustPlatform.buildRustPackage rec { 10 10 - pname = "nu_plugin_dbus"; 11 11 - version = 12 12 - if nushell.version == nu_version 13 13 - then "0.13.0" 14 14 - else abort "Nushell Version mismatch\nPlugin: ${nu_version}\tnixpkgs: ${nushell.version}"; 15 15 - nu_version = "0.101.0"; 16 16 - 17 17 - src = fetchFromGitHub { 18 18 - owner = "LordMZTE"; 19 19 - repo = "nu_plugin_dbus"; 20 20 - rev = "baa52026c3e8e4c6296d5545fd26237287436dad"; 21 21 - sha256 = "sha256-Ga+1zFwS/v+3iKVEz7TFmJjyBW/gq6leHeyH2vjawto="; 22 22 - }; 23 23 - 24 24 - cargoHash = "sha256-5GE8fylq7AB4VWJMvBNLw4a9ksNmn1iHk7wx9wOG6yE="; 25 25 - 26 26 - nativeBuildInputs = [ 27 27 - pkg-config 28 28 - ]; 29 29 - 30 30 - buildInputs = [ 31 31 - dbus 32 32 - ]; 33 33 - 34 34 - meta = with lib; { 35 35 - description = "A nushell plugin for interacting with dbus"; 36 36 - license = licenses.mit; 37 37 - homepage = "https://github.com/devyn/nu_plugin_dbus"; 38 38 - }; 39 39 - }

+1

roles/dev/python.nix

··· 3 3 python3 4 4 poetry 5 5 pipenv 6 6 + uv 6 7 black 7 8 ]; 8 9 }

+1 -1

roles/graphics/apps.nix

··· 164 164 ## Media 165 165 libsForQt5.kdenlive 166 166 obs-studio 167 167 - qmplay2 167 167 + # qmplay2 168 168 gimp 169 169 inkscape 170 170 lorien

+12 -12

roles/hypervisor+graphics.nix

··· 1 1 {pkgs, ...}: { 2 2 virtualisation.libvirtd = { 3 3 enable = true; 4 4 - qemu.swtpm.enable = true; # Win 11 needs TPM 5 5 - qemu.ovmf.packages = [ 6 6 - (pkgs.OVMF.override { 7 7 - # I have to build UEFI firmware from source, fun times 8 8 - secureBoot = true; # Win 11 needs secure boot 9 9 - tpmSupport = true; # Win 11 needs TPM 10 10 - }) 11 11 - .fd 12 12 - ]; 4 4 + # qemu.swtpm.enable = true; # Win 11 needs TPM 5 5 + # qemu.ovmf.packages = [ 6 6 + # (pkgs.OVMF.override { 7 7 + # # I have to build UEFI firmware from source, fun times 8 8 + # secureBoot = true; # Win 11 needs secure boot 9 9 + # tpmSupport = true; # Win 11 needs TPM 10 10 + # }) 11 11 + # .fd 12 12 + # ]; 13 13 }; 14 14 15 15 # GUI For Managing Machines 16 16 programs.virt-manager.enable = true; 17 17 18 18 - environment.systemPackages = with pkgs; [ 19 19 - libtpms # For win 11 20 20 - ]; 18 18 + # environment.systemPackages = with pkgs; [ 19 19 + # libtpms # For win 11 20 20 + # ]; 21 21 }

-2

systems/aperture.nix

··· 23 23 24 24 services.fprintd.enable = true; 25 25 26 26 - boot.extraModprobeConfig = lib.mkForce ""; 27 27 - 28 26 boot.initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod"]; 29 27 boot.initrd.kernelModules = []; 30 28 boot.kernelModules = ["kvm-intel"];