Jaculabilis
/
nixos-configs
1
1
Fork 0
Code Releases Activity

Update empyrean to nixpkgs 22.11

This commit is contained in:
Jaculabilis 2022-12-11 00:00:55 +00:00
parent d385788c25
commit 8f030a559b
5 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
flake.lock
View File

@ -66,22 +66,6 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs-empyrean": {
"locked": {
"lastModified": 1646588256,
"narHash": "sha256-ZHljmNlt19nSm0Mz8fx6QEhddKUkU4hhwFmfNmGn+EY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2ebb6c1e5ae402ba35cca5eec58385e5f1adea04",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2ebb6c1e5ae402ba35cca5eec58385e5f1adea04",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1669833724, "lastModified": 1669833724,
@ -101,8 +85,7 @@
"root": { "root": {
"inputs": { "inputs": {
"nixos-wsl": "nixos-wsl", "nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2"
"nixpkgs-empyrean": "nixpkgs-empyrean"
} }
} }
}, },

5
flake.nix
View File

@ -1,16 +1,15 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs?ref=refs/tags/22.11"; nixpkgs.url = "github:NixOS/nixpkgs?ref=refs/tags/22.11";
nixpkgs-empyrean.url = "github:NixOS/nixpkgs?rev=2ebb6c1e5ae402ba35cca5eec58385e5f1adea04";
nixos-wsl.url = github:nix-community/NixOS-WSL; nixos-wsl.url = github:nix-community/NixOS-WSL;
}; };
outputs = { self, nixpkgs, nixpkgs-empyrean, nixos-wsl }@attrs: { outputs = { self, nixpkgs, nixos-wsl }@attrs: {
nixosConfigurations.catacomb = nixpkgs.lib.nixosSystem { nixosConfigurations.catacomb = nixpkgs.lib.nixosSystem {
system = "aarch64-linux"; system = "aarch64-linux";
modules = [ ./machine/catacomb ]; modules = [ ./machine/catacomb ];
}; };
nixosConfigurations.empyrean = nixpkgs-empyrean.lib.nixosSystem { nixosConfigurations.empyrean = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ ./machine/empyrean ]; modules = [ ./machine/empyrean ];
}; };

4
machine/empyrean/default.nix
View File

@ -26,7 +26,7 @@
nix = { nix = {
package = pkgs.nixFlakes; package = pkgs.nixFlakes;
maxJobs = 2; settings.max-jobs = 2;
extraOptions = '' extraOptions = ''
experimental-features = nix-command flakes experimental-features = nix-command flakes
''; '';
@ -95,7 +95,7 @@
}; };
}; };
security.acme = { security.acme = {
email = "tim.vanbaak+alogoulogoi@gmail.com"; defaults.email = "tim.vanbaak+alogoulogoi@gmail.com";
acceptTerms = true; acceptTerms = true;
}; };

6
machine/empyrean/gitea.nix
View File

@ -12,8 +12,6 @@
domain = "git.alogoulogoi.com"; domain = "git.alogoulogoi.com";
rootUrl = "https://git.alogoulogoi.com/"; rootUrl = "https://git.alogoulogoi.com/";
# Private server
disableRegistration = true;
#useWizard = true; # Needed for first-time building #useWizard = true; # Needed for first-time building
# Settings # Settings
@ -23,7 +21,6 @@
enable = true; enable = true;
interval = "weekly"; interval = "weekly";
}; };
log.level = "Info";
settings = { settings = {
"repository" = { "repository" = {
DEFAULT_PRIVATE = true; DEFAULT_PRIVATE = true;
@ -45,6 +42,9 @@
}; };
"cron.archive_cleanup".ENABLED = false; "cron.archive_cleanup".ENABLED = false;
"cron.sync_external_users".ENABLED = false; "cron.sync_external_users".ENABLED = false;
log.LEVEL = "Info";
# Private server
service.DISABLE_REGISTRATION = true;
}; };
}; };

2
machine/empyrean/hardware-configuration.nix
View File

@ -18,5 +18,5 @@
swapDevices = [ ]; swapDevices = [ ];
nix.maxJobs = lib.mkDefault 1; nix.settings.max-jobs = lib.mkDefault 1;
} }