mirror of
https://github.com/nmasur/dotfiles
synced 2025-04-04 20:21:11 +00:00
fix flake issues with organizing by system
This commit is contained in:
Noah Masur
parent
eace1ff3cf
commit
5b32f1f211
56
flake.lock
generated
56
flake.lock
generated
@ -193,58 +193,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nextcloud-cookbook": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1726214817,
|
|
||||||
"narHash": "sha256-Pfa+Xbopg20os+pnGgg+wpEX1MI5fz5JMb0K4a8rBhs=",
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.2/cookbook-0.11.2.tar.gz"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.2/cookbook-0.11.2.tar.gz"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nextcloud-external": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1729501365,
|
|
||||||
"narHash": "sha256-OV6HhFBzmnQBO5btGEnqmKlaUMY7/t2Qm3XebclpBlM=",
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://github.com/nextcloud-releases/external/releases/download/v5.5.2/external-v5.5.2.tar.gz"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://github.com/nextcloud-releases/external/releases/download/v5.5.2/external-v5.5.2.tar.gz"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nextcloud-news": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1729667622,
|
|
||||||
"narHash": "sha256-pnvyMZQ+NYMgH0Unfh5S19HdZSjnghgoUDAoi2KIXNI=",
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha12/news.tar.gz"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha12/news.tar.gz"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nextcloud-snappymail": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1728502660,
|
|
||||||
"narHash": "sha256-oCw6Brs85rINBHvz3UJXheyLVqvA3RgPXG03b30Fx7E=",
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://snappymail.eu/repository/nextcloud/snappymail-2.38.2-nextcloud.tar.gz"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://snappymail.eu/repository/nextcloud/snappymail-2.38.2-nextcloud.tar.gz"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nix2vim": {
|
"nix2vim": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_2",
|
"flake-utils": "flake-utils_2",
|
||||||
@ -378,10 +326,6 @@
|
|||||||
"disko": "disko",
|
"disko": "disko",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"mac-app-util": "mac-app-util",
|
"mac-app-util": "mac-app-util",
|
||||||
"nextcloud-cookbook": "nextcloud-cookbook",
|
|
||||||
"nextcloud-external": "nextcloud-external",
|
|
||||||
"nextcloud-news": "nextcloud-news",
|
|
||||||
"nextcloud-snappymail": "nextcloud-snappymail",
|
|
||||||
"nix2vim": "nix2vim",
|
"nix2vim": "nix2vim",
|
||||||
"nixos-generators": "nixos-generators",
|
"nixos-generators": "nixos-generators",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
|
|||||||
99
flake.nix
99
flake.nix
@ -70,29 +70,29 @@
|
|||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Nextcloud Apps
|
# # Nextcloud Apps
|
||||||
nextcloud-news = {
|
# nextcloud-news = {
|
||||||
# https://github.com/nextcloud/news/releases
|
# # https://github.com/nextcloud/news/releases
|
||||||
url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha12/news.tar.gz";
|
# url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha12/news.tar.gz";
|
||||||
flake = false;
|
# flake = false;
|
||||||
};
|
# };
|
||||||
nextcloud-external = {
|
# nextcloud-external = {
|
||||||
# https://github.com/nextcloud-releases/external/releases
|
# # https://github.com/nextcloud-releases/external/releases
|
||||||
url = "https://github.com/nextcloud-releases/external/releases/download/v5.5.2/external-v5.5.2.tar.gz";
|
# url = "https://github.com/nextcloud-releases/external/releases/download/v5.5.2/external-v5.5.2.tar.gz";
|
||||||
flake = false;
|
# flake = false;
|
||||||
};
|
# };
|
||||||
nextcloud-cookbook = {
|
# nextcloud-cookbook = {
|
||||||
# https://github.com/christianlupus-nextcloud/cookbook-releases/releases/
|
# # https://github.com/christianlupus-nextcloud/cookbook-releases/releases/
|
||||||
url = "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.2/cookbook-0.11.2.tar.gz";
|
# url = "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.2/cookbook-0.11.2.tar.gz";
|
||||||
flake = false;
|
# flake = false;
|
||||||
};
|
# };
|
||||||
nextcloud-snappymail = {
|
# nextcloud-snappymail = {
|
||||||
# https://github.com/the-djmaze/snappymail/releases
|
# # https://github.com/the-djmaze/snappymail/releases
|
||||||
# https://snappymail.eu/repository/nextcloud
|
# # https://snappymail.eu/repository/nextcloud
|
||||||
url = "https://snappymail.eu/repository/nextcloud/snappymail-2.38.2-nextcloud.tar.gz";
|
# url = "https://snappymail.eu/repository/nextcloud/snappymail-2.38.2-nextcloud.tar.gz";
|
||||||
# url = "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.3/snappymail-2.36.3-nextcloud.tar.gz";
|
# # url = "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.3/snappymail-2.36.3-nextcloud.tar.gz";
|
||||||
flake = false;
|
# flake = false;
|
||||||
};
|
# };
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs =
|
outputs =
|
||||||
@ -133,35 +133,42 @@
|
|||||||
rec {
|
rec {
|
||||||
|
|
||||||
lib = import ./lib inputs;
|
lib = import ./lib inputs;
|
||||||
|
flattenAttrset = attrs: builtins.foldl' lib.mergeAttrs { } (builtins.attrValues attrs);
|
||||||
|
|
||||||
nixosConfigurations = builtins.mapAttrs (
|
nixosConfigurations = flattenAttrset (
|
||||||
system: hosts:
|
|
||||||
builtins.mapAttrs (
|
builtins.mapAttrs (
|
||||||
name: module:
|
system: hosts:
|
||||||
lib.buildNixos {
|
builtins.mapAttrs (
|
||||||
inherit system module;
|
name: module:
|
||||||
specialArgs = { inherit hostnames; };
|
lib.buildNixos {
|
||||||
}
|
inherit system module;
|
||||||
) hosts
|
specialArgs = { inherit hostnames; };
|
||||||
) lib.linuxHosts;
|
}
|
||||||
|
) hosts
|
||||||
|
) lib.linuxHosts
|
||||||
|
);
|
||||||
|
|
||||||
darwinConfigurations = builtins.mapAttrs (
|
darwinConfigurations = flattenAttrset (
|
||||||
system: hosts:
|
|
||||||
builtins.mapAttrs (
|
builtins.mapAttrs (
|
||||||
name: module:
|
system: hosts:
|
||||||
lib.buildDarwin {
|
builtins.mapAttrs (
|
||||||
inherit system module;
|
name: module:
|
||||||
specialArgs = { inherit hostnames; };
|
lib.buildDarwin {
|
||||||
}
|
inherit system module;
|
||||||
) hosts
|
specialArgs = { inherit hostnames; };
|
||||||
) lib.darwinHosts;
|
}
|
||||||
|
) hosts
|
||||||
|
) lib.darwinHosts
|
||||||
|
);
|
||||||
|
|
||||||
homeModules = builtins.mapAttrs (
|
homeModules = flattenAttrset (
|
||||||
system: hosts:
|
|
||||||
builtins.mapAttrs (
|
builtins.mapAttrs (
|
||||||
name: module: (builtins.head (lib.attrsToList module.home-manager.users)).value
|
system: hosts:
|
||||||
) hosts
|
builtins.mapAttrs (
|
||||||
) lib.hosts;
|
name: module: (builtins.head (lib.attrsToList module.home-manager.users)).value
|
||||||
|
) hosts
|
||||||
|
) lib.hosts
|
||||||
|
);
|
||||||
|
|
||||||
homeConfigurations = builtins.mapAttrs (
|
homeConfigurations = builtins.mapAttrs (
|
||||||
system: hosts:
|
system: hosts:
|
||||||
|
|||||||
1
hosts/x86_64-darwin/readme.md
Normal file
1
hosts/x86_64-darwin/readme.md
Normal file
@ -0,0 +1 @@
|
|||||||
|
# No x86 Darwin Hosts Currently
|
||||||
Loading…
x
Reference in New Issue
Block a user