bogale/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

desktop preparing

Browse source
This commit is contained in:
bogale 2026-09-26 22:11:24 +09:00
commit 79d3f7e89d
7 changed files with 65 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

33
common.nix
View file

@ -31,7 +31,10 @@
};
wg-quick.interfaces.awg0 = {
type = "amneziawg";
configFile = "/secrets/awg0.conf";
peers = [ {
endpoint = "bogaledev.ru";
allowedIPs = [ "::/0" "0.0.0.0/0" ];
} ];
};
networkmanager = {
enable = true;
@ -43,6 +46,14 @@
id = "home-wifi";
type = "wifi";
};
ipv6 = {
method = "manual";
gateway = "fc01::1";
};
ipv4 = {
method = "manual";
gateway = "10.1.0.1";
};
};
};
};
@ -51,20 +62,12 @@
jq
sbctl
];
programs = {
git = {
enable = true;
config = {
init.defaultbranch = "main";
user = {
name = "bogale";
email = "git@bogaledev.ru";
};
};
};
};
services = {
logind.settings.Login.HandleLidSwitch = "ignore";
openssh = {
enable = true;
settings.PasswordAuthentication = false;
};
nginx = {
enable = true;
recommendedTlsSettings = true;
@ -87,8 +90,8 @@
dhcp-boot = "grubx64.efi";
dhcp-range = [ "10.2.0.2,10.2.255.254,12h"
"fc02::2,fc02::ffff:ffff:ffff:ffff,12h" ];
server = [ "1.1.1.2" "2606:4700:4700::1112"
"1.0.0.2" "2606:4700:4700::1002" ];
server = [ "2606:4700:4700::1112" "1.1.1.2"
"2606:4700:4700::1002" "1.0.0.2" ];
};
};
};

20
desktop/configuration.nix
View file

@ -1,20 +1,30 @@
{ config, lib, pkgs, ... }:
{
imports = [ ../common.nix ./hardware-configuration.nix ];
networking = {
hostName = "nixos-desktop";
};
users.users = {
data = {
uid = 1256;
isNormalUser = true;
home = "/home/data";
hashedPasswordFile = "/secrets/user/data-pw";
};
bogale = {
uid = 1551;
isNormalUser = true;
home = "/home/bogale";
extraGroups = [ "wheel" ];
hashedPasswordFile = "/secrets/user/bogale-pw";
};
};
networking = {
hostName = "nixos-desktop";
wg-quick.interfaces.awg0 = {
configFile = "/secrets/awg/2.conf";
address = [ "fc00::3/128" "10.0.0.3/32" ];
};
networkmanager.ensureProfiles.profiles.home-wifi = {
wifi.ssid = "bogale_5";
ipv6.addresses = "fc01::3/64";
ipv4.addresses = "10.1.0.3/16";
wifi-security.psk = "$BOGALE_5_PSK";
};
};
}

16
home/common.nix
View file

@ -3,6 +3,7 @@
home.stateVersion = "26.05";
services.ssh-agent.enable = true;
home.packages = with pkgs; [
ncdu
yt-dlp
];
programs = {
@ -12,6 +13,21 @@
historyControl = [ "ignoreboth" ];
shellAliases = { la = "ls -lAtr"; };
};
ssh = {
enable = true;
enableDefaultConfig = false;
settings."*".SetEnv.TERM = "xterm-256color";
};
git = {
enable = true;
settings = {
init.defaultbranch = "main";
user = {
name = "bogale";
email = "git@bogaledev.ru";
};
};
};
neovim = {
enable = true;
defaultEditor = true;

16
server/configuration.nix
View file

@ -34,19 +34,15 @@
allowedTCPPorts = [ 25 443 587 993 ];
allowedUDPPorts = [ 443 ];
};
wg-quick.interfaces.awg0 = {
configFile = "/secrets/awg/1.conf";
address = [ "fc00::2/128" "10.0.0.2/32" ];
};
networkmanager.ensureProfiles.profiles.home-wifi = {
wifi.ssid = "bogale_2.4";
ipv6.addresses = "fc01::2/64";
ipv4.addresses = "10.1.0.2/16";
wifi-security.psk = "$BOGALE_2_4_PSK";
ipv4 = {
method = "manual";
gateway = "10.1.0.1";
addresses = "10.1.0.2/16";
};
ipv6 = {
method = "manual";
gateway = "fc01::1";
addresses = "fc01::2/64";
};
};
};
}

4
server/mods/mail.nix
View file

@ -1,5 +1,9 @@
{ config, lib, pkgs, ... }:
{
systemd.tmpfiles.rules = [
"d /var/spool/postfix 0775 postfix postfix -"
"d /var/spool/postfix/private 0770 postfix postfix -"
];
services = let
mailBase = "/var/spool/mail/vmail";
saslSocket = "/var/spool/postfix/private/auth";

10
server/mods/sysd.nix
View file

@ -1,14 +1,6 @@
{ config, lib, pkgs, ... }:
{
services.openssh = {
enable = true;
settings.PasswordAuthentication = false;
};
systemd = {
tmpfiles.rules = [
"d /var/spool/postfix 0755 postfix postfix -"
"d /var/spool/postfix/private 0755 postfix postfix -"
];
timers = {
tgbot-send = {
wantedBy = [ "timers.target" ];
@ -53,7 +45,7 @@
else
limit=$(cat /run/network.limit)
failures=$((1+$(cat /run/network.failures)))
echo "<5>failures = $failures"
[ $failures -gt 1 ] && echo "<5>failures = $failures"
fi
if [ $failures -ge $limit ]; then
echo "<4>restarting NetworkManager"

13
server/mods/web.nix
View file

@ -30,12 +30,9 @@
forgejo = {
enable = true;
database.type = "postgres";
settings = {
service.DISABLE_REGISTRATION = true;
server = {
HTTP_PORT = 8039;
ROOT_URL = "https://bogaledev.ru/git/";
};
settings.server = {
HTTP_PORT = 8039;
ROOT_URL = "https://bogaledev.ru/git/";
};
};
phpfpm.pools.php = {
@ -44,7 +41,7 @@
phpEnv = { PATH = "/run/current-system/sw/bin"; };
settings = {
"pm" = "ondemand";
"pm.max_children" = 8;
"pm.max_children" = 4;
"listen.owner" = "nginx";
"listen.group" = "nginx";
};
@ -88,6 +85,7 @@
add_header X-Content-Type-Options "nosniff" always;
'';
locations = {
"/git/".proxyPass = "http://127.0.0.1:8039/";
"/" = {
extraConfig = phpPool;
index = "index.php index.html";
@ -101,7 +99,6 @@
allow 10.1.0.0/16;
deny all;
'';
"/git/".proxyPass = "http://127.0.0.1:8039/";
"/vw/" = {
proxyWebsockets = true;
extraConfig = localNetworks;