From d3c1512f70a0d6d989e7b1c680a3205a447d1a93 Mon Sep 17 00:00:00 2001 From: hodasemi Date: Tue, 20 May 2025 14:36:04 +0200 Subject: [PATCH] Try without forgejo --- dev_system.nix | 2 -- flake.nix | 4 +++- git_system.nix | 38 +++++++++++++++++++------------------- shared/ssh.nix | 22 +++++++++++----------- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/dev_system.nix b/dev_system.nix index c970b07..d12c3f5 100644 --- a/dev_system.nix +++ b/dev_system.nix @@ -21,8 +21,6 @@ in ./shared/dev_user.nix ./shared/docker.nix ./shared/ssh.nix - - ./dummy-hardware.nix ]; sops = { diff --git a/flake.nix b/flake.nix index a0d36e5..72544fe 100644 --- a/flake.nix +++ b/flake.nix @@ -38,9 +38,11 @@ imports = [ # ./git_system.nix inputs.disko.nixosModules.disko + + ./git_system.nix + ./setup/disk_conf.nix ./setup/mini_conf.nix - ./git_system.nix { networking.hostId = "0a7337de"; boot.loader.grub.zfsSupport = true; diff --git a/git_system.nix b/git_system.nix index f766cb0..7a44a29 100644 --- a/git_system.nix +++ b/git_system.nix @@ -20,7 +20,7 @@ in ./shared/system.nix ./shared/dev_user.nix ./shared/docker.nix - ./shared/ssh.nix + # ./shared/ssh.nix ]; security.acme = { @@ -41,24 +41,24 @@ in # }; # }; - forgejo = { - enable = true; - database.type = "postgres"; - lfs.enable = true; - settings = { - server = { - DOMAIN = "188.40.66.217"; - ROOT_URL = "http://${srv.DOMAIN}"; - HTTP_PORT = 3000; - SSH_PORT = 62; - }; - service.DISABLE_REGISTRATION = true; - actions = { - ENABLED = true; - DEFAULT_ACTIONS_URL = "github"; - }; - }; - }; + # forgejo = { + # enable = true; + # database.type = "postgres"; + # lfs.enable = true; + # settings = { + # server = { + # DOMAIN = "188.40.66.217"; + # ROOT_URL = "http://${srv.DOMAIN}"; + # HTTP_PORT = 3000; + # SSH_PORT = 62; + # }; + # service.DISABLE_REGISTRATION = true; + # actions = { + # ENABLED = true; + # DEFAULT_ACTIONS_URL = "github"; + # }; + # }; + # }; renovate = { enable = true; diff --git a/shared/ssh.nix b/shared/ssh.nix index c283871..14971d1 100644 --- a/shared/ssh.nix +++ b/shared/ssh.nix @@ -1,17 +1,17 @@ { config, lib, pkgs, modulesPath, ... }: { services = { - # endlessh = { - # enable = true; - # port = 22; - # }; + endlessh = { + enable = true; + port = 22; + }; - # openssh = { - # enable = true; - # ports = [ 22 23 ]; - # # settings = { - # # AllowUsers = [ "dev" ]; - # # }; - # }; + openssh = { + enable = true; + ports = [ 23 ]; + settings = { + AllowUsers = [ "dev" ]; + }; + }; }; } \ No newline at end of file