diff --git a/flake.nix b/flake.nix index 1e1da10..035612f 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,6 @@ niri.url = "github:sodiboo/niri-flake"; nixcord.url = "github:FlameFlag/nixcord"; winegdk.url = "github:fmbearmf/winegdk-nix"; - catppuccin.url = "github:catppuccin/nix"; honkai-railway-grub-theme.url = "github:voidlhf/StarRailGrubThemes/4a84e576bb544afbdfc76dbe40ffc50a5c2b16de"; diff --git a/host/server/default.nix b/host/server/default.nix index ced897d..7739deb 100644 --- a/host/server/default.nix +++ b/host/server/default.nix @@ -1,9 +1,4 @@ -{ - lib, - libs, - inputs, - ... -}: { +{libs, ...}: { imports = [ ./device.nix ./programs.nix diff --git a/host/server/users.nix b/host/server/users.nix index 5d2fbf5..eaa8e5b 100644 --- a/host/server/users.nix +++ b/host/server/users.nix @@ -7,12 +7,10 @@ isSystemUser = true; }; - users.users.forgejo = { + users.users.git = { group = "forgejo"; isSystemUser = true; useDefaultShell = true; - home = "/var/lib/forgejo"; - createHome = false; }; users.groups = { diff --git a/modules/features/system/forgejo.nix b/modules/features/system/forgejo.nix index 8e05d88..0116c2d 100644 --- a/modules/features/system/forgejo.nix +++ b/modules/features/system/forgejo.nix @@ -10,6 +10,7 @@ START_SSH_SERVER = false; SSH_CREATE_AUTHORIZED_KEYS_FILE = true; SSH_DOMAIN = "server.asakiyuki.com"; + SSH_USER = "git"; ROOT_URL = "https://git.asakiyuki.com/"; }; }; diff --git a/modules/services/openssh.nix b/modules/services/openssh.nix index addf94f..4c61a20 100644 --- a/modules/services/openssh.nix +++ b/modules/services/openssh.nix @@ -8,7 +8,6 @@ AllowUsers = [ "asakiyuki" "junko" - "forgejo" ]; PasswordAuthentication = true; KbdInteractiveAuthentication = false;