Update to nixos 23.05

This commit is contained in:
Felix Albrigtsen 2023-06-07 21:10:31 +02:00
parent b15ab7ef01
commit 7fea3bfa83
6 changed files with 33 additions and 33 deletions

View File

@ -33,6 +33,8 @@
nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
};
programs.zsh.enable = true;
environment.systemPackages = with pkgs; [
wget
git
@ -44,9 +46,12 @@
services.openssh = {
enable = true;
permitRootLogin = "no";
passwordAuthentication = false;
kbdInteractiveAuthentication = false;
settings = {
PermitRootLogin = "no";
PasswordAuthentication = false;
KbdInteractiveAuthentication = false;
};
extraConfig = ''
AllowTcpForwarding yes
X11Forwarding no

View File

@ -2,27 +2,27 @@
"nodes": {
"nixpkgs": {
"locked": {
"lastModified": 1682461850,
"narHash": "sha256-udJwbwbhUOt0y04cIJy+7W6zNQeL23m+p3o7G47ZFEg=",
"lastModified": 1686105608,
"narHash": "sha256-LU6S6/xo/JUQmq8meNO9DMaauLsZSQ3Qsy2sX16O0HI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c533ac9867368d28e29a23369ac5d597bc5da185",
"rev": "874e427fe755f6aaf496a6d5058245562350f39d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-22.11-small",
"ref": "nixos-23.05-small",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1682173319,
"narHash": "sha256-tPhOpJJ+wrWIusvGgIB2+x6ILfDkEgQMX0BTtM5vd/4=",
"lastModified": 1685758009,
"narHash": "sha256-IT4Z5WGhafrq+xbDTyuKrRPRQ1f+kVOtE+4JU1CHFeo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ee7ec1c71adc47d2e3c2d5eb0d6b8fbbd42a8d1c",
"rev": "eaf03591711b46d21abc7082a8ebee4681f9dbeb",
"type": "github"
},
"original": {
@ -47,11 +47,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1682338428,
"narHash": "sha256-T7AL/Us6ecxowjMAlO77GETTQO2SO+1XX2+Y/OSfHk8=",
"lastModified": 1685848844,
"narHash": "sha256-Iury+/SVbAwLES76QJSiKFiQDzmf/8Hsq8j54WF2qyw=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "7c8e9727a2ecf9994d4a63d577ad5327e933b6a4",
"rev": "a522e12ee35e50fa7d902a164a9796e420e6e75b",
"type": "github"
},
"original": {
@ -62,11 +62,11 @@
},
"unstable": {
"locked": {
"lastModified": 1682476574,
"narHash": "sha256-diM+haOZnOUPOp3dLLbuAgEZBCE7Iv9iyNzO5YVmwq0=",
"lastModified": 1686131476,
"narHash": "sha256-d/VZjsgW7dBwqN77EcQ4HqQifpATkT5WnCvYbovIhf0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8bac227a5a27ba29240e496e3e3fd55a2351f68b",
"rev": "32d8e07a8ea673bc9b8c0f8106fb0b776c6ea6a8",
"type": "github"
},
"original": {

View File

@ -2,7 +2,7 @@
description = "Felixalb System flake";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11-small";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05-small";
unstable.url = "github:NixOS/nixpkgs/nixos-unstable-small";
sops-nix.url = "github:Mic92/sops-nix";

View File

@ -9,14 +9,6 @@
networking.hostName = "redshirt";
networking.networkmanager.enable = true;
# Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8";
console = {
font = "Lat2-Terminus16";
# keyMap = "no";
useXkbConfig = true; # use xkbOptions in tty.
};
# Enable the X11 windowing system.
services.xserver = {
enable = true;

View File

@ -23,7 +23,7 @@
./services/gitea.nix
./services/hedgedoc.nix
./services/vaultwarden.nix
./services/code-server.nix
# ./services/code-server.nix
# TODO:
# x Boot
# x Mount ZFS

View File

@ -1,6 +1,8 @@
{ config, pkgs, ... }:
let
cfg = config.services.gitea;
domain = "git.feal.no";
httpPort = 3004;
in {
services.gitea = {
enable = true;
@ -8,15 +10,16 @@ in {
appName = "felixalbs Gitea";
database = {
type = "postgres";
#passwordFile = "/var/gitea/passwdfile";
};
domain = "git.feal.no";
rootUrl = "https://git.feal.no";
httpPort = 3004;
settings = {
server.LANDING_PAGE=''"/felixalb"'';
server = {
LANDING_PAGE=''"/felixalb"'';
HTTP_PORT = httpPort;
DOMAIN = domain;
ROOT_URL = "https://${domain}";
};
service.DISABLE_REGISTRATION = true;
session.COOKIE_SECURE = true;
@ -45,5 +48,5 @@ in {
# - configure mailer
};
networking.firewall.allowedTCPPorts = [ cfg.httpPort ];
networking.firewall.allowedTCPPorts = [ httpPort ];
}