From 8df15d275e26f051eaadfeedcf6a37cbdb9b2831 Mon Sep 17 00:00:00 2001 From: Asaki Yuki Date: Mon, 20 Apr 2026 05:03:40 +0700 Subject: [PATCH 01/10] idk --- modules/services/openssh.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/services/openssh.nix b/modules/services/openssh.nix index 4c61a20..5d0254e 100644 --- a/modules/services/openssh.nix +++ b/modules/services/openssh.nix @@ -8,6 +8,7 @@ AllowUsers = [ "asakiyuki" "junko" + "git" ]; PasswordAuthentication = true; KbdInteractiveAuthentication = false; From 61fd1e65463f52ad7eb1645e9c91256fbc8aca2e Mon Sep 17 00:00:00 2001 From: Asaki Yuki Date: Mon, 20 Apr 2026 05:07:06 +0700 Subject: [PATCH 02/10] idk --- host/server/users.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/host/server/users.nix b/host/server/users.nix index eaa8e5b..510613a 100644 --- a/host/server/users.nix +++ b/host/server/users.nix @@ -11,6 +11,8 @@ group = "forgejo"; isSystemUser = true; useDefaultShell = true; + home = "/var/lib/forgejo"; + createHome = false; }; users.groups = { From 7d752d82908ff876c8860512dbdabe83b6cbf943 Mon Sep 17 00:00:00 2001 From: Asaki Yuki Date: Mon, 20 Apr 2026 05:12:26 +0700 Subject: [PATCH 03/10] idk --- host/server/users.nix | 2 +- modules/features/system/forgejo.nix | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/host/server/users.nix b/host/server/users.nix index 510613a..5d2fbf5 100644 --- a/host/server/users.nix +++ b/host/server/users.nix @@ -7,7 +7,7 @@ isSystemUser = true; }; - users.users.git = { + users.users.forgejo = { group = "forgejo"; isSystemUser = true; useDefaultShell = true; diff --git a/modules/features/system/forgejo.nix b/modules/features/system/forgejo.nix index 0116c2d..8e05d88 100644 --- a/modules/features/system/forgejo.nix +++ b/modules/features/system/forgejo.nix @@ -10,7 +10,6 @@ START_SSH_SERVER = false; SSH_CREATE_AUTHORIZED_KEYS_FILE = true; SSH_DOMAIN = "server.asakiyuki.com"; - SSH_USER = "git"; ROOT_URL = "https://git.asakiyuki.com/"; }; }; From fc6a9c9fde227b5fa5cbf78662186077a9832d0b Mon Sep 17 00:00:00 2001 From: Asaki Yuki Date: Mon, 20 Apr 2026 05:14:21 +0700 Subject: [PATCH 04/10] idk --- modules/services/openssh.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/openssh.nix b/modules/services/openssh.nix index 5d0254e..addf94f 100644 --- a/modules/services/openssh.nix +++ b/modules/services/openssh.nix @@ -8,7 +8,7 @@ AllowUsers = [ "asakiyuki" "junko" - "git" + "forgejo" ]; PasswordAuthentication = true; KbdInteractiveAuthentication = false; From d1d3299883f0c40e78698bd43c1cbb97dfa57684 Mon Sep 17 00:00:00 2001 From: Asaki Yuki Date: Mon, 20 Apr 2026 05:34:15 +0700 Subject: [PATCH 05/10] add forgejo web catppuccin theme --- flake.nix | 1 + host/server/default.nix | 14 +++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 035612f..1e1da10 100644 --- a/flake.nix +++ b/flake.nix @@ -10,6 +10,7 @@ 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 7739deb..d5f41b7 100644 --- a/host/server/default.nix +++ b/host/server/default.nix @@ -1,4 +1,8 @@ -{libs, ...}: { +{ + libs, + inputs, + ... +}: { imports = [ ./device.nix ./programs.nix @@ -6,6 +10,8 @@ ./networking.nix ./users.nix + inputs.catppuccin.nixosModules.catppuccin + (libs.root "/modules/features/system/docker.nix") (libs.root "/modules/features/system/packages.nix") (libs.root "/modules/features/system/nix-dl.nix") @@ -16,4 +22,10 @@ (libs.root "/options/system/default.nix") (libs.root "/overlays/nixpkgs.nix") ]; + + catppuccin.forgejo = { + enable = "true"; + accent = "lavender"; + flavor = "mocha"; + }; } From a40239264ce3d398c03c6abd2b141c35a1157424 Mon Sep 17 00:00:00 2001 From: Asaki Yuki Date: Mon, 20 Apr 2026 05:36:47 +0700 Subject: [PATCH 06/10] idk --- host/server/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/host/server/default.nix b/host/server/default.nix index d5f41b7..d93d24a 100644 --- a/host/server/default.nix +++ b/host/server/default.nix @@ -23,9 +23,17 @@ (libs.root "/overlays/nixpkgs.nix") ]; - catppuccin.forgejo = { - enable = "true"; - accent = "lavender"; - flavor = "mocha"; + catppuccin = { + enable = true; + + gtk.enable = false; + kvantum.enable = false; + cursors.enable = false; + + forgejo = { + enable = true; + accent = "lavender"; + flavor = "mocha"; + }; }; } From 1baf17728fd722f3a5c1b51d0e6ef43fc6931df5 Mon Sep 17 00:00:00 2001 From: Asaki Yuki Date: Mon, 20 Apr 2026 05:37:04 +0700 Subject: [PATCH 07/10] idk --- host/server/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/host/server/default.nix b/host/server/default.nix index d93d24a..6784fe1 100644 --- a/host/server/default.nix +++ b/host/server/default.nix @@ -26,10 +26,6 @@ catppuccin = { enable = true; - gtk.enable = false; - kvantum.enable = false; - cursors.enable = false; - forgejo = { enable = true; accent = "lavender"; From d9f2ed8f2cecd9c74b8d8572d6fb2b18e3e31190 Mon Sep 17 00:00:00 2001 From: Asaki Yuki Date: Mon, 20 Apr 2026 05:37:46 +0700 Subject: [PATCH 08/10] idk --- host/server/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/host/server/default.nix b/host/server/default.nix index 6784fe1..4286170 100644 --- a/host/server/default.nix +++ b/host/server/default.nix @@ -10,7 +10,7 @@ ./networking.nix ./users.nix - inputs.catppuccin.nixosModules.catppuccin + inputs.catppuccin.nixosModules.forgejo (libs.root "/modules/features/system/docker.nix") (libs.root "/modules/features/system/packages.nix") From 49d5c513579073252c8ec49cae5f7664934372f2 Mon Sep 17 00:00:00 2001 From: Asaki Yuki Date: Mon, 20 Apr 2026 05:38:25 +0700 Subject: [PATCH 09/10] idk --- host/server/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/host/server/default.nix b/host/server/default.nix index 4286170..1af42cc 100644 --- a/host/server/default.nix +++ b/host/server/default.nix @@ -1,4 +1,5 @@ { + lib, libs, inputs, ... @@ -10,7 +11,7 @@ ./networking.nix ./users.nix - inputs.catppuccin.nixosModules.forgejo + inputs.catppuccin.nixosModules.catppuccin (libs.root "/modules/features/system/docker.nix") (libs.root "/modules/features/system/packages.nix") @@ -23,6 +24,11 @@ (libs.root "/overlays/nixpkgs.nix") ]; + options.services.displayManager.generic = lib.mkOption { + type = lib.types.attrs; + default = {}; + }; + catppuccin = { enable = true; From 0c40e210f4e497a6f96df6225f95cfafc843c6ad Mon Sep 17 00:00:00 2001 From: Asaki Yuki Date: Mon, 20 Apr 2026 05:38:41 +0700 Subject: [PATCH 10/10] idk --- host/server/default.nix | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/host/server/default.nix b/host/server/default.nix index 1af42cc..ced897d 100644 --- a/host/server/default.nix +++ b/host/server/default.nix @@ -11,8 +11,6 @@ ./networking.nix ./users.nix - inputs.catppuccin.nixosModules.catppuccin - (libs.root "/modules/features/system/docker.nix") (libs.root "/modules/features/system/packages.nix") (libs.root "/modules/features/system/nix-dl.nix") @@ -23,19 +21,4 @@ (libs.root "/options/system/default.nix") (libs.root "/overlays/nixpkgs.nix") ]; - - options.services.displayManager.generic = lib.mkOption { - type = lib.types.attrs; - default = {}; - }; - - catppuccin = { - enable = true; - - forgejo = { - enable = true; - accent = "lavender"; - flavor = "mocha"; - }; - }; }