reo101/rix101
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore!: spring cleaning

Browse source 
Make `nix-darwin` follow flake's version `nixpkgs`
`neovim-nighlty-overlay` - `.overlay` -> `.overlays.default`
`nixVersions` - `stable` -> `latest`
Check `${SHLVL}` before reloading `nix-daemon.sh` (shadows `nix shell`s)
`fetchFromGitHub` - `sha256` -> `hash`
Create `-monitored` packages only for valid `nixVersions`
This commit is contained in:
reo101 2024-05-26 12:41:24 +03:00
parent ff04252a67
commit 6e713090c3
Signed by: reo101
GPG key ID: 675AA7EF13964ACB
9 changed files with 208 additions and 193 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

326
flake.lock
View file

@ -14,11 +14,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1715290355,
"narHash": "sha256-2T7CHTqBXJJ3ZC6R/4TXTcKoXWHcvubKNj9SfomURnw=",
"lastModified": 1716561646,
"narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=",
"owner": "ryantm",
"repo": "agenix",
"rev": "8d37c5bdeade12b6479c85acd133063ab53187a0",
"rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9",
"type": "github"
},
"original": {
@ -111,11 +111,11 @@
"utils": "utils"
},
"locked": {
"lastModified": 1711973905,
"narHash": "sha256-UFKME/N1pbUtn+2Aqnk+agUt8CekbpuqwzljivfIme8=",
"lastModified": 1715699772,
"narHash": "sha256-sKhqIgucN5sI/7UQgBwsonzR4fONjfMr9OcHK/vPits=",
"owner": "serokell",
"repo": "deploy-rs",
"rev": "88b3059b020da69cbe16526b8d639bd5e0b51c8b",
"rev": "b3ea6f333f9057b77efd9091119ba67089399ced",
"type": "github"
},
"original": {
@ -153,11 +153,11 @@
]
},
"locked": {
"lastModified": 1715445235,
"narHash": "sha256-SUu+oIWn+xqQIOlwfwNfS9Sek4i1HKsrLJchsDReXwA=",
"lastModified": 1716431128,
"narHash": "sha256-t3T8HlX3udO6f4ilLcN+j5eC3m2gqsouzSGiriKK6vk=",
"owner": "nix-community",
"repo": "disko",
"rev": "159d87ea5b95bbdea46f0288a33c5e1570272725",
"rev": "7ffc4354dfeb37c8c725ae1465f04a9b45ec8606",
"type": "github"
},
"original": {
@ -248,6 +248,22 @@
}
},
"flake-compat_6": {
"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_7": {
"flake": false,
"locked": {
"lastModified": 1673956053,
@ -270,11 +286,11 @@
]
},
"locked": {
"lastModified": 1714641030,
"narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=",
"lastModified": 1715865404,
"narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e",
"rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9",
"type": "github"
},
"original": {
@ -291,11 +307,11 @@
]
},
"locked": {
"lastModified": 1714641030,
"narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=",
"lastModified": 1715865404,
"narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e",
"rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9",
"type": "github"
},
"original": {
@ -330,11 +346,11 @@
"nixpkgs-lib": "nixpkgs-lib_2"
},
"locked": {
"lastModified": 1712014858,
"narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
"lastModified": 1714641030,
"narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
"rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e",
"type": "github"
},
"original": {
@ -382,24 +398,6 @@
"inputs": {
"systems": "systems_6"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_4": {
"inputs": {
"systems": "systems_7"
},
"locked": {
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
@ -414,9 +412,9 @@
"type": "github"
}
},
"flake-utils_5": {
"flake-utils_4": {
"inputs": {
"systems": "systems_8"
"systems": "systems_7"
},
"locked": {
"lastModified": 1685518550,
@ -432,9 +430,9 @@
"type": "github"
}
},
"flake-utils_6": {
"flake-utils_5": {
"inputs": {
"systems": "systems_9"
"systems": "systems_8"
},
"locked": {
"lastModified": 1705309234,
@ -450,7 +448,7 @@
"type": "github"
}
},
"flake-utils_7": {
"flake-utils_6": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
@ -465,9 +463,9 @@
"type": "github"
}
},
"flake-utils_8": {
"flake-utils_7": {
"inputs": {
"systems": "systems_10"
"systems": "systems_9"
},
"locked": {
"lastModified": 1710146030,
@ -506,6 +504,28 @@
}
},
"gitignore_2": {
"inputs": {
"nixpkgs": [
"neovim-nightly-overlay",
"pre-commit-hooks",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709087332,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
"gitignore_3": {
"inputs": {
"nixpkgs": [
"zls-overlay",
@ -528,11 +548,11 @@
},
"hardware": {
"locked": {
"lastModified": 1715148395,
"narHash": "sha256-lRxjTxY3103LGMjWdVqntKZHhlmMX12QUjeFrQMmGaE=",
"lastModified": 1716715385,
"narHash": "sha256-fe6Z33pbfqu4TI5ijmcaNc5vRBs633tyxJ12HTghy3w=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "a4e2b7909fc1bdf30c30ef21d388fde0b5cdde4a",
"rev": "2e7d6c568063c83355fe066b8a8917ee758de1b8",
"type": "github"
},
"original": {
@ -570,11 +590,11 @@
]
},
"locked": {
"lastModified": 1715380449,
"narHash": "sha256-716+f9Rj3wjSyD1xitCv2FcYbgPz1WIVDj+ZBclH99Y=",
"lastModified": 1716711219,
"narHash": "sha256-TnZETiQPXbyT5mdCHMOyrJnx2+BwroMBRrguciz1vEo=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "d7682620185f213df384c363288093b486b2883f",
"rev": "05e6ba83eb3585ce0aff7b41e4bd0e317d05ad4a",
"type": "github"
},
"original": {
@ -606,11 +626,11 @@
]
},
"locked": {
"lastModified": 1715417624,
"narHash": "sha256-Wp3vGZRQYVrEveB9UXXZRDvRFrkw6rXXXLxj/6sbg7M=",
"lastModified": 1716618639,
"narHash": "sha256-H3kcJDVqDmXZ9IfVtqObL3JUx/a0ERn6gWBTn+7vwN4=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "8fef078acb3206be58ae5892a32d6ed75b695647",
"rev": "a358c56a163b3b7d149571e853a8f75b2c1ceb38",
"type": "github"
},
"original": {
@ -665,46 +685,23 @@
"type": "github"
}
},
"neovim-flake": {
"inputs": {
"flake-utils": "flake-utils_3",
"nixpkgs": [
"neovim-nightly-overlay",
"nixpkgs"
]
},
"locked": {
"dir": "contrib",
"lastModified": 1715364077,
"narHash": "sha256-nQjGdKXTBmUrD6g+weg/uG1W0ITLKQ8Sqjwq9g2gCtw=",
"owner": "neovim",
"repo": "neovim",
"rev": "a2c158ad063bef6d43687dcf78956cd4e56717e4",
"type": "github"
},
"original": {
"dir": "contrib",
"owner": "neovim",
"repo": "neovim",
"type": "github"
}
},
"neovim-nightly-overlay": {
"inputs": {
"flake-compat": "flake-compat_5",
"flake-parts": "flake-parts_2",
"hercules-ci-effects": "hercules-ci-effects",
"neovim-flake": "neovim-flake",
"neovim-src": "neovim-src",
"nixpkgs": [
"nixpkgs"
]
],
"pre-commit-hooks": "pre-commit-hooks_2"
},
"locked": {
"lastModified": 1715385991,
"narHash": "sha256-XuK/ezUQnh6bEWpaPI4FQqeDDH6DQ73mcOW4LSgLxEc=",
"lastModified": 1716672993,
"narHash": "sha256-KISj1WGeeEb6d2rYFRGYHYiDvNJN1JtRKU2+jE32LMQ=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"rev": "58e1800c9fe31ebc56a8d2c036ade5abb3892a19",
"rev": "0f91f34a626baade98dfa091cc7a023266644d91",
"type": "github"
},
"original": {
@ -713,6 +710,22 @@
"type": "github"
}
},
"neovim-src": {
"flake": false,
"locked": {
"lastModified": 1716642936,
"narHash": "sha256-l53vGzYIy6tI1rYBlbxW502sDgpmZ4i/uTdWWtPKPtM=",
"owner": "neovim",
"repo": "neovim",
"rev": "52389e724366ebb2fb58f08c657f580900dd09ee",
"type": "github"
},
"original": {
"owner": "neovim",
"repo": "neovim",
"type": "github"
}
},
"nix-colors": {
"inputs": {
"base16-schemes": "base16-schemes",
@ -734,14 +747,16 @@
},
"nix-darwin": {
"inputs": {
"nixpkgs": "nixpkgs_2"
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1713946171,
"narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=",
"lastModified": 1716511055,
"narHash": "sha256-5Fe/DGgvMhPEMl9VdVxv3zvwRcwNDmW5eRJ0gk72w7U=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7",
"rev": "0bea8222f6e83247dd13b055d83e64bce02ee532",
"type": "github"
},
"original": {
@ -798,7 +813,7 @@
},
"nix-monitored": {
"inputs": {
"nixpkgs": "nixpkgs_3"
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1715016928,
@ -904,20 +919,14 @@
},
"nixpkgs-lib_2": {
"locked": {
"dir": "lib",
"lastModified": 1711703276,
"narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
"type": "github"
"lastModified": 1714640452,
"narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz"
},
"original": {
"dir": "lib",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz"
}
},
"nixpkgs-stable": {
@ -937,19 +946,6 @@
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1687274257,
"narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=",
"path": "/nix/store/22qgs3skscd9bmrxv9xv4q5d4wwm5ppx-source",
"rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5",
"type": "path"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1714906307,
"narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=",
@ -965,13 +961,13 @@
"type": "github"
}
},
"nixpkgs_4": {
"nixpkgs_3": {
"locked": {
"lastModified": 1715266358,
"narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=",
"lastModified": 1716509168,
"narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "f1010e0469db743d14519a1efd37e23f8513d714",
"rev": "bfb7a882678e518398ce9a31a881538679f6f092",
"type": "github"
},
"original": {
@ -981,7 +977,7 @@
"type": "github"
}
},
"nixpkgs_5": {
"nixpkgs_4": {
"locked": {
"lastModified": 1708655239,
"narHash": "sha256-ZrP/yACUvDB+zbqYJsln4iwotbH6CTZiTkANJ0AgDv4=",
@ -997,7 +993,7 @@
"type": "github"
}
},
"nixpkgs_6": {
"nixpkgs_5": {
"locked": {
"lastModified": 1686020360,
"narHash": "sha256-Wee7lIlZ6DIZHHLiNxU5KdYZQl0iprENXa/czzI6Cj4=",
@ -1013,7 +1009,7 @@
"type": "github"
}
},
"nixpkgs_7": {
"nixpkgs_6": {
"locked": {
"lastModified": 1706487304,
"narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=",
@ -1085,11 +1081,11 @@
},
"nur": {
"locked": {
"lastModified": 1715453178,
"narHash": "sha256-zGfCo5eLwErY81TfyLQVF00hVc/xe4mh/NzGj7hE0bs=",
"lastModified": 1716716715,
"narHash": "sha256-gez/eXcgIxbZCUq6+cLoXXJSzH5hDRLsRnK9Nr9uzdI=",
"owner": "nix-community",
"repo": "NUR",
"rev": "acdefc246fb529a7b0275454e39cb40512c60433",
"rev": "ccb21d26b4f6f574561c3d7139960228f7051bd2",
"type": "github"
},
"original": {
@ -1126,14 +1122,41 @@
"type": "github"
}
},
"pre-commit-hooks_2": {
"inputs": {
"flake-compat": "flake-compat_6",
"gitignore": "gitignore_2",
"nixpkgs": [
"neovim-nightly-overlay",
"nixpkgs"
],
"nixpkgs-stable": [
"neovim-nightly-overlay",
"nixpkgs"
]
},
"locked": {
"lastModified": 1716213921,
"narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"type": "github"
}
},
"ragenix": {
"inputs": {
"agenix": [
"agenix"
],
"crane": "crane",
"flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs_5",
"flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_4",
"rust-overlay": "rust-overlay"
},
"locked": {
@ -1169,7 +1192,7 @@
"nix-darwin": "nix-darwin",
"nix-monitored": "nix-monitored",
"nix-on-droid": "nix-on-droid",
"nixpkgs": "nixpkgs_4",
"nixpkgs": "nixpkgs_3",
"nur": "nur",
"ragenix": "ragenix",
"spicetify-nix": "spicetify-nix",
@ -1205,15 +1228,15 @@
},
"rust-overlay_2": {
"inputs": {
"flake-utils": "flake-utils_6",
"nixpkgs": "nixpkgs_7"
"flake-utils": "flake-utils_5",
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1713579131,
"narHash": "sha256-j/lrqFNzm7SdlBlKX43kA2Wp0OaGVOUjQGnER9//4Ao=",
"lastModified": 1715393623,
"narHash": "sha256-nSUFcUqyTQQ/aYFIB05mpCzytcKvfKMy3ZQAe0fP26A=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "67e961704b80454f1ba6595b02e26afc9af4cdce",
"rev": "8eb8671512cb0c72c748058506e50c54fb5d8e2b",
"type": "github"
},
"original": {
@ -1240,8 +1263,8 @@
},
"spicetify-nix": {
"inputs": {
"flake-utils": "flake-utils_5",
"nixpkgs": "nixpkgs_6"
"flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1704167711,
@ -1272,21 +1295,6 @@
"type": "github"
}
},
"systems_10": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
@ -1434,11 +1442,11 @@
"rust-overlay": "rust-overlay_2"
},
"locked": {
"lastModified": 1714016730,
"narHash": "sha256-w+fg8TVc2yceyzEKPn1iTBpsDyiEqVG6HekFnoDeD28=",
"lastModified": 1715552757,
"narHash": "sha256-ZOgCSIcdvG8+RcZCXSAEmb/LZ2Ap9wU4nvbxNDA+QN0=",
"owner": "Toqozz",
"repo": "wired-notify",
"rev": "19b8896f6d89321531c78ef5c2575963501e1a65",
"rev": "18b44306b2636fc7f238a9d946c7b8aac217122d",
"type": "github"
},
"original": {
@ -1449,18 +1457,18 @@
},
"zig-overlay": {
"inputs": {
"flake-compat": "flake-compat_6",
"flake-utils": "flake-utils_7",
"flake-compat": "flake-compat_7",
"flake-utils": "flake-utils_6",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1715170163,
"narHash": "sha256-EuRzY3HI9sMMqPX7Yb7xkZaBoznP0mtS2O/Kk/r6fYk=",
"lastModified": 1716683167,
"narHash": "sha256-Z6qUH7I9mijejV1gC8CY/LNm+2CcUcfgfQ6I8RF/PRg=",
"owner": "mitchellh",
"repo": "zig-overlay",
"rev": "9c0a853edcab5d60d28784c10b13392d7fabb9d7",
"rev": "620b5782b0ea694a6e03f3d263da2d5828bce9df",
"type": "github"
},
"original": {
@ -1471,8 +1479,8 @@
},
"zls-overlay": {
"inputs": {
"flake-utils": "flake-utils_8",
"gitignore": "gitignore_2",
"flake-utils": "flake-utils_7",
"gitignore": "gitignore_3",
"langref": "langref",
"nixpkgs": [
"nixpkgs"
@ -1482,11 +1490,11 @@
]
},
"locked": {
"lastModified": 1715376937,
"narHash": "sha256-fXZmddq7ZrEaX0rT4n+46f+qpwMbOdhoY+fCRj70xts=",
"lastModified": 1716388773,
"narHash": "sha256-SPljq7YPCRKYckkuCSKus17n1itEhu4nsw8YM+Jk0+A=",
"owner": "zigtools",
"repo": "zls",
"rev": "bb19beeb38a8c3df9a2408b8e15664415b8347ef",
"rev": "93b7bbd0d96ee7088c46d1373a2810e84f7d47be",
"type": "github"
},
"original": {

2
flake.nix
View file

@ -23,7 +23,7 @@
# Nix Darwin
nix-darwin = {
url = "github:lnl7/nix-darwin/master";
# inputs.nixpkgs.follows = "nixpkgs";
inputs.nixpkgs.follows = "nixpkgs";
};
mac-app-util = {

2
machines/nix-darwin/aarch64-darwin/limonka/configuration.nix
View file

@ -10,7 +10,7 @@
nix = {
# Ensure we can work with flakes
package = pkgs.nixVersions.stable-monitored;
package = pkgs.nixVersions.latest-monitored;
# extraOptions = ''
# # Enable flakes and new 'nix' command

2
machines/nix-darwin/aarch64-darwin/limonka/home/pavelatanasov.nix
View file

@ -10,7 +10,7 @@
# Add custom overlays
nixpkgs = {
overlays = builtins.attrValues outputs.overlays ++ [
inputs.neovim-nightly-overlay.overlay
inputs.neovim-nightly-overlay.overlays.default
inputs.zig-overlay.overlays.default
(final: prev: {
neovim-unwrapped =

2
machines/nix-darwin/x86_64-darwin/limontozu/home/pavelatanasov.nix
View file

@ -10,7 +10,7 @@
# Add custom overlays
nixpkgs = {
overlays = [
inputs.neovim-nightly-overlay.overlay
inputs.neovim-nightly-overlay.overlays.default
inputs.zig-overlay.overlays.default
];
};

2
machines/nix-on-droid/aarch64-linux/cheetah/home.nix
View file

@ -13,7 +13,7 @@
# Add custom overlays
nixpkgs = {
overlays = [
inputs.neovim-nightly-overlay.overlay
inputs.neovim-nightly-overlay.overlays.default
inputs.zig-overlay.overlays.default
# inputs.zls-overlay.???
];

2
machines/nixos/x86_64-linux/homix/home/reo101.nix
View file

@ -7,7 +7,7 @@
nixpkgs = {
overlays = builtins.attrValues outputs.overlays ++ [
inputs.neovim-nightly-overlay.overlay
inputs.neovim-nightly-overlay.overlays.default
inputs.zig-overlay.overlays.default
inputs.wired.overlays.default
];

10
modules/home-manager/reo101-shell/default.nix
View file

@ -275,7 +275,7 @@ in
# '')
''
# Prevent macOS updates from destroying nix
if [ -e "/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh" ]; then
if [ -e "/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh" ] && [ "''$''\{SHLVL''\}" -eq 1 ]; then
source "/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh"
fi
''
@ -290,7 +290,7 @@ in
owner = "chisui";
repo = "zsh-nix-shell";
rev = "v0.7.0";
sha256 = "sha256-oQpYKBt0gmOSBgay2HgbXiDoZo5FoUKwyHSlUrOAP5E=";
hash = "sha256-oQpYKBt0gmOSBgay2HgbXiDoZo5FoUKwyHSlUrOAP5E=";
};
}
{
@ -300,7 +300,7 @@ in
owner = "zdharma-continuum";
repo = "fast-syntax-highlighting";
rev = "cf318e06a9b7c9f2219d78f41b46fa6e06011fd9";
sha256 = "sha256-RVX9ZSzjBW3LpFs2W86lKI6vtcvDWP6EPxzeTcRZua4=";
hash = "sha256-RVX9ZSzjBW3LpFs2W86lKI6vtcvDWP6EPxzeTcRZua4=";
};
}
{
@ -310,7 +310,7 @@ in
owner = "zsh-users";
repo = "zsh-autosuggestions";
rev = "a411ef3e0992d4839f0732ebeb9823024afaaaa8";
sha256 = "sha256-KLUYpUu4DHRumQZ3w59m9aTW6TBKMCXl2UcKi4uMd7w=";
hash = "sha256-KLUYpUu4DHRumQZ3w59m9aTW6TBKMCXl2UcKi4uMd7w=";
};
}
{
@ -320,7 +320,7 @@ in
owner = "jeffreytse";
repo = "zsh-vi-mode";
rev = "1bda23100e8d140a19be0eed67395c64f6a6074c";
sha256 = "sha256-3arAa5EBG+U9cCauChX9K0KF3hkd+t04/trlWKk/gOw=";
hash = "sha256-3arAa5EBG+U9cCauChX9K0KF3hkd+t04/trlWKk/gOw=";
};
}
];

49
overlays/default.nix
View file

@ -35,29 +35,36 @@
nix-output-monitor = prev.nix-output-monitor;
};
nixVersions = prev.nixVersions // {
stable-monitored = inputs.nix-monitored.packages.${final.system}.default.override {
nix = prev.nixVersions.stable;
nixVersions = prev.nixVersions // final.lib.flip final.lib.concatMapAttrs prev.nixVersions (version: package:
final.lib.optionalAttrs
(final.lib.and
(final.lib.all (prefix: ! final.lib.hasPrefix prefix version)
# TODO: smarter filtering of deprecated and non-packages
[
"nix_2_4"
"nix_2_5"
"nix_2_6"
"nix_2_7"
"nix_2_8"
"nix_2_9"
"nix_2_10"
"nix_2_11"
"nix_2_12"
"nix_2_13"
"nix_2_14"
"nix_2_15"
"nix_2_16"
"nix_2_17"
"unstable"
])
(final.lib.isDerivation package))
{
"${version}-monitored" = inputs.nix-monitored.packages.${final.system}.default.override {
nix = package;
nix-output-monitor = prev.nix-output-monitor;
};
unstable-monitored = inputs.nix-monitored.packages.${final.system}.default.override {
nix = prev.nixVersions.unstable;
nix-output-monitor = prev.nix-output-monitor;
};
};
himalaya = prev.himalaya.overrideAttrs (oldAttrs: rec {
buildInputs =
(prev.buildInputs or [ ]) ++
final.lib.optionals final.stdenv.isDarwin ([
(with final.darwin.apple_sdk.frameworks; [
Security
])
(with final; [
iconv
])
]);
});
}
);
river = prev.river.overrideAttrs (oldAttrs: rec {
xwaylandSupport = true;