Compare commits
No commits in common. "cdda942fcd8b7821da8d94d9dfff2ea1877c28bc" and "c63327bc5c227bbdfb180e0ed83608a0c20896f5" have entirely different histories.
cdda942fcd
...
c63327bc5c
3 changed files with 35 additions and 83 deletions
99
flake.lock
99
flake.lock
|
|
@ -2,7 +2,7 @@
|
|||
"nodes": {
|
||||
"agenix": {
|
||||
"inputs": {
|
||||
"darwin": [],
|
||||
"darwin": "darwin",
|
||||
"home-manager": "home-manager",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
|
|
@ -10,11 +10,11 @@
|
|||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1715101957,
|
||||
"narHash": "sha256-fs5uVQFTfgb4L9pnhldeyTHNcYwn1U4nKYoCBJ6W3W4=",
|
||||
"lastModified": 1714136352,
|
||||
"narHash": "sha256-BtWQ2Th/jamO1SlD+2ASSW5Jaf7JhA/JLpQHk0Goqpg=",
|
||||
"owner": "ryantm",
|
||||
"repo": "agenix",
|
||||
"rev": "07479c2e7396acaaaac5925483498154034ea80a",
|
||||
"rev": "24a7ea390564ccd5b39b7884f597cfc8d7f6f44e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -23,6 +23,28 @@
|
|||
"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": false,
|
||||
"locked": {
|
||||
|
|
@ -57,24 +79,6 @@
|
|||
"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": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -103,11 +107,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1715077503,
|
||||
"narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=",
|
||||
"lastModified": 1714981474,
|
||||
"narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "6e277d9566de9976f47228dd8c580b97488734d4",
|
||||
"rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -142,11 +146,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1715114695,
|
||||
"narHash": "sha256-Pw81Wkm8RhCZr17ltsDabFpat1lRltRAszkppBmmdaI=",
|
||||
"lastModified": 1715017675,
|
||||
"narHash": "sha256-4bMsnv8KLzz8HWvYzeIjKqRF7IRCLSjo3EC862+L2Dk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NixOS-WSL",
|
||||
"rev": "19c7ae9034389f5a7bbc6b17a7b72289c1c52272",
|
||||
"rev": "1cb8f3c13dee0d40437a9b4b1cf943c06c0cddc4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -178,8 +182,7 @@
|
|||
"home-manager": "home-manager_2",
|
||||
"my_packages": "my_packages",
|
||||
"nixos-wsl": "nixos-wsl",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"xil": "xil"
|
||||
"nixpkgs": "nixpkgs"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
|
|
@ -211,42 +214,6 @@
|
|||
"repo": "default",
|
||||
"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",
|
||||
|
|
|
|||
12
flake.nix
12
flake.nix
|
|
@ -17,9 +17,6 @@
|
|||
url = "github:ryantm/agenix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
# optional, not necessary for the module
|
||||
inputs.darwin.follows = "";
|
||||
# optionally choose not to download darwin deps
|
||||
# (saves some resources on Linux)
|
||||
};
|
||||
|
||||
home-manager = {
|
||||
|
|
@ -31,14 +28,9 @@
|
|||
url = "/home/whovian/.flakes";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
xil = {
|
||||
url = "github:Qyriad/Xil";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
}; # inputs
|
||||
|
||||
outputs = { self, nixpkgs, nixos-wsl, agenix, home-manager, my_packages, xil, ... }:
|
||||
outputs = { self, nixpkgs, nixos-wsl, agenix, home-manager, my_packages, ... }:
|
||||
{
|
||||
nixosConfigurations = {
|
||||
nixos-wsl = nixpkgs.lib.nixosSystem {
|
||||
|
|
@ -57,14 +49,12 @@
|
|||
|
||||
users.whovian.home.packages = [
|
||||
agenix.packages.x86_64-linux.default
|
||||
|
||||
];
|
||||
|
||||
# Optionally, use home-manager.extraSpecialArgs to pass arguments to home.nix
|
||||
extraSpecialArgs = {
|
||||
system = "x86_64-linux";
|
||||
inherit my_packages;
|
||||
inherit xil;
|
||||
my_pkgs = my_packages.packages.x86_64-linux;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
config,
|
||||
pkgs,
|
||||
my_pkgs,
|
||||
xil,
|
||||
...
|
||||
}:
|
||||
|
||||
|
|
@ -50,7 +49,7 @@
|
|||
pkgs.ncdu
|
||||
pkgs.nixfmt-classic
|
||||
pkgs.progress
|
||||
pkgs.pyrosimple
|
||||
pkgs.pyrosimple # `lstor` etc, seems to be a `pyrocore` fork?
|
||||
pkgs.python3
|
||||
pkgs.quickbms
|
||||
pkgs.rclone
|
||||
|
|
@ -64,10 +63,6 @@
|
|||
# my_pkgs.irdkit
|
||||
my_pkgs.ird_tools
|
||||
my_pkgs.rom-properties
|
||||
|
||||
# Why does this *just* work? Blehh :P
|
||||
# Is it because "$(nix run github:Qyriad/Xil)" works?
|
||||
xil
|
||||
];
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Reference in a new issue