Compare commits
6 commits
2a32b0613d
...
0a3a4a05ad
Author | SHA1 | Date | |
---|---|---|---|
|
0a3a4a05ad | ||
|
64f3563239 | ||
|
24f0a5eb04 | ||
|
e34a7723d3 | ||
|
5daf7e41b5 | ||
|
a8671855af |
9 changed files with 14 additions and 11 deletions
|
@ -141,7 +141,7 @@
|
||||||
./hosts/bebop/pihole.nix
|
./hosts/bebop/pihole.nix
|
||||||
./hosts/bebop/ssh.nix
|
./hosts/bebop/ssh.nix
|
||||||
./hosts/bebop/cloudflared.nix
|
./hosts/bebop/cloudflared.nix
|
||||||
./hosts/bebop/gitea.nix
|
./hosts/bebop/forgejo.nix
|
||||||
|
|
||||||
agenix.nixosModules.age
|
agenix.nixosModules.age
|
||||||
./hosts/bebop/secrets/agenix.nix
|
./hosts/bebop/secrets/agenix.nix
|
||||||
|
|
|
@ -2,21 +2,21 @@
|
||||||
{
|
{
|
||||||
environment.systemPackages = [ pkgs.forgejo ];
|
environment.systemPackages = [ pkgs.forgejo ];
|
||||||
|
|
||||||
users.users."gitea".openssh.authorizedKeys.keys = [
|
users.users."forgejo".openssh.authorizedKeys.keys = [
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPLfc2MW5f4Qn1ifAjPPSTRjDST9Bpwn4M8pWvtYrlnY nixos@wsl@hermes"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPLfc2MW5f4Qn1ifAjPPSTRjDST9Bpwn4M8pWvtYrlnY nixos@wsl@hermes"
|
||||||
];
|
];
|
||||||
|
|
||||||
services = {
|
services = {
|
||||||
gitea = {
|
forgejo = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.forgejo;
|
package = pkgs.forgejo;
|
||||||
appName = "bhankas/forgejo";
|
|
||||||
useWizard = false;
|
useWizard = false;
|
||||||
database = {
|
database = {
|
||||||
type = "postgres";
|
type = "postgres";
|
||||||
};
|
};
|
||||||
lfs.enable = false;
|
lfs.enable = false;
|
||||||
settings = {
|
settings = {
|
||||||
|
DEFAULT.APP_NAME = "bhankas/forgejo";
|
||||||
mailer = {
|
mailer = {
|
||||||
ENABLED = true;
|
ENABLED = true;
|
||||||
MAILER_TYPE = "sendmail";
|
MAILER_TYPE = "sendmail";
|
|
@ -55,7 +55,7 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
matchBlocks = {
|
matchBlocks = {
|
||||||
"ssh.bhankas.org" = {
|
"ssh.bhankas.org" = {
|
||||||
user = "gitea";
|
user = "forgejo";
|
||||||
hostname = "ssh.bhankas.org";
|
hostname = "ssh.bhankas.org";
|
||||||
identityFile = [ "~/.ssh/id_ed25519" ];
|
identityFile = [ "~/.ssh/id_ed25519" ];
|
||||||
proxyCommand = "${pkgs.cloudflared}/bin/cloudflared access ssh --hostname %h";
|
proxyCommand = "${pkgs.cloudflared}/bin/cloudflared access ssh --hostname %h";
|
||||||
|
|
|
@ -56,7 +56,7 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
matchBlocks = {
|
matchBlocks = {
|
||||||
"ssh.bhankas.org" = {
|
"ssh.bhankas.org" = {
|
||||||
user = "gitea";
|
user = "forgejo";
|
||||||
hostname = "ssh.bhankas.org";
|
hostname = "ssh.bhankas.org";
|
||||||
identityFile = [ "~/.ssh/id_ed25519" ];
|
identityFile = [ "~/.ssh/id_ed25519" ];
|
||||||
proxyCommand = "${pkgs.cloudflared}/bin/cloudflared access ssh --hostname %h";
|
proxyCommand = "${pkgs.cloudflared}/bin/cloudflared access ssh --hostname %h";
|
||||||
|
|
|
@ -45,7 +45,7 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
matchBlocks = {
|
matchBlocks = {
|
||||||
"ssh.bhankas.org" = {
|
"ssh.bhankas.org" = {
|
||||||
user = "gitea";
|
user = "forgejo";
|
||||||
hostname = "ssh.bhankas.org";
|
hostname = "ssh.bhankas.org";
|
||||||
identityFile = [ "~/.ssh/id_ed25519" ];
|
identityFile = [ "~/.ssh/id_ed25519" ];
|
||||||
proxyCommand = "${pkgs.cloudflared}/bin/cloudflared access ssh --hostname %h";
|
proxyCommand = "${pkgs.cloudflared}/bin/cloudflared access ssh --hostname %h";
|
||||||
|
|
|
@ -875,9 +875,11 @@ mu4e + mbsync + msmtp:
|
||||||
:after (consult)
|
:after (consult)
|
||||||
:commands eglot eglot-ensure
|
:commands eglot eglot-ensure
|
||||||
|
|
||||||
|
:hook (nix-ts-mode . eglot-ensure)
|
||||||
|
|
||||||
:config
|
:config
|
||||||
(delete '(nix-mode "rnix-lsp") eglot-server-programs)
|
(delete '(nix-mode "rnix-lsp") eglot-server-programs)
|
||||||
(add-to-list 'eglot-server-programs '(nix-mode . ("nil")))
|
(add-to-list 'eglot-server-programs '(nix-ts-mode . ("nil")))
|
||||||
|
|
||||||
(add-to-list 'eglot-server-programs '(gleam-ts-mode . ("gleam" "lsp")))
|
(add-to-list 'eglot-server-programs '(gleam-ts-mode . ("gleam" "lsp")))
|
||||||
|
|
||||||
|
@ -887,7 +889,7 @@ mu4e + mbsync + msmtp:
|
||||||
eglot-extend-to-xref t)
|
eglot-extend-to-xref t)
|
||||||
|
|
||||||
(setq-default eglot-workspace-configuration
|
(setq-default eglot-workspace-configuration
|
||||||
'(:nil (:formatting (:command ["nixpkgs-fmt"])
|
'(:nil (:formatting (:command ["nixfmt"])
|
||||||
:nix (:flake (:autoArchive t
|
:nix (:flake (:autoArchive t
|
||||||
:autoEvalInputs t
|
:autoEvalInputs t
|
||||||
:nixpkgsInputName "nixpkgs"))))))
|
:nixpkgsInputName "nixpkgs"))))))
|
||||||
|
|
|
@ -52,6 +52,7 @@ in
|
||||||
all-the-icons
|
all-the-icons
|
||||||
treesit-grammars.with-all-grammars
|
treesit-grammars.with-all-grammars
|
||||||
modus-themes
|
modus-themes
|
||||||
|
eglot
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -140,7 +140,7 @@ in
|
||||||
|
|
||||||
# Show data with fancy graphs
|
# Show data with fancy graphs
|
||||||
grafana = {
|
grafana = {
|
||||||
enable = true;
|
enable = false;
|
||||||
provision = {
|
provision = {
|
||||||
enable = true;
|
enable = true;
|
||||||
datasources.settings.datasources = [
|
datasources.settings.datasources = [
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
port = 28981;
|
port = 28981;
|
||||||
consumptionDirIsPublic = true;
|
consumptionDirIsPublic = true;
|
||||||
passwordFile = "/run/agenix/etebase";
|
passwordFile = "/run/agenix/etebase";
|
||||||
extraConfig = {
|
settings = {
|
||||||
PAPERLESS_OCR_LANGUAGE = "eng";
|
PAPERLESS_OCR_LANGUAGE = "eng";
|
||||||
PAPERLESS_URL = "https://paperless.bhankas.org";
|
PAPERLESS_URL = "https://paperless.bhankas.org";
|
||||||
PAPERLESS_ALLOWED_HOSTS = "127.0.0.1,paperless.bhankas.org";
|
PAPERLESS_ALLOWED_HOSTS = "127.0.0.1,paperless.bhankas.org";
|
||||||
|
|
Reference in a new issue