diff options
| author | Jasper Ras <jras@hostnet.nl> | 2025-02-06 16:26:22 +0100 |
|---|---|---|
| committer | Jasper Ras <jras@hostnet.nl> | 2025-02-06 17:00:16 +0100 |
| commit | ab0adc9babc45fdff60024639f20cea5f6c41700 (patch) | |
| tree | 052b30b3dbccc177d326e1a970e206f5e6828c30 | |
| parent | 5a062ed4329468249ac3be240aeb65080816f764 (diff) | |
snorlax git stuff
| -rw-r--r-- | configuration/nix-settings.nix | 5 | ||||
| -rw-r--r-- | configuration/snorlax/default.nix | 6 | ||||
| -rw-r--r-- | configuration/snorlax/git.nix | 26 | ||||
| -rw-r--r-- | configuration/snorlax/gitea.nix | 2 |
4 files changed, 31 insertions, 8 deletions
diff --git a/configuration/nix-settings.nix b/configuration/nix-settings.nix index 189422c..d765c47 100644 --- a/configuration/nix-settings.nix +++ b/configuration/nix-settings.nix @@ -2,9 +2,6 @@ { nix.settings = { experimental-features = [ "nix-command" "flakes" ]; + trusted-users = [ "root" "jras" ]; }; - - nix.extraOptions = '' - trusted-users = root jras - ''; } diff --git a/configuration/snorlax/default.nix b/configuration/snorlax/default.nix index 8ed9169..fa60d0e 100644 --- a/configuration/snorlax/default.nix +++ b/configuration/snorlax/default.nix @@ -1,9 +1,11 @@ { ... }: { imports = [ - ./disk-config.nix - ./gitea.nix + ../nix-settings.nix ../users + + ./disk-config.nix + ./git.nix ]; networking.hostName = "snorlax"; diff --git a/configuration/snorlax/git.nix b/configuration/snorlax/git.nix new file mode 100644 index 0000000..e4cee27 --- /dev/null +++ b/configuration/snorlax/git.nix @@ -0,0 +1,26 @@ +{ pkgs, ... }: +{ + networking.firewall.allowedTCPPorts = [ 80 ]; + services.cgit.jap56 = { + enable = true; + group = "git"; + repos = { + nixos.desc = "Contains my NixOS configuration"; + nixos.path = "/var/lib/git/nixos.git"; + }; + }; + users.groups.git = {}; + users.users.git = { + isNormalUser = true; + home = "/var/lib/git"; + shell = pkgs.zsh; + group = "git"; + hashedPassword = "$6$Rc//lmBr5orYHn.0$M9y3Zj4zCe723r8hYGIhPC5kPv5SVGHjF1FsjrT9IIx7trxuNTLtLDQVL9lhmR5/7bFMUFEf0CMx9w7.vgXgY0"; + openssh.authorizedKeys.keyFiles = [ + ../../keys/id_tarrel.pub + ../../keys/id_work.pub + ]; + packages = with pkgs; [ git ]; + }; + services.openssh.settings.AllowUsers = [ "git" ]; +} diff --git a/configuration/snorlax/gitea.nix b/configuration/snorlax/gitea.nix index 8b814d9..6ad46e0 100644 --- a/configuration/snorlax/gitea.nix +++ b/configuration/snorlax/gitea.nix @@ -17,10 +17,8 @@ group = "git"; user = "git"; settings.server = { - HTTP_PORT = 80; DOMAIN = "snorlax"; }; - useWizard = true; }; services.openssh.settings.AllowUsers = [ "git" ]; |