Flake for my NixOS devices

Update, increase waybar MPRIS len

bwc9876.dev 18257279 e589757b

verified
+73 -146
+1
README.md
··· 8 8 - `aperture` - Framework 13 Laptop 9 9 - `black-mesa` - Desktop Computer w/ AMD GPU 10 10 - `installer` - Installer/LiveCD ISO for my flake 11 + - `mann-co` - RPi mostly just used for one-off tests
+34 -107
flake.lock
··· 31 31 ] 32 32 }, 33 33 "locked": { 34 - "lastModified": 1767750947, 35 - "narHash": "sha256-zqe9esphlAFu19TGL/nAyOHyOiR+Vu8M2IWWLg9cm4U=", 34 + "lastModified": 1767967164, 35 + "narHash": "sha256-Cx4VETh9dGoQYDtWhre7g66d7SAr+h1h6f+SSHxVrck=", 36 36 "owner": "catppuccin", 37 37 "repo": "nix", 38 - "rev": "e7135074fe2a3d17bee3c229b5a7d3da26f76ce8", 38 + "rev": "e973584280e3b0e1d5b5a1a5e9948dc222c54af7", 39 39 "type": "github" 40 40 }, 41 41 "original": { ··· 104 104 "type": "github" 105 105 } 106 106 }, 107 - "deploy-rs": { 108 - "inputs": { 109 - "flake-compat": "flake-compat_2", 110 - "nixpkgs": [ 111 - "spoon", 112 - "nixpkgs" 113 - ], 114 - "utils": "utils" 115 - }, 116 - "locked": { 117 - "lastModified": 1766051518, 118 - "narHash": "sha256-znKOwPXQnt3o7lDb3hdf19oDo0BLP4MfBOYiWkEHoik=", 119 - "owner": "serokell", 120 - "repo": "deploy-rs", 121 - "rev": "d5eff7f948535b9c723d60cd8239f8f11ddc90fa", 122 - "type": "github" 123 - }, 124 - "original": { 125 - "owner": "serokell", 126 - "repo": "deploy-rs", 127 - "type": "github" 128 - } 129 - }, 130 107 "fenix": { 131 108 "inputs": { 132 109 "nixpkgs": [ ··· 158 135 "rust-analyzer-src": "rust-analyzer-src_2" 159 136 }, 160 137 "locked": { 161 - "lastModified": 1767163745, 162 - "narHash": "sha256-sJXyT3AeB3rHPuK93VjnVI16hoLJazieFq7LP62cTHw=", 138 + "lastModified": 1767768674, 139 + "narHash": "sha256-auiYCCLRKvVhnGV0JSZKc1N6GTLKcXbA5zsOs2jzSVE=", 163 140 "owner": "nix-community", 164 141 "repo": "fenix", 165 - "rev": "33e17a88166bba14f4017b3ee6cafe5b3376aef0", 142 + "rev": "e280b9a8eb71223be5dc0e57c407a94eb48ffaab", 166 143 "type": "github" 167 144 }, 168 145 "original": { ··· 187 164 "type": "github" 188 165 } 189 166 }, 190 - "flake-compat_2": { 191 - "flake": false, 192 - "locked": { 193 - "lastModified": 1733328505, 194 - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", 195 - "owner": "edolstra", 196 - "repo": "flake-compat", 197 - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", 198 - "type": "github" 199 - }, 200 - "original": { 201 - "owner": "edolstra", 202 - "repo": "flake-compat", 203 - "type": "github" 204 - } 205 - }, 206 167 "flake-parts": { 207 168 "inputs": { 208 169 "nixpkgs-lib": [ ··· 401 362 ] 402 363 }, 403 364 "locked": { 404 - "lastModified": 1767909183, 405 - "narHash": "sha256-u/bcU0xePi5bgNoRsiqSIwaGBwDilKKFTz3g0hqOBAo=", 365 + "lastModified": 1768068402, 366 + "narHash": "sha256-bAXnnJZKJiF7Xr6eNW6+PhBf1lg2P1aFUO9+xgWkXfA=", 406 367 "owner": "nix-community", 407 368 "repo": "home-manager", 408 - "rev": "cd6e96d56ed4b2a779ac73a1227e0bb1519b3509", 369 + "rev": "8bc5473b6bc2b6e1529a9c4040411e1199c43b4c", 409 370 "type": "github" 410 371 }, 411 372 "original": { ··· 508 469 "xwayland-satellite-unstable": "xwayland-satellite-unstable" 509 470 }, 510 471 "locked": { 511 - "lastModified": 1767833217, 512 - "narHash": "sha256-HLr9k8g1Geq40PLsNw7I5N8TZkBYtQVjkgDPV/Kehxk=", 472 + "lastModified": 1768169521, 473 + "narHash": "sha256-8BcUyVjNeEaMnJ+E1mtiM3Kd0YlwblxfHjH6RHldBVA=", 513 474 "owner": "sodiboo", 514 475 "repo": "niri-flake", 515 - "rev": "a789aa1512a9157d5d3392b27e60621fd0d83438", 476 + "rev": "64abc7688c1e460c9b9ea72f9bbda8dc74a5a5a3", 516 477 "type": "github" 517 478 }, 518 479 "original": { ··· 541 502 "niri-unstable": { 542 503 "flake": false, 543 504 "locked": { 544 - "lastModified": 1767792726, 545 - "narHash": "sha256-qS4tdG2iUQwSld9dTH1gk8GcIOrRi9umMgPv8MGDIA0=", 505 + "lastModified": 1768150783, 506 + "narHash": "sha256-1gtx2la5f8RphvN+BUZuZjiGh25WdO0Hf9+kJKIu3rA=", 546 507 "owner": "YaLTeR", 547 508 "repo": "niri", 548 - "rev": "10df9f4717cbd4efd20ae796eb6b0aa400127bdc", 509 + "rev": "e9d888cd52f8a783b07e0d6c0ec9a341a81031ca", 549 510 "type": "github" 550 511 }, 551 512 "original": { ··· 591 552 }, 592 553 "nixpkgs": { 593 554 "locked": { 594 - "lastModified": 1767767207, 595 - "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", 555 + "lastModified": 1768127708, 556 + "narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=", 596 557 "owner": "NixOS", 597 558 "repo": "nixpkgs", 598 - "rev": "5912c1772a44e31bf1c63c0390b90501e5026886", 559 + "rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38", 599 560 "type": "github" 600 561 }, 601 562 "original": { ··· 607 568 }, 608 569 "nixpkgs-stable": { 609 570 "locked": { 610 - "lastModified": 1767799921, 611 - "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=", 571 + "lastModified": 1768028080, 572 + "narHash": "sha256-50aDK+8eLvsLK39TzQhKNq50/HcXyP4hyxOYoPoVxjo=", 612 573 "owner": "NixOS", 613 574 "repo": "nixpkgs", 614 - "rev": "d351d0653aeb7877273920cd3e823994e7579b0b", 575 + "rev": "d03088749a110d52a4739348f39a63f84bb0be14", 615 576 "type": "github" 616 577 }, 617 578 "original": { ··· 707 668 "prismlauncher-meta": { 708 669 "flake": false, 709 670 "locked": { 710 - "lastModified": 1767135651, 711 - "narHash": "sha256-fNCNWqrIOQtappichzs5vjiY1kwlx1SKcDUx2sHCIOo=", 671 + "lastModified": 1767805365, 672 + "narHash": "sha256-cYUe7/Tca9slPxvAw66Ddtn+jocFqbQMhDGLuPg5+4Q=", 712 673 "owner": "PrismLauncher", 713 674 "repo": "meta-upstream", 714 - "rev": "5f1223e7ca223c3f89bf9681a8ae3e0db1723387", 675 + "rev": "2d6454287a938220d52b7b40e31bc93245e2aa92", 715 676 "type": "github" 716 677 }, 717 678 "original": { ··· 811 772 "rust-analyzer-src_2": { 812 773 "flake": false, 813 774 "locked": { 814 - "lastModified": 1767092832, 815 - "narHash": "sha256-cZFPNglcpjQuA9MXejYELyrIvPm67jR5CZ8Sq2o5P0w=", 775 + "lastModified": 1767609612, 776 + "narHash": "sha256-ghz849iTGb+if+co4yGQC2Nfc0H6B/K4JFeul9rm7n4=", 816 777 "owner": "rust-lang", 817 778 "repo": "rust-analyzer", 818 - "rev": "2b4263b042d9bdee370e027e4b0ea0f6101709d0", 779 + "rev": "58646b524408a5aecb12d91121ea5825bef3d0c8", 819 780 "type": "github" 820 781 }, 821 782 "original": { ··· 848 809 }, 849 810 "spoon": { 850 811 "inputs": { 851 - "deploy-rs": "deploy-rs", 852 812 "fenix": "fenix_2", 853 813 "flakelight": [ 854 814 "flakelight" ··· 867 827 "prismlauncher-meta": "prismlauncher-meta" 868 828 }, 869 829 "locked": { 870 - "lastModified": 1767810853, 871 - "narHash": "sha256-1wuKa+41QaxxTt6dB/R8frV751aBGEwmB+JhDGf6HqM=", 830 + "lastModified": 1767918405, 831 + "narHash": "sha256-DR5FzeEM6O1YJlAnZiEWOYbFswgWNF0j7aTDugVz3Dk=", 872 832 "ref": "refs/heads/main", 873 - "rev": "27f8f665aca556d770070de3c93c1527faa0cacf", 874 - "revCount": 363, 833 + "rev": "8db87f685b36d2f9355d270287571e171816b65c", 834 + "revCount": 369, 875 835 "type": "git", 876 836 "url": "https://codeberg.org/spoonbaker/mono" 877 837 }, ··· 895 855 "type": "github" 896 856 } 897 857 }, 898 - "systems_2": { 899 - "locked": { 900 - "lastModified": 1681028828, 901 - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", 902 - "owner": "nix-systems", 903 - "repo": "default", 904 - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", 905 - "type": "github" 906 - }, 907 - "original": { 908 - "owner": "nix-systems", 909 - "repo": "default", 910 - "type": "github" 911 - } 912 - }, 913 - "utils": { 914 - "inputs": { 915 - "systems": "systems_2" 916 - }, 917 - "locked": { 918 - "lastModified": 1731533236, 919 - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", 920 - "owner": "numtide", 921 - "repo": "flake-utils", 922 - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", 923 - "type": "github" 924 - }, 925 - "original": { 926 - "owner": "numtide", 927 - "repo": "flake-utils", 928 - "type": "github" 929 - } 930 - }, 931 858 "uv2nix": { 932 859 "inputs": { 933 860 "nixpkgs": [ ··· 995 922 "xwayland-satellite-unstable": { 996 923 "flake": false, 997 924 "locked": { 998 - "lastModified": 1767830382, 999 - "narHash": "sha256-0PgS7M1SV6JCN3MugFZPaP8J+Mr2o7lSDFTPVYZSIAY=", 925 + "lastModified": 1768106915, 926 + "narHash": "sha256-HlLo9zH4ULRXlmlIK948cHmdVhxyHgTHxGaoCRlW4k8=", 1000 927 "owner": "Supreeeme", 1001 928 "repo": "xwayland-satellite", 1002 - "rev": "74cf1a95a35fd7aec76432bc2cd9b310e0d908c5", 929 + "rev": "72245e108f3b03c3c4474d2de9de2d1830849603", 1003 930 "type": "github" 1004 931 }, 1005 932 "original": {
-1
homeModules/nvim.nix
··· 680 680 # }; 681 681 # }; 682 682 683 - # TODO: Broken in nixpkgs rn, hash mismatch, #464773 684 683 lualine = { 685 684 enable = true; 686 685 settings = {
+38 -38
homeModules/waybar.nix
··· 160 160 ++ lib.optional config.cow.news.enable "custom/news" 161 161 ++ [ 162 162 "custom/weather" 163 - "mpris" 164 163 ]; 165 164 modules-right = 166 165 [ ··· 176 175 "privacy" 177 176 "tray" 178 177 ]; 179 - mpris = { 180 - album-len = 20; 181 - artist-len = 25; 182 - interval = 1; 183 - dynamic-importance-order = [ 184 - "title" 185 - "position" 186 - "length" 187 - "artist" 188 - "album" 189 - ]; 190 - dynamic-len = 50; 191 - dynamic-order = [ 192 - "title" 193 - "artist" 194 - "album" 195 - "position" 196 - "length" 197 - ]; 198 - format = "{player_icon} {dynamic}"; 199 - format-paused = "{status_icon} {dynamic}"; 200 - player-icons = { 201 - QMPlay2 = "󰐌"; 202 - default = "󰎆"; 203 - firefox = ""; 204 - firefox-devedition = ""; 205 - chromium = "󰖟"; 206 - kdeconnect = ""; 207 - spotify = "󰓇"; 208 - }; 209 - status-icons = { 210 - paused = "󰏤"; 211 - stopped = "󰓛"; 212 - }; 213 - title-len = 35; 214 - }; 178 + 215 179 network = { 216 180 format = "{ifname}"; 217 181 format-disconnected = "󰪎"; ··· 278 242 }; 279 243 } 280 244 { 245 + mpris = { 246 + album-len = 20; 247 + artist-len = 25; 248 + interval = 1; 249 + dynamic-importance-order = [ 250 + "title" 251 + "position" 252 + "length" 253 + "artist" 254 + "album" 255 + ]; 256 + dynamic-len = 80; 257 + dynamic-order = [ 258 + "title" 259 + "artist" 260 + "album" 261 + "position" 262 + "length" 263 + ]; 264 + format = "{player_icon} {dynamic}"; 265 + format-paused = "{status_icon} {dynamic}"; 266 + player-icons = { 267 + QMPlay2 = "󰐌"; 268 + default = "󰎆"; 269 + firefox = ""; 270 + firefox-devedition = ""; 271 + chromium = "󰖟"; 272 + kdeconnect = ""; 273 + spotify = "󰓇"; 274 + }; 275 + status-icons = { 276 + paused = "󰏤"; 277 + stopped = "󰓛"; 278 + }; 279 + title-len = 35; 280 + }; 281 281 cpu = { 282 282 format = "󰍛 {usage}󰏰"; 283 283 states = { ··· 298 298 }; 299 299 }; 300 300 # modules-center = ["wlr/taskbar"]; 301 - # modules-left = ["hyprland/workspaces"]; 301 + modules-left = ["mpris"]; 302 302 modules-right = [ 303 303 "temperature" 304 304 "cpu"