whovian/nixos_config
1
0
Fork 0
Code Issues Pull requests Activity

Compare commits

base: whovian:21722c1a9e41f662e385c5cdd32902bae08c9ada
Branches Tags
whovian:main
...
compare: whovian:588779fa95a1ddefe5d734502f2c239bf5f87b0f
Branches Tags
whovian:main

3 commits
21722c1a9e ... 588779fa95

Author SHA1 Message Date
Whovian9369
588779fa95 Swap to using Lix directly from main. 2024-06-25 04:39:23 -04:00
Whovian9369
ae3efb9c33 Style edit for system/nix_lix.nix 2024-06-25 03:38:36 -04:00
Whovian9369
fa57a693c7 Update binaryobjectscanner. 2024-06-21 18:10:02 -04:00
4 changed files with 40 additions and 29 deletions
Show stats Expand all files Collapse all files

41
flake.lock
View file

@ -85,11 +85,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718788307, "lastModified": 1719180626,
"narHash": "sha256-SqiOz0sljM0GjyQEVinPXQxaGcbOXw5OgpCWGPgh/vo=", "narHash": "sha256-vZAzm5KQpR6RGple1dzmSJw5kPivES2heCFM+ZWkt0I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d7830d05421d0ced83a0f007900898bdcaf2a2ca", "rev": "6b1f90a8ff92e81638ae6eb48cd62349c3e387bb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -101,16 +101,15 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1714955862, "lastModified": 1719261698,
"narHash": "sha256-REWlo2RYHfJkxnmZTEJu3Cd/2VM+wjjpPy7Xi4BdDTQ=", "narHash": "sha256-0P9zg07Za+7B8bOgCYese2xU6dqutIyq7bT05wPl5HY=",
"ref": "refs/tags/2.90-beta.1", "ref": "refs/heads/main",
"rev": "b6799ab0374a8e1907a48915d3187e07da41d88c", "rev": "d5637ee790799ffa00bcaa3067bb6940b6cbad16",
"revCount": 15501, "revCount": 15880,
"type": "git", "type": "git",
"url": "https://git@git.lix.systems/lix-project/lix" "url": "https://git@git.lix.systems/lix-project/lix"
}, },
"original": { "original": {
"ref": "refs/tags/2.90-beta.1",
"type": "git", "type": "git",
"url": "https://git@git.lix.systems/lix-project/lix" "url": "https://git@git.lix.systems/lix-project/lix"
} }
@ -149,11 +148,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718507237, "lastModified": 1719111455,
"narHash": "sha256-xBEWCxWeRpWQggFFp8ugJCDa63cOJsVvx71R9F0Eowg=", "narHash": "sha256-rnIxHx+fLpydjMQsbpZ21kblUr/lMqSaAtMA4+qMMEE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "6af2c5e58c20311276f59d247341cafeebfcb6f4", "rev": "4293f532d0107dfb7e6f8b34a0421dc8111320e6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -188,11 +187,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718710563, "lastModified": 1719220171,
"narHash": "sha256-O4rrM0Bkh3IRe8D600iniQ52QTmlnuTSp2KyXV7C2jE=", "narHash": "sha256-xywM6JoGT8AwfoOFJBTv8GRlvNu8LYqqqMS/OQ6uCgE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "2fb93bea657ad99a7005ef601c67cb2820560a41", "rev": "269411cfed6aab694e46f719277c972de96177bb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -204,11 +203,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1718714799, "lastModified": 1719075281,
"narHash": "sha256-FUZpz9rg3gL8NVPKbqU8ei1VkPLsTIfAJ2fdAf5qjak=", "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e", "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -242,11 +241,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717356499, "lastModified": 1719236664,
"narHash": "sha256-FnfuAc1yCQDw2UsChBHKDKtS3mo7DzKMqHKodwvmLzU=", "narHash": "sha256-AUXjPlfHpUQs+gKznmiHRaWZNWpKRNDE3R85oR/6hlY=",
"owner": "Qyriad", "owner": "Qyriad",
"repo": "Xil", "repo": "Xil",
"rev": "4940f0651a8f47afd4b07ff3e6b24f40113fcc46", "rev": "563229c826e6b37a64e72d29154ab96e8ee18fcb",
"type": "github" "type": "github"
}, },
"original": { "original": {

12
flake.nix
View file

@ -45,12 +45,22 @@
### Lix! Lix! Lix! ### Lix! Lix! Lix!
lix = { lix = {
url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1"; url = "git+https://git@git.lix.systems/lix-project/lix";
/*
Future me, the pattern for using Forgejo URLs is:
git+https://git@${domain}/${user_org}/${repo}?ref=refs/tags/${TAG}
git+https://git@${domain}/${user_org}/${repo}?rev=${commitHash}
*/
flake = false; flake = false;
}; };
lix-module = { lix-module = {
url = "git+https://git.lix.systems/lix-project/nixos-module"; url = "git+https://git.lix.systems/lix-project/nixos-module";
/*
Future me, the pattern for using Forgejo URLs is:
git+https://git@${domain}/${user_org}/${repo}?ref=refs/tags/${TAG}
git+https://git@${domain}/${user_org}/${repo}?rev=${commitHash}
*/
inputs.lix.follows = "lix"; inputs.lix.follows = "lix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils"; inputs.flake-utils.follows = "flake-utils";

4
home/packages/binaryobjectscanner/package.nix
View file

@ -12,8 +12,8 @@ buildDotnetModule {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SabreTools"; owner = "SabreTools";
repo = "BinaryObjectScanner"; repo = "BinaryObjectScanner";
rev = "a4ee4529caeb9a1739518abcd1e5d0ddbd096d12"; rev = "e3eed76826fe8a4254783eb59e91abe69233e935";
hash = "sha256-dSl1+8aoqRpPATQJuSGNyns9PGB7Olka5OJMg9MPz34="; hash = "sha256-t0clhrZ8e6fiul2kAIutks1Y7v4D7N8zL+16J1vBAc0=";
fetchSubmodules = true; fetchSubmodules = true;
leaveDotGit = false; leaveDotGit = false;
}; };

6
system/nix_lix.nix
View file

@ -1,9 +1,11 @@
{ {
nix.settings.extra-substituters = [ nix.settings = {
extra-substituters = [
"https://cache.lix.systems" "https://cache.lix.systems"
]; ];
nix.settings.trusted-public-keys = [ trusted-public-keys = [
"cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
]; ];
};
} }