Compare commits
No commits in common. "6adfa3e78f8a52ac775a8a82865d474c42bdac5f" and "2f68a4e76a55e4429355fd1ff6bd45754f4545d8" have entirely different histories.
6adfa3e78f
...
2f68a4e76a
12 changed files with 227 additions and 148 deletions
213
flake.lock
213
flake.lock
|
|
@ -31,11 +31,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722472866,
|
||||
"narHash": "sha256-GJIz4M5HDB948Ex/8cPvbkrNzl/eKUE7/c21JBu4lb8=",
|
||||
"lastModified": 1720542474,
|
||||
"narHash": "sha256-aKjJ/4l2I9+wNGTaOGRsuS3M1+IoTibqgEMPDikXm04=",
|
||||
"owner": "zhaofengli",
|
||||
"repo": "attic",
|
||||
"rev": "e127acbf9a71ebc0c26bc8e28346822e0a6e16ba",
|
||||
"rev": "6139576a3ce6bb992e0f6c3022528ec233e45f00",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -44,6 +44,31 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"atuin": {
|
||||
"inputs": {
|
||||
"fenix": "fenix",
|
||||
"flake-compat": "flake-compat_2",
|
||||
"flake-utils": [
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722262249,
|
||||
"narHash": "sha256-lUKDWPgfT6mr50WZgSq3/hJtZ8gYxr3PCLghek5EFaE=",
|
||||
"owner": "atuinsh",
|
||||
"repo": "atuin",
|
||||
"rev": "db2d6c3d83e927185068aab457396ee1a21994ff",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "atuinsh",
|
||||
"repo": "atuin",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"caddy-with-plugins": {
|
||||
"inputs": {
|
||||
"flake-parts": [
|
||||
|
|
@ -72,7 +97,7 @@
|
|||
},
|
||||
"colmena": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_2",
|
||||
"flake-compat": "flake-compat_3",
|
||||
"flake-utils": "flake-utils_2",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
|
|
@ -137,7 +162,7 @@
|
|||
},
|
||||
"crane_3": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_4",
|
||||
"flake-compat": "flake-compat_5",
|
||||
"flake-utils": [
|
||||
"ha-now-playing",
|
||||
"flake-utils"
|
||||
|
|
@ -172,11 +197,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723426710,
|
||||
"narHash": "sha256-yrS9al6l3fYfFfvovnyBWnyELDQOdfKyai4K/jKgoBw=",
|
||||
"lastModified": 1722217815,
|
||||
"narHash": "sha256-8r5AJ3n8WEDw3rsZLALSuFQ5kJyWOcssNZvPxYLr2yc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "0d510fe40b56ed74907a021d7e1ffd0042592914",
|
||||
"rev": "1e6f8a7b4634fc051cc9361959bf414fcf17e094",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -196,11 +221,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723540261,
|
||||
"narHash": "sha256-jniQno8FCotJ0OUSxd43Zl5q0UsKbKvrtATduvrhO2g=",
|
||||
"lastModified": 1722273087,
|
||||
"narHash": "sha256-uELMts/UTJ4jTPQbQgOnE75flmdbWm672yDvL3QLWOI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "aa3997dd78a00dec18e4d22f6073f78778c75301",
|
||||
"rev": "087cf45264b4487b2848e08548bb4c5f933d460c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -211,7 +236,7 @@
|
|||
},
|
||||
"eww": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_3",
|
||||
"flake-compat": "flake-compat_4",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
|
|
@ -236,17 +261,39 @@
|
|||
"fenix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"microvm",
|
||||
"atuin",
|
||||
"nixpkgs"
|
||||
],
|
||||
"rust-analyzer-src": "rust-analyzer-src"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722580276,
|
||||
"narHash": "sha256-VaNcSh7n8OaFW/DJsR6Fm23V+EGpSei0DyF71RKB+90=",
|
||||
"lastModified": 1719728857,
|
||||
"narHash": "sha256-TW68WegsA2KLjQMHTaP2//tLgXSaFiRdZKxKUc7vEtY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"rev": "286f371b3cfeaa5c856c8e6dfb893018e86cc947",
|
||||
"rev": "2c06f54eb102f325f88472a9713f6d779726c2f7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"fenix_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"microvm",
|
||||
"nixpkgs"
|
||||
],
|
||||
"rust-analyzer-src": "rust-analyzer-src_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1720420198,
|
||||
"narHash": "sha256-OIuDb6pHDyGpo7YMFyuRzMLcHm7mRvlYOz0Ht7ps2sU=",
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"rev": "abc0549e3560189462a7d394cc9d50af4608d103",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -272,6 +319,22 @@
|
|||
}
|
||||
},
|
||||
"flake-compat_2": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1696426674,
|
||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat_3": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1650374568,
|
||||
|
|
@ -287,7 +350,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat_3": {
|
||||
"flake-compat_4": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1696426674,
|
||||
|
|
@ -303,7 +366,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat_4": {
|
||||
"flake-compat_5": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1696267196,
|
||||
|
|
@ -319,7 +382,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat_5": {
|
||||
"flake-compat_6": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1696426674,
|
||||
|
|
@ -335,7 +398,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat_6": {
|
||||
"flake-compat_7": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1696426674,
|
||||
|
|
@ -377,11 +440,11 @@
|
|||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722555600,
|
||||
"narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
|
||||
"lastModified": 1719994518,
|
||||
"narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
|
||||
"rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -546,11 +609,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723399884,
|
||||
"narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=",
|
||||
"lastModified": 1722321190,
|
||||
"narHash": "sha256-WeVWVRqkgrbLzmk6FfJoloJ7Xe7HWD27Pv950IUG2kI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "086f619dd991a4d355c07837448244029fc2d9ab",
|
||||
"rev": "4fcd54df7cbb1d79cbe81209909ee8514d6b17a4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -561,7 +624,7 @@
|
|||
},
|
||||
"microvm": {
|
||||
"inputs": {
|
||||
"fenix": "fenix",
|
||||
"fenix": "fenix_2",
|
||||
"flake-utils": [
|
||||
"flake-utils"
|
||||
],
|
||||
|
|
@ -571,11 +634,11 @@
|
|||
"spectrum": "spectrum"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723470968,
|
||||
"narHash": "sha256-W76xLG4thxkENM3MOoXWYqKPrgk1WgUWzTixUyuw/co=",
|
||||
"lastModified": 1721849618,
|
||||
"narHash": "sha256-+cKh/zzyzOfOC7GryAVMESpvTckOVJ+cQC01JJi1z8k=",
|
||||
"owner": "astro",
|
||||
"repo": "microvm.nix",
|
||||
"rev": "69e8ac63a7a4d40bb65e73af41ba60df2eba0419",
|
||||
"rev": "2f56d58cae49d6b66adc42aa3c52051a83f6a176",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -617,11 +680,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722947113,
|
||||
"narHash": "sha256-DqsN/VkYVr4M0PVRQKXPPOTaind5miYZURIYqM4MxYM=",
|
||||
"lastModified": 1717086091,
|
||||
"narHash": "sha256-GmsEQa4HZeMfec37LZnwG/Lt/XmqFLXsjv5QWojeNiM=",
|
||||
"owner": "oxalica",
|
||||
"repo": "nil",
|
||||
"rev": "70df371289962554cf7a23ed595b23a2ce271960",
|
||||
"rev": "ab3ddb8f063774cf7e22eb610f5ecfdb77309f3c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -632,18 +695,18 @@
|
|||
},
|
||||
"nix-ld-rs": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_5",
|
||||
"flake-compat": "flake-compat_6",
|
||||
"flake-utils": "flake-utils_4",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723348316,
|
||||
"narHash": "sha256-tCjKgg9HE0jFz7smwB3n3Wg++6K6umyK1rHpBIr/ZI4=",
|
||||
"lastModified": 1722257939,
|
||||
"narHash": "sha256-SUHIztj/CoqqtwEjSA9cnJb+IIFIr2ntrzn0Ly1DCB8=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-ld-rs",
|
||||
"rev": "d1b139e7b8671ca1af26efaa71a28f3c031f9b66",
|
||||
"rev": "178b100f4dda6b1280e9619270009fc8c0938e73",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -654,11 +717,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1723310128,
|
||||
"narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=",
|
||||
"lastModified": 1722278305,
|
||||
"narHash": "sha256-xLBAegsn9wbj+pQfbX07kykd5VBV3Ywk3IbObVAAlWA=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf",
|
||||
"rev": "eab049fe178c11395d65a858ba1b56461ba9652d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -685,14 +748,14 @@
|
|||
},
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"lastModified": 1722555339,
|
||||
"narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=",
|
||||
"lastModified": 1719876945,
|
||||
"narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
|
|
@ -713,11 +776,11 @@
|
|||
},
|
||||
"nixpkgs-stable_2": {
|
||||
"locked": {
|
||||
"lastModified": 1723282977,
|
||||
"narHash": "sha256-oTK91aOlA/4IsjNAZGMEBz7Sq1zBS0Ltu4/nIQdYDOg=",
|
||||
"lastModified": 1722087241,
|
||||
"narHash": "sha256-2ShmEaFi0kJVOEEu5gmlykN5dwjWYWYUJmlRTvZQRpU=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a781ff33ae258bbcfd4ed6e673860c3e923bf2cc",
|
||||
"rev": "8c50662509100d53229d4be607f1a3a31157fa12",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -761,11 +824,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1723362943,
|
||||
"narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=",
|
||||
"lastModified": 1722062969,
|
||||
"narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a58bc8ad779655e790115244571758e8de055e3d",
|
||||
"rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -805,7 +868,7 @@
|
|||
},
|
||||
"pre-commit-hooks": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_6",
|
||||
"flake-compat": "flake-compat_7",
|
||||
"gitignore": "gitignore",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
|
|
@ -813,11 +876,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723202784,
|
||||
"narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=",
|
||||
"lastModified": 1721042469,
|
||||
"narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "c7012d0c18567c889b948781bc74a501e92275d1",
|
||||
"rev": "f451c19376071a90d8c58ab1a953c6e9840527fd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -830,6 +893,7 @@
|
|||
"inputs": {
|
||||
"anyrun": "anyrun",
|
||||
"attic": "attic",
|
||||
"atuin": "atuin",
|
||||
"caddy-with-plugins": "caddy-with-plugins",
|
||||
"colmena": "colmena",
|
||||
"disko": "disko",
|
||||
|
|
@ -856,11 +920,28 @@
|
|||
"rust-analyzer-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1722521768,
|
||||
"narHash": "sha256-FvJ4FaMy1kJbZ3Iw1RyvuiUAsbHJXoU2HwylzaFzj1o=",
|
||||
"lastModified": 1719576535,
|
||||
"narHash": "sha256-YzF4P6YVInAjcR5eJHWefkKEu5t70KYVZMvdLODv8CM=",
|
||||
"owner": "rust-lang",
|
||||
"repo": "rust-analyzer",
|
||||
"rev": "f149dc5029d8406fae8b2c541603bcac06e30deb",
|
||||
"rev": "9463d9eea4b87e651e7d8ed8425a9c92f23b1cdf",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "rust-lang",
|
||||
"ref": "nightly",
|
||||
"repo": "rust-analyzer",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"rust-analyzer-src_2": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1720344064,
|
||||
"narHash": "sha256-STmaV9Zu74QtkGGrbr9uMhskwagfCjJqOAYapXabiuk=",
|
||||
"owner": "rust-lang",
|
||||
"repo": "rust-analyzer",
|
||||
"rev": "a5b21ea0aa644dffd7cf958b43f11f221d53404e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -902,11 +983,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723515680,
|
||||
"narHash": "sha256-nHdKymsHCVIh0Wdm4MvSgxcTTg34FJIYHRQkQYaSuvk=",
|
||||
"lastModified": 1722305989,
|
||||
"narHash": "sha256-ljiuTGSFuEtudqFqp/5Wr1OuEsVCjur/F2CmlNujSjc=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "4ee3d9e9569f70d7bb40f28804d6fe950c81eab3",
|
||||
"rev": "38c2f156fca1868c8be7195ddac150522752f6ab",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -923,11 +1004,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723501126,
|
||||
"narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=",
|
||||
"lastModified": 1722114803,
|
||||
"narHash": "sha256-s6YhI8UHwQvO4cIFLwl1wZ1eS5Cuuw7ld2VzUchdFP0=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "be0eec2d27563590194a9206f551a6f73d52fa34",
|
||||
"rev": "eb34eb588132d653e4c4925d862f1e5a227cc2ab",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1020,11 +1101,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723454642,
|
||||
"narHash": "sha256-S0Gvsenh0II7EAaoc9158ZB4vYyuycvMGKGxIbERNAM=",
|
||||
"lastModified": 1721769617,
|
||||
"narHash": "sha256-6Pqa0bi5nV74IZcENKYRToRNM5obo1EQ+3ihtunJ014=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "349de7bc435bdff37785c2466f054ed1766173be",
|
||||
"rev": "8db8970be1fb8be9c845af7ebec53b699fe7e009",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
15
flake.nix
15
flake.nix
|
|
@ -104,13 +104,13 @@
|
|||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
# atuin = {
|
||||
# url = "github:atuinsh/atuin";
|
||||
# inputs = {
|
||||
# nixpkgs.follows = "nixpkgs";
|
||||
# flake-utils.follows = "flake-utils";
|
||||
# };
|
||||
# };
|
||||
atuin = {
|
||||
url = "github:atuinsh/atuin";
|
||||
inputs = {
|
||||
nixpkgs.follows = "nixpkgs";
|
||||
flake-utils.follows = "flake-utils";
|
||||
};
|
||||
};
|
||||
|
||||
caddy-with-plugins = {
|
||||
url = "github:eboskma/caddy-with-plugins";
|
||||
|
|
@ -270,7 +270,6 @@
|
|||
packages = {
|
||||
dnspyre = pkgs.callPackage ./pkgs/dnspyre { };
|
||||
git-repo-go = pkgs.callPackage ./pkgs/git-repo-go { };
|
||||
hassbridge = pkgs.callPackage ./pkgs/hassbridge { };
|
||||
tinyows = pkgs.callPackage ./pkgs/tinyows { };
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -104,6 +104,8 @@ let
|
|||
tree-sitter-zig
|
||||
]
|
||||
))
|
||||
emacsql
|
||||
emacsql-sqlite
|
||||
];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -345,10 +345,10 @@ in
|
|||
|
||||
timeouts =
|
||||
let
|
||||
poweroffOpts = builtins.concatStringsSep ", " (
|
||||
poweroffOpts = builtins.concatStringsSep " " (
|
||||
builtins.map (name: "output ${name} power off") (builtins.attrNames cfg.output)
|
||||
);
|
||||
resumeOpts = builtins.concatStringsSep ", " (
|
||||
resumeOpts = builtins.concatStringsSep " " (
|
||||
builtins.map (name: "output ${name} power on") (builtins.attrNames cfg.output)
|
||||
);
|
||||
in
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ rec {
|
|||
inputs.nil.overlays.default
|
||||
inputs.pamedia.overlays.${system}
|
||||
inputs.rust-overlay.overlays.default
|
||||
# inputs.atuin.overlays.default
|
||||
inputs.atuin.overlays.default
|
||||
]
|
||||
++ nixpkgs.lib.optional (system == "aarch64-linux") (
|
||||
_final: super: { makeModulesClosure = x: super.makeModulesClosure (x // { allowMissing = true; }); }
|
||||
|
|
|
|||
|
|
@ -49,13 +49,13 @@ ffmpeg:
|
|||
go2rtc:
|
||||
streams:
|
||||
reolink:
|
||||
- rtsp://hass:{FRIGATE_DOORBELL_PASSWORD}@10.0.20.28/h264Preview_01_main
|
||||
# - http://10.0.20.28/flv?port=1935&app=bcs&stream=channel0_main.bcs&user=hass&password={FRIGATE_DOORBELL_PASSWORD}
|
||||
- rtsp://hass:{FRIGATE_DOORBELL_PASSWORD}@10.0.0.31/h264Preview_01_main
|
||||
# - http://10.0.0.31/flv?port=1935&app=bcs&stream=channel0_main.bcs&user=hass&password={FRIGATE_DOORBELL_PASSWORD}
|
||||
- ffmpeg:reolink#audio=opus
|
||||
reolink_sub:
|
||||
- rtsp://hass:{FRIGATE_DOORBELL_PASSWORD}@10.0.20.28/h264Preview_01_sub
|
||||
- rtsp://hass:{FRIGATE_DOORBELL_PASSWORD}@10.0.0.31/h264Preview_01_sub
|
||||
- ffmpeg:reolink_sub#audio=opus
|
||||
# - http://10.0.20.28/flv?port=1935&app=bcs&stream=channel0_sub.bcs&user=hass&password={FRIGATE_DOORBELL_PASSWORD}
|
||||
# - http://10.0.0.31/flv?port=1935&app=bcs&stream=channel0_sub.bcs&user=hass&password={FRIGATE_DOORBELL_PASSWORD}
|
||||
webrtc:
|
||||
candidates:
|
||||
- 10.0.0.205:8555
|
||||
|
|
|
|||
|
|
@ -1,4 +1,9 @@
|
|||
{ nixos-hardware, nix-ld-rs, ... }:
|
||||
{
|
||||
nixos-hardware,
|
||||
nix-ld-rs,
|
||||
attic,
|
||||
...
|
||||
}:
|
||||
{ pkgs, config, ... }:
|
||||
{
|
||||
imports = [
|
||||
|
|
@ -519,6 +524,28 @@
|
|||
in
|
||||
[ "L+ /opt/rocm - - - - ${rocmEnv}" ];
|
||||
|
||||
nix.settings.post-build-hook =
|
||||
let
|
||||
inherit (attic.packages.${pkgs.system}) attic-client;
|
||||
cachedPackagePatterns = builtins.concatStringsSep "|" [
|
||||
"mongodb"
|
||||
"qgis"
|
||||
];
|
||||
in
|
||||
pkgs.writeScript "upload-to-cache" ''
|
||||
set -eu
|
||||
set -f
|
||||
export IFS=' '
|
||||
|
||||
OUT_PATHS=$(echo -n ''${OUT_PATHS} | ${pkgs.gawk}/bin/awk 'BEGIN { RS = " "; ORS = " "; } $0 ~ /(${cachedPackagePatterns})/ { print $0 }')
|
||||
if [[ -z "''${OUT_PATHS}" ]]; then
|
||||
echo "No matching packages to upload"
|
||||
exit 0
|
||||
fi
|
||||
echo "Uploading paths to cache " ''${OUT_PATHS}
|
||||
exec ${attic-client}/bin/attic push main ''${OUT_PATHS}
|
||||
'';
|
||||
|
||||
sops.defaultSopsFile = ./secrets.yaml;
|
||||
sops.secrets = {
|
||||
ha_now_playing_token = {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
_final: prev: {
|
||||
final: prev: {
|
||||
backscrub = prev.pkgs.callPackage ../pkgs/backscrub {
|
||||
inherit (prev.pkgs)
|
||||
gcc
|
||||
|
|
@ -20,4 +20,37 @@ _final: prev: {
|
|||
|
||||
git-repo-go = prev.pkgs.callPackage ../pkgs/git-repo-go { };
|
||||
|
||||
# Temporary until nixos-unstable is fixed for Python 3.12
|
||||
python312 = prev.python312.override {
|
||||
packageOverrides = _finalPkgs: prevPkgs: {
|
||||
nose = prevPkgs.nose.overrideAttrs {
|
||||
patches = [
|
||||
(final.fetchpatch2 {
|
||||
url = "https://github.com/NixOS/nixpkgs/raw/599e471d78801f95ccd2c424a37e76ce177e50b9/pkgs/development/python-modules/nose/0001-nose-python-3.12-fixes.patch";
|
||||
hash = "sha256-aePOvO5+TJL4JzXywc7rEiYRzfdObSI9fg9Cfrp+e2o=";
|
||||
})
|
||||
];
|
||||
};
|
||||
wxpython = prevPkgs.wxpython.overrideAttrs {
|
||||
disabled = false;
|
||||
postPatch =
|
||||
let
|
||||
waf_2_0_25 = prev.fetchurl {
|
||||
url = "https://waf.io/waf-2.0.25";
|
||||
hash = "sha256-IRmc0iDM9gQ0Ez4f0quMjlIXw3mRmcgnIlQ5cNyOONU=";
|
||||
};
|
||||
in
|
||||
''
|
||||
cp ${waf_2_0_25} bin/waf-2.0.25
|
||||
chmod +x bin/waf-2.0.25
|
||||
substituteInPlace build.py \
|
||||
--replace-fail "wafCurrentVersion = '2.0.24'" "wafCurrentVersion = '2.0.25'" \
|
||||
--replace-fail "wafMD5 = '698f382cca34a08323670f34830325c4'" "wafMD5 = 'a4b1c34a03d594e5744f9e42f80d969d'" \
|
||||
--replace-fail "distutils.dep_util" "setuptools.modified"
|
||||
'';
|
||||
};
|
||||
python-hglib = prevPkgs.python-hglib.overrideAttrs { dontUseSetuptoolsCheck = "1"; };
|
||||
};
|
||||
};
|
||||
python312Packages = final.python312.pkgs;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,23 +0,0 @@
|
|||
diff --git a/hassbridge/playerinterface.py b/hassbridge/playerinterface.py
|
||||
index 34159c8..0c337c2 100644
|
||||
--- a/hassbridge/playerinterface.py
|
||||
+++ b/hassbridge/playerinterface.py
|
||||
@@ -279,7 +279,6 @@ class PlayerInterface(ServiceInterface):
|
||||
metadata["mpris:length"] = Variant("x", duration)
|
||||
|
||||
xesam_infos = {
|
||||
- "media_artist": "xesam:artist",
|
||||
"media_album_name": "xesam:album",
|
||||
"media_title": "xesam:title",
|
||||
}
|
||||
@@ -288,6 +287,10 @@ class PlayerInterface(ServiceInterface):
|
||||
if val is not None:
|
||||
metadata[xesam_key] = Variant("s", val)
|
||||
|
||||
+ artist = self.data.get("media_artist")
|
||||
+ if artist is not None:
|
||||
+ metadata["xesam:artist"] = Variant("as", [artist])
|
||||
+
|
||||
entity_picture = self.data.get("entity_picture")
|
||||
if entity_picture is not None:
|
||||
metadata["mpris:artUrl"] = Variant(
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
python3,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "hassbridge";
|
||||
version = "unstable-2024-08-10";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rytilahti";
|
||||
repo = "homeassistant-mpris-bridge";
|
||||
rev = "b62f87033be971d265e1e112dc9a3a38dc65bbbd";
|
||||
hash = "sha256-M68H806wQtsgqWeRH4j07dk1E5PzT7e0oEtsE6cl+c0=";
|
||||
};
|
||||
|
||||
patches = [ ./0001-fix-xesam-artist.patch ];
|
||||
|
||||
nativeBuildInputs = [ python3.pkgs.poetry-core ];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
anyio
|
||||
asyncclick
|
||||
dbus-next
|
||||
websockets
|
||||
];
|
||||
|
||||
# pythonImportsCheck = [ "homeassistant_mpris_bridge" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Control your Home Assistant media players from your desktop using MPRIS";
|
||||
homepage = "https://github.com/rytilahti/homeassistant-mpris-bridge";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ ];
|
||||
mainProgram = "hassbridge";
|
||||
};
|
||||
}
|
||||
|
|
@ -183,7 +183,7 @@ in
|
|||
easyeffects
|
||||
element-desktop
|
||||
fd
|
||||
ffmpeg-full
|
||||
ffmpeg_5-full
|
||||
hashcat
|
||||
helvum
|
||||
imagemagick
|
||||
|
|
@ -210,7 +210,6 @@ in
|
|||
(noson.overrideAttrs (_: {
|
||||
qtWrapperArgs = "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.libpulseaudio ]}";
|
||||
}))
|
||||
orca-slicer
|
||||
pamedia
|
||||
pass
|
||||
pavucontrol
|
||||
|
|
|
|||
|
|
@ -223,7 +223,7 @@ in
|
|||
doggo
|
||||
easyeffects
|
||||
fd
|
||||
ffmpeg-full
|
||||
ffmpeg_5-full
|
||||
icemon
|
||||
imagemagick
|
||||
(imv.override {
|
||||
|
|
|
|||
Loading…
Reference in a new issue