aboutsummaryrefslogtreecommitdiffstats
path: root/hosts/common/optional/services
diff options
context:
space:
mode:
Diffstat (limited to 'hosts/common/optional/services')
-rw-r--r--hosts/common/optional/services/chrony.nix9
-rw-r--r--hosts/common/optional/services/dhcp.nix14
-rw-r--r--hosts/common/optional/services/nolid.nix8
-rw-r--r--hosts/common/optional/services/nsd/bitgnome.net.zone8
-rw-r--r--hosts/common/optional/services/openssh.nix3
-rw-r--r--hosts/common/optional/services/wayland.nix16
-rw-r--r--hosts/common/optional/services/xorg.nix109
7 files changed, 74 insertions, 93 deletions
diff --git a/hosts/common/optional/services/chrony.nix b/hosts/common/optional/services/chrony.nix
index 2687846..4f34044 100644
--- a/hosts/common/optional/services/chrony.nix
+++ b/hosts/common/optional/services/chrony.nix
@@ -1,8 +1,11 @@
{
services.chrony = {
enable = true;
- extraConfig = ''
- server time.cloudflare.com iburst nts
- '';
+ enableNTS = true;
+ servers = [
+ "ke.sectime.org" # https://sectime.org/use
+ "oregon.time.system76.com" # https://github.com/jauderho/nts-servers
+ "time.cloudflare.com"
+ ];
};
}
diff --git a/hosts/common/optional/services/dhcp.nix b/hosts/common/optional/services/dhcp.nix
index cc21ef9..4bd9477 100644
--- a/hosts/common/optional/services/dhcp.nix
+++ b/hosts/common/optional/services/dhcp.nix
@@ -7,10 +7,10 @@
"tftp/undionly.kpxe".source = "${pkgs.ipxe}/undionly.kpxe";
};
- systemPackages = with pkgs; [
- ipxe
- master.tftp-hpa
- master.wol
+ systemPackages = [
+ pkgs.ipxe
+ pkgs.tftp-hpa
+ pkgs.wol
];
};
@@ -99,13 +99,17 @@
];
reservations = [
+ ({ hw-address = "3c:78:95:e0:fc:3a"; ip-address = "192.168.1.10"; }) # mister
({ hw-address = "8c:8c:aa:4e:e9:8c"; ip-address = "192.168.1.11"; }) # jupiter
({ hw-address = "38:f3:ab:59:06:e0"; ip-address = "192.168.1.12"; }) # saturn
({ hw-address = "8c:8c:aa:4e:fc:aa"; ip-address = "192.168.1.13"; }) # uranus
({ hw-address = "38:f3:ab:59:08:10"; ip-address = "192.168.1.14"; }) # neptune
+ ({ hw-address = "e8:8d:a6:e2:2a:85"; ip-address = "192.168.1.16"; }) # deck
({ hw-address = "7c:b5:66:65:e2:9e"; ip-address = "192.168.1.17"; }) # ginaz
+ ({ hw-address = "9c:13:9e:ed:f4:e8"; ip-address = "192.168.1.18"; }) # loadstar
({ hw-address = "00:05:cd:72:92:b0"; ip-address = "192.168.1.19"; }) # onkyo
({ hw-address = "74:29:af:6f:20:ed"; ip-address = "192.168.1.20"; }) # brother
+ ({ hw-address = "ce:b9:f3:eb:b5:10"; ip-address = "192.168.1.21"; }) # mister-lan
({ hw-address = "ec:08:6b:6a:4a:ac"; ip-address = "192.168.1.252"; }) # ac2600
];
}
@@ -123,7 +127,7 @@
Restart = "always";
RestartSec = 5;
Type = "exec";
- ExecStart = "${pkgs.master.tftp-hpa}/bin/in.tftpd -l -a 192.168.1.1:69 -P /run/tftpd.pid /etc/tftp";
+ ExecStart = "${pkgs.tftp-hpa}/bin/in.tftpd -l -a 192.168.1.1:69 -P /run/tftpd.pid /etc/tftp";
TimeoutStopSec = 20;
PIDFile = "/run/tftpd.pid";
};
diff --git a/hosts/common/optional/services/nolid.nix b/hosts/common/optional/services/nolid.nix
index db868fe..7346c26 100644
--- a/hosts/common/optional/services/nolid.nix
+++ b/hosts/common/optional/services/nolid.nix
@@ -1,7 +1,7 @@
{
- services.logind = {
- lidSwitch = "ignore";
- lidSwitchDocked = "ignore";
- lidSwitchExternalPower = "ignore";
+ services.logind.settings.Login = {
+ HandleLidSwitch = "ignore";
+ HandleLidSwitchDocked = "ignore";
+ HandleLidSwitchExternalPower = "ignore";
};
}
diff --git a/hosts/common/optional/services/nsd/bitgnome.net.zone b/hosts/common/optional/services/nsd/bitgnome.net.zone
index f421fb9..b37043b 100644
--- a/hosts/common/optional/services/nsd/bitgnome.net.zone
+++ b/hosts/common/optional/services/nsd/bitgnome.net.zone
@@ -3,7 +3,7 @@ $ORIGIN bitgnome.net.
$TTL 1h
@ in soa ns.bitgnome.net. nipsy.bitgnome.net. (
- 2025010101 ; serial
+ 2026090801 ; serial
1d ; refresh
2h ; retry
4w ; expire
@@ -29,7 +29,7 @@ $TTL 1h
; name servers
ns in a 5.161.149.85
ns in aaaa 2a01:4ff:f0:e164::1
-ns2 in a 67.5.101.192
+ns2 in a 174.31.26.193
; srv records
_xmpp-client._tcp 5m in srv 0 0 5222 bitgnome.net.
@@ -67,10 +67,10 @@ mta-sts 5m in cname @
;royder in cname @
; external machines
-arrakis 1m in a 67.5.101.192
+arrakis 1m in a 174.31.26.193
;darkstar 1m in a 66.69.213.114
;nb 1m in a 67.10.209.108
;terraria 1m in a 128.83.27.4
;caladan 1m in a 104.130.129.241
;caladan 1m in aaaa 2001:4800:7818:101:be76:4eff:fe03:db44
-darkstar 1m in a 67.5.101.192
+darkstar 1m in a 174.31.26.193
diff --git a/hosts/common/optional/services/openssh.nix b/hosts/common/optional/services/openssh.nix
index 424d3bf..2bd7caf 100644
--- a/hosts/common/optional/services/openssh.nix
+++ b/hosts/common/optional/services/openssh.nix
@@ -1,4 +1,7 @@
+{ pkgs, ... }:
{
+ #programs.ssh.package = pkgs.openssh_10_2;
+
services.openssh = {
enable = true;
settings = {
diff --git a/hosts/common/optional/services/wayland.nix b/hosts/common/optional/services/wayland.nix
new file mode 100644
index 0000000..501e173
--- /dev/null
+++ b/hosts/common/optional/services/wayland.nix
@@ -0,0 +1,16 @@
+{ pkgs, ... }:
+{
+ environment.systemPackages = [
+ pkgs.grim
+ pkgs.wev
+ pkgs.wl-clipboard
+ pkgs.wlvncc
+ ];
+
+ programs = {
+ sway = {
+ enable = true;
+ wrapperFeatures.gtk = true;
+ };
+ };
+}
diff --git a/hosts/common/optional/services/xorg.nix b/hosts/common/optional/services/xorg.nix
index c9aaeaa..9852a51 100644
--- a/hosts/common/optional/services/xorg.nix
+++ b/hosts/common/optional/services/xorg.nix
@@ -1,47 +1,11 @@
-{ pkgs, ... }:
+{ config, lib, pkgs, ... }:
{
- #environment.systemPackages = builtins.attrValues {
- # inherit (pkgs)
- environment.systemPackages = with pkgs; [
- evince
- feh
- gcr
- geeqie
- master.ghostty
- gimp
- #gimp-with-plugins
- google-chrome
- gv
- inkscape
- libreoffice
- libva-utils
- mesa-demos
- mpv
- polkit_gnome
- master.rdesktop
- read-edid
- st
- sxiv
- tigervnc
- turbovnc
- vdpauinfo
- vlc
- vulkan-tools
- wireshark
- x11vnc
- xclip
- xdotool
- xorg.appres
- xorg.editres
- xorg.xdpyinfo
- xorg.xev
- xscreensaver
- xsnow
- xterm#;
+ environment.systemPackages = [
+ #pkgs.tigervnc
+ pkgs.turbovnc
+ pkgs.x11vnc
+ pkgs.xscreensaver
];
- #};
-
- programs.firefox.enable = true;
security.polkit = {
enable = true;
@@ -63,42 +27,33 @@
'';
};
- services.blueman.enable = true;
- services.printing.enable = true;
- services.displayManager.defaultSession = "xsession";
- services.libinput.enable = true;
- services.xserver = {
- displayManager.lightdm = {
- enable = true;
- extraSeatDefaults = ''greeter-hide-users=true'';
+ services = {
+ displayManager = lib.mkIf (config.networking.hostName != "fangorn") {
+ defaultSession = "xsession";
};
-
- displayManager.session = [
- {
- manage = "desktop";
- name = "xsession";
- start = ''exec $HOME/.xsession'';
- }
- ];
-
- enable = true;
- xkb.layout = "us";
- xkb.options = "caps:super,compose:ralt";
- };
-
- systemd = {
- user.services.polkit-gnome-authentication-agent-1 = {
- description = "polkit-gnome-authentication-agent-1";
- wantedBy = [ "graphical-session.target" ];
- wants = [ "graphical-session.target" ];
- after = [ "graphical-session.target" ];
- serviceConfig = {
- Type = "simple";
- ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
- Restart = "on-failure";
- RestartSec = 1;
- TimeoutStopSec = 10;
- };
+ picom.enable = true;
+ xserver = {
+ displayManager.lightdm = lib.mkMerge [
+ (lib.mkIf (config.networking.hostName == "fangorn") {
+ enable = true;
+ })
+ (lib.mkIf (config.networking.hostName != "fangorn") {
+ enable = true;
+ extraSeatDefaults = ''greeter-hide-users=true'';
+ })
+ ];
+
+ displayManager.session = lib.mkIf (config.networking.hostName != "fangorn") [
+ {
+ manage = "desktop";
+ name = "xsession";
+ start = ''exec $HOME/.xsession'';
+ }
+ ];
+
+ enable = true;
+ xkb.layout = "us";
+ xkb.options = "caps:super,compose:ralt";
};
};
}
generated by cgit v1.3.1 (git 2.54.0) at 2026-09-10 18:48:56 +0000