1
1
Fork 0

Compare commits

..

No commits in common. "f252a38b1b99881fc0500cb2fc6f5310b79bfef1" and "bbe12a24d3d513e0b66357d53c613bbae8f1dfea" have entirely different histories.

4 changed files with 12 additions and 36 deletions

View File

@ -69,27 +69,10 @@
"type": "github"
}
},
"nixpkgs-next": {
"locked": {
"lastModified": 1685566663,
"narHash": "sha256-btHN1czJ6rzteeCuE/PNrdssqYD2nIA4w48miQAFloM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4ecab3273592f27479a583fb6d975d4aba3486fe",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs",
"nixpkgs-next": "nixpkgs-next"
"nixpkgs": "nixpkgs"
}
}
},

View File

@ -1,23 +1,17 @@
{
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/22.11";
nixpkgs-next.url = "github:NixOS/nixpkgs/23.05";
nixos-wsl.url = "github:nix-community/NixOS-WSL";
nixos-wsl.inputs.nixpkgs.follows = "nixpkgs";
};
outputs = {
self,
nixpkgs,
nixpkgs-next,
nixos-wsl
}: {
outputs = { self, nixpkgs, nixos-wsl }: {
nixosConfigurations = {
catacomb = nixpkgs.lib.nixosSystem {
system = "aarch64-linux";
modules = [ ./machine/catacomb ];
};
empyrean = nixpkgs-next.lib.nixosSystem {
empyrean = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [ ./machine/empyrean ];
};

View File

@ -18,6 +18,7 @@
# Use the GRUB 2 boot loader.
boot.loader.grub = {
enable = true;
version = 2;
device = "/dev/xvda";
extraConfig = "serial --unit=0 --speed=115200 ; terminal_input serial console ; terminal_output serial console";
};
@ -114,8 +115,8 @@
services.openssh = {
enable = true;
settings.PasswordAuthentication = false;
settings.PermitRootLogin = "prohibit-password";
passwordAuthentication = false;
permitRootLogin = "prohibit-password";
};
services.tinc.networks.beatific = {
@ -179,7 +180,7 @@
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "23.05"; # Did you read the comment?
system.stateVersion = "20.03"; # Did you read the comment?
}

View File

@ -5,7 +5,12 @@
{
# Gitea configuration
services.gitea = {
# Enable Gitea and configure for reverse proxy
enable = true;
httpAddress = "127.0.0.1";
httpPort = 3300;
domain = "git.alogoulogoi.com";
rootUrl = "https://git.alogoulogoi.com/";
#useWizard = true; # Needed for first-time building
@ -17,13 +22,6 @@
interval = "weekly";
};
settings = {
"server" = {
# Configuration for reverse proxy
ROOT_URL = "https://git.alogoulogoi.com/";
HTTP_ADDR = "127.0.0.1";
HTTP_PORT = 3300;
DOMAIN = "git.alogoulogoi.com";
};
"repository" = {
DEFAULT_PRIVATE = true;
};