Compare commits

...

6 Commits

5 changed files with 51 additions and 16 deletions

View File

@ -1,5 +1,25 @@
{ {
"nodes": { "nodes": {
"aaru": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1719657434,
"narHash": "sha256-hvqQ9k3E1eIsbu1HChnxzxDysNauKAUTTxN7EdePMsY=",
"owner": "Whovian9369",
"repo": "aaru-nix-flake",
"rev": "620ef8866395544b5aad55b7dac83fa63a988731",
"type": "github"
},
"original": {
"owner": "Whovian9369",
"repo": "aaru-nix-flake",
"type": "github"
}
},
"agenix": { "agenix": {
"inputs": { "inputs": {
"darwin": [], "darwin": [],
@ -85,11 +105,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719180626, "lastModified": 1719588253,
"narHash": "sha256-vZAzm5KQpR6RGple1dzmSJw5kPivES2heCFM+ZWkt0I=", "narHash": "sha256-A03i8xiVgP14DCmV5P7VUv37eodCjY4e1iai0b2EuuM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6b1f90a8ff92e81638ae6eb48cd62349c3e387bb", "rev": "7e68e55d2e16d3a1e92a679430728c35a30fd24e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -101,11 +121,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1719261698, "lastModified": 1719439912,
"narHash": "sha256-0P9zg07Za+7B8bOgCYese2xU6dqutIyq7bT05wPl5HY=", "narHash": "sha256-Qn0y/WEYcBL/SKEnpJq1e9tDpVi57YGDiJM2MgavLXM=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "d5637ee790799ffa00bcaa3067bb6940b6cbad16", "rev": "5dc85e8b72d1ba433f69200537146275ff1c4a03",
"revCount": 15880, "revCount": 15900,
"type": "git", "type": "git",
"url": "https://git@git.lix.systems/lix-project/lix" "url": "https://git@git.lix.systems/lix-project/lix"
}, },
@ -128,11 +148,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718778751, "lastModified": 1719353937,
"narHash": "sha256-DdcMvX9r29uHMlz7P1Shgs5xZw9WkZ4ObMGYzwROAiw=", "narHash": "sha256-86NBqDxAP20ET/UoKX0WvSItblNQ97czXb2q7lkMrwk=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "909e593ae9f5fe338ab19b4ed9d52bb0ea09bad8", "rev": "5d9d94089fb1ca96222a34bfe245ef5c5ebefd37",
"revCount": 90, "revCount": 92,
"type": "git", "type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module" "url": "https://git.lix.systems/lix-project/nixos-module"
}, },
@ -203,11 +223,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1719075281, "lastModified": 1719506693,
"narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", "narHash": "sha256-C8e9S7RzshSdHB7L+v9I51af1gDM5unhJ2xO1ywxNH8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", "rev": "b2852eb9365c6de48ffb0dc2c9562591f652242a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -219,6 +239,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"aaru": "aaru",
"agenix": "agenix", "agenix": "agenix",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"home-manager": "home-manager", "home-manager": "home-manager",

View File

@ -42,6 +42,11 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
aaru = {
url = "github:Whovian9369/aaru-nix-flake";
inputs.nixpkgs.follows = "nixpkgs";
};
### Lix! Lix! Lix! ### Lix! Lix! Lix!
lix = { lix = {
@ -91,7 +96,7 @@
# Lix # Lix
lix-module, lix-module,
# Added by me # Added by me
agenix, home-manager, nix-index-database, xil, ... }: agenix, home-manager, nix-index-database, xil, aaru, ... }:
let let
pkgs = import nixpkgs { pkgs = import nixpkgs {
system = "x86_64-linux"; system = "x86_64-linux";
@ -160,6 +165,7 @@
# to home.nix # to home.nix
extraSpecialArgs = { extraSpecialArgs = {
system = "x86_64-linux"; system = "x86_64-linux";
inherit aaru;
inherit xil; inherit xil;
inherit nixpkgs; inherit nixpkgs;
pkgs = import nixpkgs { pkgs = import nixpkgs {

View File

@ -1,5 +1,6 @@
{ {
lib, lib,
aaru,
agenix, agenix,
config, config,
modulesPath, modulesPath,
@ -18,7 +19,8 @@
./dotfiles.nix # home.file ./dotfiles.nix # home.file
./variables.nix # home.sessionVariables ./variables.nix # home.sessionVariables
./aliases.nix # home.shellAliases ./aliases.nix # home.shellAliases
./rust.nix # Should be my `rustfmt` config. # ./rust.nix # Should be my `rustfmt` config.
# I no longer have an interest in Rust. :)
]; ];
home = { home = {

View File

@ -1,4 +1,5 @@
{ {
aaru,
agenix, agenix,
pkgs, pkgs,
system, system,
@ -139,6 +140,7 @@ in
agenix.packages.${system}.default agenix.packages.${system}.default
xil.packages.${system}.xil xil.packages.${system}.xil
aaru.packages.${system}.git
]; ];
# Disabled Packages # Disabled Packages

View File

@ -12,4 +12,8 @@
ITCHIO_API_KEY = "\$(cat ${config.age.secrets."itchy".path})"; ITCHIO_API_KEY = "\$(cat ${config.age.secrets."itchy".path})";
ELIXIRE_API_KEY = "\$(cat ${config.age.secrets."elixire".path})"; ELIXIRE_API_KEY = "\$(cat ${config.age.secrets."elixire".path})";
}; };
home.sessionPath = [
"$HOME/bin"
];
} }