Compare commits
17 commits
0751712fbb
...
c34672b67d
| Author | SHA1 | Date | |
|---|---|---|---|
 chayleaf
|
c34672b67d
|
||
|
chayleaf
|
3d58f94812
|
||
|
chayleaf
|
e4ae7fa437
|
||
|
chayleaf
|
e4cdbac65d
|
||
|
chayleaf
|
625e3dce4f
|
||
|
chayleaf
|
d3d3580f81
|
||
|
chayleaf
|
09e9712488
|
||
|
chayleaf
|
e789ee1cb3
|
||
|
chayleaf
|
b8b3b7fbff
|
||
|
chayleaf
|
52e3509a4a
|
||
|
chayleaf
|
99cd2240a5
|
||
|
chayleaf
|
9a9991acdc
|
||
|
chayleaf
|
91182c8e3d
|
||
|
chayleaf
|
7e49323705
|
||
|
chayleaf
|
e13cd51c3b
|
||
|
chayleaf
|
88c2206fb7
|
||
|
chayleaf
|
992c4b4acb
|
flake.lockflake.nix
home
pkgs
system
hosts
modules
361
flake.lock
361
flake.lock
|
|
@ -65,21 +65,20 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722902027,
|
||||
"narHash": "sha256-STgis1RRrrerOrI/l7bBeJS8HR3ZHlsAhZ4NXO1eIi0=",
|
||||
"owner": "qowoz",
|
||||
"lastModified": 1730945195,
|
||||
"narHash": "sha256-+ZZZOjLROeG10TC7UacIrVxZB3S0VAHCZ2ObRovbx1E=",
|
||||
"owner": "nix-community",
|
||||
"repo": "buildbot-nix",
|
||||
"rev": "f43d4ee9e3325a486928ddc3d04956844b3baf56",
|
||||
"rev": "85c0b246cc96cc244e4d9889a97c4991c4593dc3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "qowoz",
|
||||
"ref": "skipped-build-workers",
|
||||
"owner": "nix-community",
|
||||
"repo": "buildbot-nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"comin": {
|
||||
"cgroup-exporter": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nix-community-infra",
|
||||
|
|
@ -87,17 +86,16 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1714766748,
|
||||
"narHash": "sha256-//fP25eh1f9eA+0TEgWqusWjv9SuKh8rIF1ZJQNL1jo=",
|
||||
"owner": "nlewo",
|
||||
"repo": "comin",
|
||||
"rev": "d3658c452024824235de2355ac3e156b10c3eaaf",
|
||||
"lastModified": 1727276091,
|
||||
"narHash": "sha256-CG8XCZemSAs53VKU9VSARprQWI+0mj/RmTsp2WMJr6s=",
|
||||
"owner": "arianvp",
|
||||
"repo": "cgroup-exporter",
|
||||
"rev": "816bfe1bc881ae43cf392949c47d8516a48fceeb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nlewo",
|
||||
"repo": "comin",
|
||||
"rev": "d3658c452024824235de2355ac3e156b10c3eaaf",
|
||||
"owner": "arianvp",
|
||||
"repo": "cgroup-exporter",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
|
|
@ -110,11 +108,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1718998007,
|
||||
"narHash": "sha256-2ByOTMmdtoD5CDVq5O/VFdz2u9xLtk5z3NpFsWOmIyA=",
|
||||
"lastModified": 1732733541,
|
||||
"narHash": "sha256-4kMy/AfcSqoDWGGWOPf2J7GxpXi2ikg9Z+WnPCsfpiA=",
|
||||
"owner": "chayleaf",
|
||||
"repo": "coop-fd",
|
||||
"rev": "f71ac2a8a62cc53896a2c0d6649c1451e86f8135",
|
||||
"rev": "25ad04f7a813cb0f2c4edb349656065119b5cb4b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -194,11 +192,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723426710,
|
||||
"narHash": "sha256-yrS9al6l3fYfFfvovnyBWnyELDQOdfKyai4K/jKgoBw=",
|
||||
"lastModified": 1731895210,
|
||||
"narHash": "sha256-z76Q/OXLxO/RxMII3fIt/TG665DANiE2lVvnolK2lXk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "0d510fe40b56ed74907a021d7e1ffd0042592914",
|
||||
"rev": "639d1520df9417ca2761536c3072688569e83c80",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -307,11 +305,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722555600,
|
||||
"narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
|
||||
"lastModified": 1730504689,
|
||||
"narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
|
||||
"rev": "506278e768c2a08bec68eb62932193e341f55c90",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -325,11 +323,11 @@
|
|||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722555600,
|
||||
"narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
|
||||
"lastModified": 1730504689,
|
||||
"narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
|
||||
"rev": "506278e768c2a08bec68eb62932193e341f55c90",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -346,11 +344,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1727826117,
|
||||
"narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
|
||||
"lastModified": 1730504689,
|
||||
"narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
|
||||
"rev": "506278e768c2a08bec68eb62932193e341f55c90",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -364,11 +362,11 @@
|
|||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726560853,
|
||||
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -412,11 +410,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728092656,
|
||||
"narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=",
|
||||
"lastModified": 1731363552,
|
||||
"narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "1211305a5b237771e13fcca0c51e60ad47326a9a",
|
||||
"rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -447,6 +445,31 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"hercules-ci-effects": {
|
||||
"inputs": {
|
||||
"flake-parts": [
|
||||
"nix-community-infra",
|
||||
"flake-parts"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nix-community-infra",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730903510,
|
||||
"narHash": "sha256-mnynlrPeiW0nUQ8KGZHb3WyxAxA3Ye/BH8gMjdoKP6E=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "hercules-ci-effects",
|
||||
"rev": "b89ac4d66d618b915b1f0a408e2775fe3821d141",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "hercules-ci-effects",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -454,15 +477,16 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723599998,
|
||||
"narHash": "sha256-9a/Dq7WUhP35WrpqXUpDBsnKoKASsYB8FQjIeVlghm4=",
|
||||
"lastModified": 1731943274,
|
||||
"narHash": "sha256-EpVzPygqBuyU3CDNl9bnBhHkz/PTLM4UsIfB5A7QK/k=",
|
||||
"owner": "chayleaf",
|
||||
"repo": "home-manager",
|
||||
"rev": "c29f1c444bbfe3cfa22e347923fe04245030bcda",
|
||||
"rev": "7f95891341303b2b40ce8dc6f931b67071576bd0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "chayleaf",
|
||||
"ref": "ci",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -475,11 +499,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728337164,
|
||||
"narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=",
|
||||
"lastModified": 1731832479,
|
||||
"narHash": "sha256-icDDuYwJ0avTMZTxe1qyU/Baht5JOqw4pb5mWpR+hT0=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "038630363e7de57c36c417fd2f5d7c14773403e4",
|
||||
"rev": "5056a1cf0ce7c2a08ab50713b6c4af77975f6111",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -488,13 +512,30 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"hydra": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1730160474,
|
||||
"narHash": "sha256-uyR+7f+rV0w1UMRQ92I5Smk7pq3/PvXH5c1ozaa/duI=",
|
||||
"owner": "qowoz",
|
||||
"repo": "hydra",
|
||||
"rev": "1c2e3b8c21ed75ed1c8c177d260e2b3b2c66ccf9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "qowoz",
|
||||
"ref": "community",
|
||||
"repo": "hydra",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"impermanence": {
|
||||
"locked": {
|
||||
"lastModified": 1719091691,
|
||||
"narHash": "sha256-AxaLX5cBEcGtE02PeGsfscSb/fWMnyS7zMWBXQWDKbE=",
|
||||
"lastModified": 1731242966,
|
||||
"narHash": "sha256-B3C3JLbGw0FtLSWCjBxU961gLNv+BOOBC6WvstKLYMw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "impermanence",
|
||||
"rev": "23c1f06316b67cb5dabdfe2973da3785cfe9c34a",
|
||||
"rev": "3ed3f0eaae9fcc0a8331e77e9319c8a4abd8a71a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -503,6 +544,49 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"ixx": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"nixvim",
|
||||
"nuschtosSearch",
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixvim",
|
||||
"nuschtosSearch",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729958008,
|
||||
"narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
|
||||
"owner": "NuschtOS",
|
||||
"repo": "ixx",
|
||||
"rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NuschtOS",
|
||||
"ref": "v0.0.6",
|
||||
"repo": "ixx",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"lite-config": {
|
||||
"locked": {
|
||||
"lastModified": 1723691425,
|
||||
"narHash": "sha256-xOroQo/+CAtocvJQsGPE5ukr1Btp72xlcWPB4tBZp6M=",
|
||||
"owner": "yelite",
|
||||
"repo": "lite-config",
|
||||
"rev": "34357ad12ad0a66b2de55a2457159bda36c71a06",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "yelite",
|
||||
"repo": "lite-config",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"mobile-nixos": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -524,12 +608,17 @@
|
|||
"inputs": {
|
||||
"agenix": "agenix",
|
||||
"buildbot-nix": "buildbot-nix",
|
||||
"comin": "comin",
|
||||
"cgroup-exporter": "cgroup-exporter",
|
||||
"disko": "disko",
|
||||
"empty": "empty",
|
||||
"flake-compat": "flake-compat_3",
|
||||
"flake-parts": "flake-parts",
|
||||
"hercules-ci-effects": "hercules-ci-effects",
|
||||
"hydra": "hydra",
|
||||
"lite-config": "lite-config",
|
||||
"nix-darwin": "nix-darwin",
|
||||
"nix-index-database": "nix-index-database",
|
||||
"nixos-facter-modules": "nixos-facter-modules",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs-update": "nixpkgs-update",
|
||||
"nixpkgs-update-github-releases": "nixpkgs-update-github-releases",
|
||||
|
|
@ -540,11 +629,11 @@
|
|||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723586765,
|
||||
"narHash": "sha256-2YtIQm1DOph5fXkEySRdKAYSiWJK8ztc1NxoUnjvfSs=",
|
||||
"lastModified": 1731900458,
|
||||
"narHash": "sha256-K4iJLt9yX0QjR2yvBkfN0fxO+VQzq3fmzSiIK0FfnZA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "infra",
|
||||
"rev": "177e5a2fbfeb70bbf86d7ca7efdfd5d1870678db",
|
||||
"rev": "de95074435a87de6879e3522569a423cd2032692",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -561,11 +650,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722924007,
|
||||
"narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=",
|
||||
"lastModified": 1731885500,
|
||||
"narHash": "sha256-ZrztYfSOS33J+ewq5alBOSdnIyZ0/sr1iy7FyBe9zIg=",
|
||||
"owner": "LnL7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "91010a5613ffd7ee23ee9263213157a1c422b705",
|
||||
"rev": "c60b5c924c6188a0b3ca2e139ead3d0f92ae5db5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -582,11 +671,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728385805,
|
||||
"narHash": "sha256-mUd38b0vhB7yzgAjNOaFz7VY9xIVzlbn3P2wjGBcVV0=",
|
||||
"lastModified": 1731809072,
|
||||
"narHash": "sha256-pOsDJQR0imnFLfpvTmRpHcP0tflyxtP/QIzokrKSP8U=",
|
||||
"owner": "lnl7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "48b50b3b137be5cfb9f4d006835ce7c3fe558ccc",
|
||||
"rev": "34588d57cfc41c6953c54c93b6b685cab3b548ee",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -604,11 +693,11 @@
|
|||
"umu": "umu"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723425928,
|
||||
"narHash": "sha256-BFj0H0h3+hTCTsHTMCzmO7hQL3ym2MTgIdQe1SN1wPw=",
|
||||
"lastModified": 1731925304,
|
||||
"narHash": "sha256-FeUIzD9f5Z8OMkogeEMaVLIhawGdmOhKJ4VVpdycOeA=",
|
||||
"owner": "fufexan",
|
||||
"repo": "nix-gaming",
|
||||
"rev": "cd19f284c40ce697db66314d0b7d29e41d47eb6b",
|
||||
"rev": "d589673486d8a5c1c6cbc3c0e1c077200da7e085",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -620,15 +709,16 @@
|
|||
"nix-index-database": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nix-community-infra",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723352546,
|
||||
"narHash": "sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8=",
|
||||
"lastModified": 1731814505,
|
||||
"narHash": "sha256-l9ryrx1Twh08a+gxrMGM9O/aZKEimZfa6sZVyPCImgI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "ec78079a904d7d55e81a0468d764d0fffb50ac06",
|
||||
"rev": "bdba246946fb079b87b4cada4df9b1cdf1c06132",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -637,13 +727,48 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-index-database_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731814505,
|
||||
"narHash": "sha256-l9ryrx1Twh08a+gxrMGM9O/aZKEimZfa6sZVyPCImgI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "bdba246946fb079b87b4cada4df9b1cdf1c06132",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixos-facter-modules": {
|
||||
"locked": {
|
||||
"lastModified": 1731843871,
|
||||
"narHash": "sha256-aIy8m4jjr/BFXzniNzoH16sF7HEFV/01/5b3FhtUHrw=",
|
||||
"owner": "numtide",
|
||||
"repo": "nixos-facter-modules",
|
||||
"rev": "5a1c2a28589e34f8a44d46dd1909cfacf928cb1a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "nixos-facter-modules",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1723310128,
|
||||
"narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=",
|
||||
"lastModified": 1731797098,
|
||||
"narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf",
|
||||
"rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -699,11 +824,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1723316219,
|
||||
"narHash": "sha256-2B9qh8QBvw3kV/8cHc7ZJcrbVsRwP8wKjkwPXTSz76Y=",
|
||||
"lastModified": 1731875774,
|
||||
"narHash": "sha256-HIl3lTqMVu/RXx9Gav46qai6+OV9Gu3cQFbvZSOvjJI=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "bef98989a27429e1cb9e3d9c25701ba2da742af2",
|
||||
"rev": "6c33d760f16f52ffc0dd8538b9239808d96ec699",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -731,14 +856,14 @@
|
|||
},
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"lastModified": 1722555339,
|
||||
"narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=",
|
||||
"lastModified": 1730504152,
|
||||
"narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz"
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
|
||||
}
|
||||
},
|
||||
"nixpkgs-update": {
|
||||
|
|
@ -758,11 +883,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722969327,
|
||||
"narHash": "sha256-P8g6kDgZYMwxqmp8FRRZOwwBjkT4ILifvXV0fOz9ofY=",
|
||||
"lastModified": 1730338630,
|
||||
"narHash": "sha256-rGp0I9m3/nDV70nRXvdCv2QiAGPOaRm92rISXDxNUJM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs-update",
|
||||
"rev": "503f7b0d94b6eb780a51823972e6ab0204b0a137",
|
||||
"rev": "525c2e488ad26cd46878fd93337521bf42e598a9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -803,26 +928,27 @@
|
|||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1723686439,
|
||||
"narHash": "sha256-sgHQqIDtHQUivF5vqa+k4iwbc/cx8F6x6IvXTlNd4Pg=",
|
||||
"lastModified": 1731943205,
|
||||
"narHash": "sha256-PVYJX1oCgzLyblKeOJ5YVzQBlLyq3vl8xhk92vbxwYs=",
|
||||
"owner": "chayleaf",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "43a0d4fefbfb1a9bc2f109769610038fcfae5ea0",
|
||||
"rev": "cb19b1decd65da83af22390f5ccbb2338b713963",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "chayleaf",
|
||||
"ref": "ci",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1728241625,
|
||||
"narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=",
|
||||
"lastModified": 1731676054,
|
||||
"narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1",
|
||||
"rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -845,11 +971,11 @@
|
|||
"treefmt-nix": "treefmt-nix_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728485062,
|
||||
"narHash": "sha256-+2e9hAM2GVDF3gywdQI/OA7s4f0Z9rvFuiVxePI41QM=",
|
||||
"lastModified": 1731920852,
|
||||
"narHash": "sha256-TczdWFVNDYS8YjVjiUmzOHbBn52keL4ECygrWrBtIgs=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixvim",
|
||||
"rev": "61ec39764fbe1e4f21cf801ea7b9209d527c8135",
|
||||
"rev": "f4c910dd82eb6e811ba171bc923087b7ecfb321c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -885,11 +1011,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1700483422,
|
||||
"narHash": "sha256-ni6niOmObnG9EVGtaeT1I7ULz5+EkEewGTJVeFuWNuc=",
|
||||
"lastModified": 1726769859,
|
||||
"narHash": "sha256-sHKPDv3ihpoLnX076og9U3fAYcKoHIjKysvjwJ4+oyc=",
|
||||
"owner": "chayleaf",
|
||||
"repo": "notnft",
|
||||
"rev": "b3e6a023a13a81d70a6a30997e2f1aaf36feafb3",
|
||||
"rev": "2ca0b2fdfdd6780c9d4cab24afedefdd33ef8e08",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -900,11 +1026,11 @@
|
|||
},
|
||||
"nur": {
|
||||
"locked": {
|
||||
"lastModified": 1723664702,
|
||||
"narHash": "sha256-ErRJ3oUHFOzUXoDAzws/h5u7c6dCExETjmm5uIFL/QY=",
|
||||
"lastModified": 1731941414,
|
||||
"narHash": "sha256-2Xf90oIkzvOjzZBIgLxga6DqidvB6CSODE5+DODfLeI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "7bcbb0362c92f230ba4a2c5ad227e04f84fc1ce0",
|
||||
"rev": "23a30a846dc89a997f42f2d7e64d6f38564014ae",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -921,11 +1047,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1716222588,
|
||||
"narHash": "sha256-gbyIIHsJpk3V8tnsGP8RZpgc0NM/R9QT4zk4SObRDas=",
|
||||
"lastModified": 1728318238,
|
||||
"narHash": "sha256-iOsIle2mcFaztlAvrPzuiCkdklfuVA3k1JccqFgB76Q=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nur-update",
|
||||
"rev": "a54c4c1b0ec643ff36b3c9deecb5fefce57dcabc",
|
||||
"rev": "fd8ee17f458880ca4d49965348e144b6fc131e14",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -937,17 +1063,18 @@
|
|||
"nuschtosSearch": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"ixx": "ixx",
|
||||
"nixpkgs": [
|
||||
"nixvim",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728423244,
|
||||
"narHash": "sha256-+YwNsyIFj3dXyLVQd1ry4pCNmtOpbceKUrkNS8wp9Ho=",
|
||||
"lastModified": 1731582522,
|
||||
"narHash": "sha256-1w6aM4bG5cl2E4jHLPnMKkrUO4tY1jUX1NI6/RwJN7Y=",
|
||||
"owner": "NuschtOS",
|
||||
"repo": "search",
|
||||
"rev": "f276cc3b391493ba3a8b30170776860f9520b7fa",
|
||||
"rev": "13300b2297c51368e0892c3ebe220f688014fe15",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -986,7 +1113,7 @@
|
|||
"mobile-nixos": "mobile-nixos",
|
||||
"nix-community-infra": "nix-community-infra",
|
||||
"nix-gaming": "nix-gaming",
|
||||
"nix-index-database": "nix-index-database",
|
||||
"nix-index-database": "nix-index-database_2",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixos-mailserver": "nixos-mailserver",
|
||||
"nixos-router": "nixos-router",
|
||||
|
|
@ -1008,11 +1135,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723602049,
|
||||
"narHash": "sha256-Z/noCSn9WPkv7O77dWKLcBxe4Ub4bWyNzsL5JhjaQfw=",
|
||||
"lastModified": 1731897198,
|
||||
"narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "ea0bf33a11a26a62c60123c49d96011da396602c",
|
||||
"rev": "0be641045af6d8666c11c2c40e45ffc9667839b5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1026,18 +1153,14 @@
|
|||
"nixpkgs": [
|
||||
"nix-community-infra",
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixpkgs-stable": [
|
||||
"nix-community-infra",
|
||||
"empty"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722897572,
|
||||
"narHash": "sha256-3m/iyyjCdRBF8xyehf59QlckIcmShyTesymSb+N4Ap4=",
|
||||
"lastModified": 1731862312,
|
||||
"narHash": "sha256-NVUTFxKrJp/hjehlF1IvkPnlRYg/O9HFVutbxOM8zNM=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "8ae477955dfd9cbf5fa4eb82a8db8ddbb94e79d9",
|
||||
"rev": "472741cf3fee089241ac9ea705bb2b9e0bfa2978",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1054,11 +1177,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723423676,
|
||||
"narHash": "sha256-E+DdXV2cFj77vU35cVNoEEE5YueE075HXiJLXwAxJ0k=",
|
||||
"lastModified": 1731891382,
|
||||
"narHash": "sha256-rRREuHCR3k6/g+F9sToP2Cf05qVlWQbl2c7dRRhcqTI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "srvos",
|
||||
"rev": "a7cc81cd76c4c07bb7db01b731199ecd4be17305",
|
||||
"rev": "e26a814735f50034e35dff637efad2d502698d09",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1120,11 +1243,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723402464,
|
||||
"narHash": "sha256-xjunKUFQs9D7u0TpVoXhrRYb4tbVkutRoFUHj0lEydE=",
|
||||
"lastModified": 1730321837,
|
||||
"narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "c9f97032be6816fa234f24803b8ae79dc7753a91",
|
||||
"rev": "746901bb8dba96d154b66492a29f5db0693dbfcc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1141,11 +1264,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1727984844,
|
||||
"narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=",
|
||||
"lastModified": 1730321837,
|
||||
"narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64",
|
||||
"rev": "746901bb8dba96d154b66492a29f5db0693dbfcc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1163,11 +1286,11 @@
|
|||
},
|
||||
"locked": {
|
||||
"dir": "packaging/nix",
|
||||
"lastModified": 1723319758,
|
||||
"narHash": "sha256-4WYwxNzH/95Vj0IqR2xh4gyiSn8H9bGnBECFWy4vjIk=",
|
||||
"lastModified": 1731556042,
|
||||
"narHash": "sha256-eUFmLbf06Dph//IbB9KsJio3dJNADt+EhcfNFXjiJjU=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "74656e9da4008f75f3b1d136dbaf1172bf6c232f",
|
||||
"revCount": 697,
|
||||
"rev": "66a1088194bb13c2d86d2c0af316b280a7235640",
|
||||
"revCount": 839,
|
||||
"submodules": true,
|
||||
"type": "git",
|
||||
"url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
inputs = {
|
||||
nix-community-infra.url = "github:nix-community/infra";
|
||||
nixpkgs-kernel.url = "github:NixOS/nixpkgs/a58bc8ad779655e790115244571758e8de055e3d";
|
||||
nixpkgs.url = "github:chayleaf/nixpkgs";
|
||||
nixpkgs.url = "github:chayleaf/nixpkgs/ci";
|
||||
nixvim.url = "github:nix-community/nixvim";
|
||||
nixos-hardware.url = "github:NixOS/nixos-hardware";
|
||||
nix-index-database = {
|
||||
|
|
@ -30,7 +30,7 @@
|
|||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
home-manager = {
|
||||
url = "github:chayleaf/home-manager";
|
||||
url = "github:chayleaf/home-manager/ci";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
nix-gaming = {
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@
|
|||
"steam"
|
||||
"steam-original"
|
||||
"steam-runtime"
|
||||
"steam-unwrapped"
|
||||
"steamcmd"
|
||||
"osu-lazer-bin"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -197,7 +197,7 @@ config = lib.mkMerge [
|
|||
};
|
||||
programs.yt-dlp.enable = true;
|
||||
home.packages = with pkgs; [
|
||||
qt5ct qgnomeplatform
|
||||
qgnomeplatform
|
||||
qbittorrent mumble
|
||||
keepassxc nheko nextcloud-client
|
||||
# cli tools
|
||||
|
|
@ -281,6 +281,10 @@ config = lib.mkMerge [
|
|||
};
|
||||
};
|
||||
|
||||
nixpkgs.config.permittedInsecurePackages = [
|
||||
"olm-3.2.16"
|
||||
];
|
||||
|
||||
# some packages require a pointer theme
|
||||
home.pointerCursor.gtk.enable = true;
|
||||
home.pointerCursor.package = pkgs.vanilla-dmz;
|
||||
|
|
@ -294,6 +298,6 @@ config = lib.mkMerge [
|
|||
noto-fonts-emoji noto-fonts-extra
|
||||
(nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; })
|
||||
]
|
||||
++ lib.optional config.services.kdeconnect.enable kdeconnect;
|
||||
++ lib.optional config.services.kdeconnect.enable plasma5Packages.kdeconnect-kde;
|
||||
}];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -238,7 +238,7 @@
|
|||
config = (
|
||||
let lsp = name: builtins.seq
|
||||
# ensure an lsp exists (otherwise lspconfig will still create an empty config for some reason)
|
||||
(REQ "lspconfig.server_configurations.${name}")
|
||||
(REQ "lspconfig.configs.${name}")
|
||||
# metatables, son! they harden in response to physical trauma
|
||||
(REQ' (PROP (require "lspconfig") name));
|
||||
in [
|
||||
|
|
@ -347,7 +347,7 @@
|
|||
} // args);
|
||||
in on_attach_rust: [
|
||||
# (vim.lsp.set_log_level "debug")
|
||||
# see https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md
|
||||
# see https://github.com/neovim/nvim-lspconfig/blob/master/doc/configs.md
|
||||
(lib.mapAttrsToList setupLsp {
|
||||
bashls = { };
|
||||
clangd = { };
|
||||
|
|
@ -361,7 +361,7 @@
|
|||
svelte = { };
|
||||
html = { };
|
||||
cssls = { };
|
||||
tsserver = { };
|
||||
ts_ls = { };
|
||||
jsonls = { };
|
||||
nil_ls = {
|
||||
settings.nil = {
|
||||
|
|
|
|||
|
|
@ -22,24 +22,24 @@
|
|||
"pinned": false,
|
||||
"src": {
|
||||
"name": null,
|
||||
"sha256": "sha256-vpr4DVWI7TZWb+roijpX5kJRPOJT4wZhT/ZnRrkgZKI=",
|
||||
"sha256": "sha256-jDWZ4m5aUALhs/EhGwrFa/3dbrLE3Lrn2BAnGC7TbIk=",
|
||||
"type": "url",
|
||||
"url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton9-11/GE-Proton9-11.tar.gz"
|
||||
"url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton9-20/GE-Proton9-20.tar.gz"
|
||||
},
|
||||
"version": "GE-Proton9-11"
|
||||
"version": "GE-Proton9-20"
|
||||
},
|
||||
"searxng": {
|
||||
"cargoLocks": null,
|
||||
"date": "2024-08-09",
|
||||
"date": "2024-11-17",
|
||||
"extract": null,
|
||||
"name": "searxng",
|
||||
"passthru": null,
|
||||
"pinned": false,
|
||||
"src": {
|
||||
"sha256": "sha256-2QetT4xLlyKAC/eiIhShYRMRwFU9dJm6Ah5wS84Rgf8=",
|
||||
"sha256": "sha256-dXALuiPCzK0Az64Fj9ygsNFoPKf0oJ2LyZDeg00Bfyo=",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/searxng/searxng/archive/f1c05e7c16e59a8d5d98640bc057958ea268cddf.tar.gz"
|
||||
"url": "https://github.com/searxng/searxng/archive/10d3af84b833ab2f2d1095efa3a7ba240ffb32fc.tar.gz"
|
||||
},
|
||||
"version": "f1c05e7c16e59a8d5d98640bc057958ea268cddf"
|
||||
"version": "10d3af84b833ab2f2d1095efa3a7ba240ffb32fc"
|
||||
}
|
||||
}
|
||||
|
|
@ -12,19 +12,19 @@
|
|||
};
|
||||
proton-ge = {
|
||||
pname = "proton-ge";
|
||||
version = "GE-Proton9-11";
|
||||
version = "GE-Proton9-20";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton9-11/GE-Proton9-11.tar.gz";
|
||||
sha256 = "sha256-vpr4DVWI7TZWb+roijpX5kJRPOJT4wZhT/ZnRrkgZKI=";
|
||||
url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton9-20/GE-Proton9-20.tar.gz";
|
||||
sha256 = "sha256-jDWZ4m5aUALhs/EhGwrFa/3dbrLE3Lrn2BAnGC7TbIk=";
|
||||
};
|
||||
};
|
||||
searxng = {
|
||||
pname = "searxng";
|
||||
version = "f1c05e7c16e59a8d5d98640bc057958ea268cddf";
|
||||
version = "10d3af84b833ab2f2d1095efa3a7ba240ffb32fc";
|
||||
src = fetchTarball {
|
||||
url = "https://github.com/searxng/searxng/archive/f1c05e7c16e59a8d5d98640bc057958ea268cddf.tar.gz";
|
||||
sha256 = "sha256-2QetT4xLlyKAC/eiIhShYRMRwFU9dJm6Ah5wS84Rgf8=";
|
||||
url = "https://github.com/searxng/searxng/archive/10d3af84b833ab2f2d1095efa3a7ba240ffb32fc.tar.gz";
|
||||
sha256 = "sha256-dXALuiPCzK0Az64Fj9ygsNFoPKf0oJ2LyZDeg00Bfyo=";
|
||||
};
|
||||
date = "2024-08-09";
|
||||
date = "2024-11-17";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,13 +23,13 @@
|
|||
};
|
||||
"rikaitan" = buildFirefoxXpiAddon {
|
||||
pname = "rikaitan";
|
||||
version = "24.7.31.0";
|
||||
version = "24.11.4.1";
|
||||
addonId = "tatsu@autistici.org";
|
||||
url = "https://addons.mozilla.org/firefox/downloads/file/4337076/rikaitan-24.7.31.0.xpi";
|
||||
sha256 = "be4b8484221aa8eb4348d1880de988d6f19f3b9ca53deda3fca657dfa2ce3108";
|
||||
url = "https://addons.mozilla.org/firefox/downloads/file/4387983/rikaitan-24.11.4.1.xpi";
|
||||
sha256 = "583ce8ff3fc39e7bed139540a2c1b00871f429dd6c165fe9b181a5b095347549";
|
||||
meta = with lib;
|
||||
{
|
||||
homepage = "https://github.com/Ajatt-Tools/rikaitan";
|
||||
homepage = "https://rikaitan.github.io/";
|
||||
description = "Japanese dictionary with Anki integration and flashcard creation support.";
|
||||
license = licenses.gpl3;
|
||||
mozPermissions = [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ pkgs, ... }:
|
||||
|
||||
let
|
||||
unpatchedNixForNixPlugins = pkgs.nixVersions.nix_2_18;
|
||||
unpatchedNixForNixPlugins = pkgs.nixVersions.nix_2_24;
|
||||
nixForNixPlugins = unpatchedNixForNixPlugins.overrideAttrs (old: {
|
||||
patches = (old.patches or [ ]) ++ [ ./rename-nix-plugin-files.patch ];
|
||||
# some tests fail on bcachefs due to insufficient permissions
|
||||
|
|
@ -20,15 +20,15 @@ in {
|
|||
})
|
||||
];
|
||||
});*/
|
||||
hydra_unstable = (pkgs.hydra_unstable.override {
|
||||
hydra = (pkgs.hydra.override {
|
||||
nix = nixForNixPlugins;
|
||||
}).overrideAttrs (old: {
|
||||
version = "2023-12-01";
|
||||
# version = "2023-12-01";
|
||||
# who cares about tests amirite
|
||||
doCheck = false;
|
||||
src = old.src.override {
|
||||
rev = "4d1c8505120961f10897b8fe9a070d4e193c9a13";
|
||||
hash = "sha256-vXTuE83GL15mgZHegbllVAsVdDFcWWSayPfZxTJN5ys=";
|
||||
};
|
||||
# src = old.src.override {
|
||||
# rev = "4d1c8505120961f10897b8fe9a070d4e193c9a13";
|
||||
# hash = "sha256-vXTuE83GL15mgZHegbllVAsVdDFcWWSayPfZxTJN5ys=";
|
||||
# };
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,26 @@
|
|||
diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh
|
||||
index dba7d78ef..f102f08f9 100644
|
||||
--- a/src/libstore/globals.hh
|
||||
+++ b/src/libstore/globals.hh
|
||||
@@ -959,7 +959,7 @@ public:
|
||||
"Number of seconds between checking free disk space."};
|
||||
|
||||
diff --git a/src/libmain/plugin.cc b/src/libmain/plugin.cc
|
||||
index ccfd7f900..c1b737ad6 100644
|
||||
--- a/src/libmain/plugin.cc
|
||||
+++ b/src/libmain/plugin.cc
|
||||
@@ -40,7 +40,7 @@ struct PluginSettings : Config
|
||||
PluginFilesSetting pluginFiles{
|
||||
- this, {}, "plugin-files",
|
||||
+ this, {}, "plugin-files-2",
|
||||
this,
|
||||
{},
|
||||
- "plugin-files",
|
||||
+ "plugin-files-2",
|
||||
R"(
|
||||
A list of plugin files to be loaded by Nix. Each of these files will
|
||||
be dlopened by Nix, allowing them to affect execution through static
|
||||
be dlopened by Nix. If they contain the symbol `nix_plugin_entry()`,
|
||||
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
|
||||
index 555936c18..26db2b7cb 100644
|
||||
--- a/src/libstore/remote-store.cc
|
||||
+++ b/src/libstore/remote-store.cc
|
||||
@@ -134,7 +134,7 @@ void RemoteStore::setOptions(Connection & conn)
|
||||
overrides.erase(settings.useSubstitutes.name);
|
||||
overrides.erase(loggerSettings.showTrace.name);
|
||||
overrides.erase(experimentalFeatureSettings.experimentalFeatures.name);
|
||||
- overrides.erase("plugin-files");
|
||||
+ overrides.erase("plugin-files-2");
|
||||
conn.to << overrides.size();
|
||||
for (auto & i : overrides)
|
||||
conn.to << i.first << i.second.value;
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
, libsodium
|
||||
, libxkbcommon
|
||||
, wayland
|
||||
, wayland-scanner
|
||||
, wayland-protocols
|
||||
}:
|
||||
|
||||
|
|
@ -29,7 +30,7 @@ stdenv.mkDerivation {
|
|||
ninja
|
||||
pkg-config
|
||||
scdoc
|
||||
wayland
|
||||
wayland-scanner
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -51,6 +51,7 @@
|
|||
|
||||
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
|
||||
"steam-original"
|
||||
"steam-unwrapped"
|
||||
];
|
||||
hardware = {
|
||||
opentabletdriver.enable = true;
|
||||
|
|
|
|||
|
|
@ -60,6 +60,10 @@
|
|||
chatty
|
||||
];
|
||||
|
||||
nixpkgs.config.permittedInsecurePackages = [
|
||||
"olm-3.2.16"
|
||||
];
|
||||
|
||||
programs.sway.enable = true;
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -19,7 +19,8 @@ in {
|
|||
};
|
||||
unbound = {
|
||||
enable = true;
|
||||
controlInterface = "/run/unbound/unbound.ctl";
|
||||
# controlInterface = "/run/unbound/unbound.ctl";
|
||||
unbound.host = "unix:///run/unbound/unbound.ctl";
|
||||
listenAddress = netAddresses.lan4;
|
||||
group = config.services.unbound.group;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -283,13 +283,7 @@ in {
|
|||
job_name = "local_medium_freq";
|
||||
scrape_interval = "15m";
|
||||
static_configs = [ {
|
||||
targets = [
|
||||
"127.0.0.1:9548"
|
||||
"127.0.0.1:9198"
|
||||
(let cfg = config.services.matrix-appservice-discord.settings.metrics;
|
||||
in "${lib.quoteListenAddr cfg.host}:${toString cfg.port}")
|
||||
config.services.matrix-sliding-sync.settings.SYNCV3_PROM
|
||||
];
|
||||
targets = [ "127.0.0.1:9548" "127.0.0.1:9198" "127.0.0.1:9173" ];
|
||||
labels.machine = "server";
|
||||
} ];
|
||||
}
|
||||
|
|
@ -373,9 +367,6 @@ in {
|
|||
host = "127.0.0.1";
|
||||
port = 9173;
|
||||
};
|
||||
services.matrix-sliding-sync = {
|
||||
settings.SYNCV3_PROM = "[::]:8011";
|
||||
};
|
||||
services.matrix-synapse.settings = {
|
||||
enable_metrics = true;
|
||||
federation_metrics_domains = [ "matrix.org" ];
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ in {
|
|||
http-host = "127.0.0.1";
|
||||
http-port = 5739;
|
||||
https-port = 5740;
|
||||
proxy = "edge";
|
||||
proxy-headers = "xforwarded";
|
||||
};
|
||||
};
|
||||
services.nginx.virtualHosts."keycloak.${cfg.domainName}" = {
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ let
|
|||
matrixClientJson = {
|
||||
"m.homeserver".base_url = "https://matrix.${cfg.domainName}";
|
||||
"m.identity_server".base_url = "https://vector.im";
|
||||
"org.matrix.msc3575.proxy".url = "https://matrix.${cfg.domainName}";
|
||||
};
|
||||
matrixServerConfigResponse = ''
|
||||
add_header Content-Type application/json;
|
||||
|
|
@ -42,8 +41,7 @@ in {
|
|||
locations = {
|
||||
"= /.well-known/matrix/server".extraConfig = matrixServerConfigResponse;
|
||||
"= /.well-known/matrix/client".extraConfig = matrixClientConfigResponse;
|
||||
"~ ^/(_matrix(?!/maubot)|_synapse/client|$)".proxyPass = "http://${lib.quoteListenAddr matrixAddr}:${toString matrixPort}";
|
||||
"~ ^/(client/|_matrix/client/unstable/org.matrix.msc3575/)".proxyPass = "http://${config.services.matrix-sliding-sync.settings.SYNCV3_BINDADDR}";
|
||||
"/".proxyPass = "http://${lib.quoteListenAddr matrixAddr}:${toString matrixPort}";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -114,13 +112,4 @@ in {
|
|||
}];
|
||||
};
|
||||
};
|
||||
|
||||
services.matrix-sliding-sync = {
|
||||
enable = true;
|
||||
environmentFile = "/secrets/sliding-sync/env";
|
||||
settings = {
|
||||
SYNCV3_BINDADDR = "[::]:8010";
|
||||
SYNCV3_SERVER = "https://matrix.pavluk.org";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,4 +32,7 @@ in {
|
|||
levenshtein
|
||||
pillow
|
||||
];
|
||||
nixpkgs.config.permittedInsecurePackages = [
|
||||
"olm-3.2.16"
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -59,7 +59,6 @@ in {
|
|||
"flakes"
|
||||
"nix-command"
|
||||
"no-url-literals"
|
||||
"repl-flake"
|
||||
];
|
||||
};
|
||||
gc = {
|
||||
|
|
|
|||
Loading…
Reference in a new issue