update heaps of shit

This commit is contained in:
Anish L 2022-07-19 16:52:41 +10:00
parent 0e39e84add
commit 483d9abc84
10 changed files with 27 additions and 12 deletions

View file

@ -130,7 +130,7 @@
}; };
suites = with profiles; rec { suites = with profiles; rec {
base = [ core users.root users.anish ]; base = [ core users.root users.anish ];
sealight = [ base server wireguard-server metrics ]; # rss-bridge gitea sealight-website matrix backup sealight = [ base server wireguard-server metrics gitea sealight-website matrix backup ]; # rss-bridge gitea sealight-website matrix backup
mossnet = [ base server taskd shaarli wallabag dns monitoring nfs rss-bridge gonic headphones radicale seafile syncthing dhyan ]; # hpi sync.music mossnet = [ base server taskd shaarli wallabag dns monitoring nfs rss-bridge gonic headphones radicale seafile syncthing dhyan ]; # hpi sync.music
cube = [ base site server ]; cube = [ base site server ];
graphical = [ base bluetooth music sync.kitaab sync.website sync.cal wifi desktop mimetypes ]; graphical = [ base bluetooth music sync.kitaab sync.website sync.cal wifi desktop mimetypes ];

View file

@ -78,7 +78,6 @@
# Enable the OpenSSH daemon. # Enable the OpenSSH daemon.
services.openssh.enable = true; services.openssh.enable = true;
services.openssh.permitRootLogin = "yes";
networking.firewall.allowedTCPPorts = [ 22 ]; networking.firewall.allowedTCPPorts = [ 22 ];
sound.enable = false; sound.enable = false;

View file

@ -8,6 +8,12 @@
imports = [ ] ++ suites.hmBase; imports = [ ] ++ suites.hmBase;
}; };
# Capsul specific
users.users.cyberian = {
isNormalUser = true;
extraGroups = [ "wheel" ];
};
mossnet.backup = { mossnet.backup = {
enable = false; enable = false;
name = "sealight"; name = "sealight";
@ -17,7 +23,7 @@
age.secrets.borg-password.file = "${self}/secrets/borg-password.age"; age.secrets.borg-password.file = "${self}/secrets/borg-password.age";
services.postgresqlBackup = { services.postgresqlBackup = {
enable = false; enable = false;
databases = [ "matrix" "gitea" ]; databases = [ "matrix-synapse" "gitea" ];
location = "/var/backup/postgresql"; location = "/var/backup/postgresql";
}; };
} }

View file

@ -2,11 +2,9 @@
nix = { nix = {
binaryCaches = [ binaryCaches = [
"https://nrdxp.cachix.org" "https://nrdxp.cachix.org"
"https://nix-community.cachix.org"
]; ];
binaryCachePublicKeys = [ binaryCachePublicKeys = [
"nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4=" "nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
]; ];
}; };
} }

View file

@ -44,6 +44,7 @@ in
scrot scrot
ripcord ripcord
feh feh
sxiv
xkblayout-state xkblayout-state
sublime-music sublime-music
vcv-rack vcv-rack

View file

@ -32,10 +32,10 @@
'' ''
gitea-users gitea gitea gitea-users gitea gitea
''; '';
# ensureDatabases = [ "gitea" ]; ensureDatabases = [ "gitea" ];
# ensureUsers = [ ensureUsers = [
# { name = "gitea"; ensurePermissions."DATABASE gitea" = "ALLPRIVLEGES"; } { name = "gitea"; ensurePermissions."DATABASE gitea" = "ALLPRIVLEGES"; }
# ]; ];
}; };
services.nginx = { services.nginx = {

View file

@ -7,5 +7,13 @@
"sxiv.desktop" "sxiv.desktop"
"feh.desktop" "feh.desktop"
]; ];
"image/jpg" = [
"sxiv.desktop"
"feh.desktop"
];
"image/jpeg" = [
"sxiv.desktop"
"feh.desktop"
];
}; };
} }

View file

@ -1,6 +1,10 @@
{ config, ... }: { config, ... }:
{ {
services.openssh.enable = true; services.openssh = {
enable = true;
passwordAuthentication = false;
permitRootLogin = "no";
};
networking.firewall.allowedTCPPorts = [ 80 433 22 ]; # ssh and website networking.firewall.allowedTCPPorts = [ 80 433 22 ]; # ssh and website
security.sudo.wheelNeedsPassword = false; # needed for deploy-rs security.sudo.wheelNeedsPassword = false; # needed for deploy-rs
} }

View file

@ -110,6 +110,5 @@ in
find ${dataDir} -type f ! -perm 0600 -exec chmod 0600 {} \; find ${dataDir} -type f ! -perm 0600 -exec chmod 0600 {} \;
''; '';
}; };
# TODO: Write the configuration file here?
#networking.firewall.allowedTCPPorts = [ 80 ]; #networking.firewall.allowedTCPPorts = [ 80 ];
} }

View file

@ -256,6 +256,6 @@
sm = "ssh 10.0.69.4"; # box over wireguard sm = "ssh 10.0.69.4"; # box over wireguard
smm = "ssh mossnet.lan"; # box regular smm = "ssh mossnet.lan"; # box regular
ss = "ssh sealight.xyz"; # helix ss = "ssh sealight.xyz"; # helix
sc = "ssh lakhwara.com"; # cube sl = "ssh 69.61.38.225"; # lituus
}; };
} }