Compare commits

...

2 commits

Author SHA1 Message Date
cdda942fcd Oops, edited the note. 2024-05-07 22:58:01 -04:00
f402a52359 Add Xil tool to home.packages 2024-05-07 22:55:55 -04:00
3 changed files with 83 additions and 35 deletions

View file

@ -2,7 +2,7 @@
"nodes": { "nodes": {
"agenix": { "agenix": {
"inputs": { "inputs": {
"darwin": "darwin", "darwin": [],
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
@ -10,11 +10,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1714136352, "lastModified": 1715101957,
"narHash": "sha256-BtWQ2Th/jamO1SlD+2ASSW5Jaf7JhA/JLpQHk0Goqpg=", "narHash": "sha256-fs5uVQFTfgb4L9pnhldeyTHNcYwn1U4nKYoCBJ6W3W4=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "24a7ea390564ccd5b39b7884f597cfc8d7f6f44e", "rev": "07479c2e7396acaaaac5925483498154034ea80a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -23,28 +23,6 @@
"type": "github" "type": "github"
} }
}, },
"darwin": {
"inputs": {
"nixpkgs": [
"agenix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1700795494,
"narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
"type": "github"
},
"original": {
"owner": "lnl7",
"ref": "master",
"repo": "nix-darwin",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -79,6 +57,24 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_2": {
"inputs": {
"systems": "systems_3"
},
"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"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -107,11 +103,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714981474, "lastModified": 1715077503,
"narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=", "narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f", "rev": "6e277d9566de9976f47228dd8c580b97488734d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -146,11 +142,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715017675, "lastModified": 1715114695,
"narHash": "sha256-4bMsnv8KLzz8HWvYzeIjKqRF7IRCLSjo3EC862+L2Dk=", "narHash": "sha256-Pw81Wkm8RhCZr17ltsDabFpat1lRltRAszkppBmmdaI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "1cb8f3c13dee0d40437a9b4b1cf943c06c0cddc4", "rev": "19c7ae9034389f5a7bbc6b17a7b72289c1c52272",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -182,7 +178,8 @@
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"my_packages": "my_packages", "my_packages": "my_packages",
"nixos-wsl": "nixos-wsl", "nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs",
"xil": "xil"
} }
}, },
"systems": { "systems": {
@ -214,6 +211,42 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"xil": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1713401104,
"narHash": "sha256-F6xsowtye3+tJpRm8s1pYSY6Yi7tquTnsV2CpQ3pCl8=",
"owner": "Qyriad",
"repo": "Xil",
"rev": "b9f3a54411fdba7607d376569b9f952401aa2cd9",
"type": "github"
},
"original": {
"owner": "Qyriad",
"repo": "Xil",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -17,6 +17,9 @@
url = "github:ryantm/agenix"; url = "github:ryantm/agenix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
# optional, not necessary for the module # optional, not necessary for the module
inputs.darwin.follows = "";
# optionally choose not to download darwin deps
# (saves some resources on Linux)
}; };
home-manager = { home-manager = {
@ -28,9 +31,14 @@
url = "/home/whovian/.flakes"; url = "/home/whovian/.flakes";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
xil = {
url = "github:Qyriad/Xil";
inputs.nixpkgs.follows = "nixpkgs";
};
}; # inputs }; # inputs
outputs = { self, nixpkgs, nixos-wsl, agenix, home-manager, my_packages, ... }: outputs = { self, nixpkgs, nixos-wsl, agenix, home-manager, my_packages, xil, ... }:
{ {
nixosConfigurations = { nixosConfigurations = {
nixos-wsl = nixpkgs.lib.nixosSystem { nixos-wsl = nixpkgs.lib.nixosSystem {
@ -49,12 +57,14 @@
users.whovian.home.packages = [ users.whovian.home.packages = [
agenix.packages.x86_64-linux.default agenix.packages.x86_64-linux.default
]; ];
# Optionally, use home-manager.extraSpecialArgs to pass arguments to home.nix # Optionally, use home-manager.extraSpecialArgs to pass arguments to home.nix
extraSpecialArgs = { extraSpecialArgs = {
system = "x86_64-linux"; system = "x86_64-linux";
inherit my_packages; inherit my_packages;
inherit xil;
my_pkgs = my_packages.packages.x86_64-linux; my_pkgs = my_packages.packages.x86_64-linux;
}; };
}; };

View file

@ -2,6 +2,7 @@
config, config,
pkgs, pkgs,
my_pkgs, my_pkgs,
xil,
... ...
}: }:
@ -49,7 +50,7 @@
pkgs.ncdu pkgs.ncdu
pkgs.nixfmt-classic pkgs.nixfmt-classic
pkgs.progress pkgs.progress
pkgs.pyrosimple # `lstor` etc, seems to be a `pyrocore` fork? pkgs.pyrosimple
pkgs.python3 pkgs.python3
pkgs.quickbms pkgs.quickbms
pkgs.rclone pkgs.rclone
@ -63,6 +64,10 @@
# my_pkgs.irdkit # my_pkgs.irdkit
my_pkgs.ird_tools my_pkgs.ird_tools
my_pkgs.rom-properties my_pkgs.rom-properties
# Why does this *just* work? Blehh :P
# Is it because "$(nix run github:Qyriad/Xil)" works?
xil
]; ];
/* /*