diff options
| -rw-r--r-- | flake.lock | 8 | ||||
| -rw-r--r-- | flake.nix | 2 | ||||
| -rw-r--r-- | hosts/p-body/forgejo.nix | 7 | ||||
| -rw-r--r-- | modules/nixos/base/documentation.nix | 7 | ||||
| -rw-r--r-- | modules/nixos/desktop/plasma/default.nix | 14 | ||||
| -rw-r--r-- | modules/nixos/server/default.nix | 2 |
6 files changed, 24 insertions, 16 deletions
@@ -520,16 +520,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1685314633, - "narHash": "sha256-8LXBPqTQXl5ofkjpJ18JcbmLJ/lWDoMxtUwiDYv0wro=", + "lastModified": 1685533922, + "narHash": "sha256-y4FCQpYafMQ42l1V+NUrMel9RtFtZo59PzdzflKR/lo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c8a17ce7abc03c50cd072e9e6c9b389c5f61836b", + "rev": "3a70dd92993182f8e514700ccf5b1ae9fc8a3b8d", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-22.11", + "ref": "nixos-23.05", "type": "indirect" } }, @@ -16,7 +16,7 @@ inputs = { nixpkgs.url = "nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "nixpkgs/nixos-22.11"; + nixpkgs-stable.url = "nixpkgs/nixos-23.05"; # this is just to avoid having multiple versions in flake.lock flake-compat = { diff --git a/hosts/p-body/forgejo.nix b/hosts/p-body/forgejo.nix index 8955830..8a5dc90 100644 --- a/hosts/p-body/forgejo.nix +++ b/hosts/p-body/forgejo.nix @@ -23,12 +23,10 @@ in { in { enable = true; package = (import nixpkgs {inherit (pkgs) system;}).forgejo; - inherit domain; - rootUrl = "https://${domain}/"; appName = "forgejo: with daddy issues"; - httpAddress = "127.0.0.1"; user = "forgejo"; database.user = "forgejo"; + settings = { indexer.REPO_INDEXER_ENABLED = true; session = { @@ -41,7 +39,10 @@ in { server = { BUILTIN_SSH_USER = "forgejo"; + DOMAIN = domain; ENABLE_GZIP = true; + HTTP_ADDR = "127.0.0.1"; + ROOT_URL = "https://${domain}/"; SSH_AUTHORIZED_KEYS_BACKUP = false; SSH_DOMAIN = domain; }; diff --git a/modules/nixos/base/documentation.nix b/modules/nixos/base/documentation.nix index 9064507..df2d139 100644 --- a/modules/nixos/base/documentation.nix +++ b/modules/nixos/base/documentation.nix @@ -13,7 +13,12 @@ in { environment.systemPackages = with pkgs; [man-pages man-pages-posix]; documentation = { dev.enable = true; - man.enable = true; + man = { + enable = true; + generateCaches = true; + man-db.enable = false; + mandoc.enable = true; + }; }; }; } diff --git a/modules/nixos/desktop/plasma/default.nix b/modules/nixos/desktop/plasma/default.nix index 84960f3..f7a8065 100644 --- a/modules/nixos/desktop/plasma/default.nix +++ b/modules/nixos/desktop/plasma/default.nix @@ -12,17 +12,19 @@ in { config = mkIf cfg.enable { getchoo.desktop.enable = true; - environment.systemPackages = with pkgs; [pinentry-qt]; + environment = { + systemPackages = with pkgs; [pinentry-qt]; + plasma5.excludePackages = with pkgs.libsForQt5; [ + khelpcenter + plasma-browser-integration + print-manager + ]; + }; services.xserver = { displayManager.sddm.enable = true; desktopManager.plasma5 = { enable = true; - excludePackages = with pkgs.libsForQt5; [ - khelpcenter - plasma-browser-integration - print-manager - ]; useQtScaling = true; }; }; diff --git a/modules/nixos/server/default.nix b/modules/nixos/server/default.nix index 0bafa48..14c85e0 100644 --- a/modules/nixos/server/default.nix +++ b/modules/nixos/server/default.nix @@ -66,7 +66,7 @@ in { openssh = { enable = true; - passwordAuthentication = mkDefault false; + settings.PasswordAuthentication = mkDefault false; }; }; }; |