oysteikt/nix-dotfiles
oysteikt
/
nix-dotfiles
2
0
Fork 0
Code Issues Pull Requests Activity

flake.nix: update several inputs, nixpkgs 23.05

This commit is contained in:
Oystein Kristoffer Tveit 2023-07-12 02:09:54 +02:00
parent 5250d40457
commit 96617500df
Signed by: oysteikt
GPG Key ID: 9F2F7D8250F35146
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
flake.nix
View File

@ -1,10 +1,10 @@
{ {
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-22.11"; nixpkgs.url = "nixpkgs/nixos-23.05";
nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-22.11"; url = "github:nix-community/home-manager/release-23.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -33,7 +33,7 @@
osuchan = { osuchan = {
url = "git+file:///home/h7x4/git/osuchan-line-bot"; url = "git+file:///home/h7x4/git/osuchan-line-bot";
# inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
website = { website = {
@ -48,6 +48,7 @@
minecraft = { minecraft = {
url = "github:infinidoge/nix-minecraft"; url = "github:infinidoge/nix-minecraft";
inputs.nixpkgs.follows = "nixpkgs-unstable";
}; };
matrix-synapse-next = { matrix-synapse-next = {
@ -55,8 +56,7 @@
}; };
vscode-server = { vscode-server = {
url = "github:msteen/nixos-vscode-server"; url = "github:nix-community/nixos-vscode-server";
flake = false;
}; };
# Nix expressions and keys (TODO: move keys to another solution like agenix) # Nix expressions and keys (TODO: move keys to another solution like agenix)
@ -99,10 +99,10 @@
android_sdk.accept_license = true; android_sdk.accept_license = true;
}; };
overlays = let overlays = let
nonrecursive-unstable-pkgs = nixpkgs-unstable.legacyPackages.${system}; nonrecursive-unstable-pkgs = nixpkgs-unstable.legacyPackages.${system};
in [ in [
(self: super: { kanidm = super.callPackage ./package-overrides/kanidm.nix {}; }) (self: super: { kanidm = nonrecursive-unstable-pkgs.kanidm; })
(self: super: { pgadmin4 = nonrecursive-unstable-pkgs.pgadmin4; }) (self: super: { pgadmin4 = nonrecursive-unstable-pkgs.pgadmin4; })
osuchan.overlays.default osuchan.overlays.default
]; ];
@ -155,13 +155,17 @@
./modules ./modules
./hosts/common.nix ./hosts/common.nix
./hosts/${name}/configuration.nix ./hosts/${name}/configuration.nix
"${vscode-server}/default.nix"
secrets.outputs.nixos-config
osuchan.outputs.nixosModules.default
minecraft.outputs.nixosModules.minecraft-servers
matrix-synapse-next.nixosModules.synapse matrix-synapse-next.nixosModules.synapse
osuchan.outputs.nixosModules.default
secrets.outputs.nixos-config
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
vscode-server.nixosModules.default
(args: import minecraft.outputs.nixosModules.minecraft-servers (args // {
pkgs = unstable-pkgs;
lib = unstable-pkgs.lib;
}))
{ {
config._module.args = { config._module.args = {