remove dead code and make flake input strategy viable

This commit is contained in:
Daylin Morgan 2024-02-19 11:05:47 -06:00
parent 6432574aa1
commit 833dcf277b
Signed by: daylin
GPG key ID: C1E52E7DD81DF79F
10 changed files with 21 additions and 30 deletions

View file

@ -3,23 +3,15 @@
inputs.inputs.url = "path:./inputs";
# nixConfig = {
# extra-substituters = [
# "https://hyprland.cachix.org"
# "https://nixpkgs-wayland.cachix.org"
# "https://daylin.cachix.org"
# ];
# extra-trusted-public-keys = [
# "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
# "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
# "daylin.cachix.org-1:fLdSnbhKjtOVea6H9KqXeir+PyhO+sDSPhEW66ClE/k="
# ];
# };
#
outputs = {inputs, ...}: let
outputs = {
inputs,
self,
...
}: let
lib = import ./lib {
nixpkgs = inputs.inputs.nixpkgs;
inputs = inputs;
inputs = inputs.inputs;
inherit self;
};
inherit (lib) findModules buildHosts buildOizys;
in {

View file

@ -1,9 +1,9 @@
{
inputs,
self,
pkgs,
...
}: {
imports = with inputs.self.nixosModules; [
imports = with self.nixosModules; [
docker
restic
];

View file

@ -1,5 +1,5 @@
{inputs, ...}: {
imports = with inputs.self.nixosModules; [
{self, ...}: {
imports = with self.nixosModules; [
nix-ld
];

View file

@ -1,9 +1,9 @@
{
inputs,
pkgs,
self,
...
}: {
imports = with inputs.self.nixosModules; [
imports = with self.nixosModules; [
nix-ld
virtualbox
restic

View file

@ -1,5 +1,4 @@
{
config,
pkgs,
mkRune,
...
@ -32,7 +31,6 @@
rune = "othalan";
runeKind = "ascii";
};
# + inputs.self.nixosModules.runes.othalan.ascii;
# catppuccin/tty move to "module"
boot.kernelParams = [

View file

@ -1,6 +1,7 @@
{
inputs,
nixpkgs,
self,
...
}: let
inherit (builtins) concatLists attrValues mapAttrs elemAt match readDir filter listToAttrs;
@ -41,7 +42,7 @@ in rec {
isNixFile
(listFilesRecursive (../. + "/hosts/${hostname}"));
specialArgs = {inherit inputs mkRune;};
specialArgs = {inherit inputs mkRune self;};
};
mapHosts = dir: mapAttrs (name: _: mkSystem name) (readDir dir);
buildHosts = _: mapHosts ../hosts;

View file

@ -1,9 +1,9 @@
{
inputs,
lib,
self,
...
}: {
imports = with inputs.self.nixosModules; [
imports = with self.nixosModules; [
users
nix
cli

View file

@ -1,9 +1,9 @@
{
inputs,
pkgs,
self,
...
}: {
imports = with inputs.self.nixosModules; [
imports = with self.nixosModules; [
git
];
programs.zsh.enable = true;

View file

@ -1,5 +1,4 @@
{
nixpkgs,
config,
lib,
pkgs,

View file

@ -1,5 +1,6 @@
{
inputs,
self,
pkgs,
...
}: {
@ -19,7 +20,7 @@
environment.systemPackages = with pkgs; [
nix-output-monitor
alejandra
inputs.self.packages.${pkgs.system}.oizys
self.packages.${pkgs.system}.oizys
inputs.pinix.packages.${pkgs.system}.default
];