aboutsummaryrefslogtreecommitdiffstats
path: root/hosts/common/optional/services
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--hosts/common/optional/services/dhcp.nix10
-rw-r--r--hosts/common/optional/services/nsd/bitgnome.net.zone8
-rw-r--r--hosts/common/optional/services/wayland.nix93
-rw-r--r--hosts/common/optional/services/xorg.nix132
4 files changed, 174 insertions, 69 deletions
diff --git a/hosts/common/optional/services/dhcp.nix b/hosts/common/optional/services/dhcp.nix
index cc21ef9..36f8bdb 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
];
};
@@ -123,7 +123,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/nsd/bitgnome.net.zone b/hosts/common/optional/services/nsd/bitgnome.net.zone
index f421fb9..b272962 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
+ 2025070201 ; 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 67.5.121.47
; 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 67.5.121.47
;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 67.5.121.47
diff --git a/hosts/common/optional/services/wayland.nix b/hosts/common/optional/services/wayland.nix
new file mode 100644
index 0000000..20c9996
--- /dev/null
+++ b/hosts/common/optional/services/wayland.nix
@@ -0,0 +1,93 @@
+{ config, lib, pkgs, ... }:
+{
+ environment.systemPackages = [
+ pkgs.chafa
+ pkgs.evince
+ pkgs.feh
+ pkgs.gcr
+ pkgs.geeqie
+ pkgs.ghostty
+ pkgs.gimp
+ #pkgs.gimp-with-plugins
+ pkgs.google-chrome
+ pkgs.grim
+ pkgs.gv
+ pkgs.inkscape
+ pkgs.kdePackages.okular
+ pkgs.libreoffice
+ pkgs.libva-utils
+ pkgs.mako
+ pkgs.mangohud
+ pkgs.mesa-demos
+ pkgs.mpv
+ pkgs.polkit_gnome
+ pkgs.rdesktop
+ pkgs.read-edid
+ pkgs.slurp
+ pkgs.st
+ pkgs.sxiv
+ pkgs.tigervnc
+ pkgs.turbovnc
+ pkgs.vdpauinfo
+ pkgs.vlc
+ pkgs.vulkan-tools
+ pkgs.wireshark
+ pkgs.wl-clipboard
+ pkgs.x11vnc
+ pkgs.xclip
+ pkgs.xdotool
+ pkgs.xorg.appres
+ pkgs.xorg.editres
+ pkgs.xorg.xdpyinfo
+ pkgs.xorg.xev
+ pkgs.xscreensaver
+ pkgs.xsnow
+ pkgs.xterm
+ ];
+
+ programs = {
+ firefox = {
+ enable = true;
+ package = pkgs.master.firefox;
+ };
+
+ gamemode.enable = true;
+
+ steam.gamescopeSession.enable = true;
+
+ sway = {
+ enable = true;
+ wrapperFeatures.gtk = true;
+ };
+ };
+
+ security = {
+ pam = {
+ loginLimits = [
+ { domain = "@users"; item = "rtprio"; type = "-"; value = 1; }
+ ];
+ };
+ };
+
+ services = {
+ blueman.enable = true;
+ libinput.enable = true;
+ printing.enable = true;
+ };
+
+ 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;
+ };
+ };
+ };
+}
diff --git a/hosts/common/optional/services/xorg.nix b/hosts/common/optional/services/xorg.nix
index c9aaeaa..e0150f4 100644
--- a/hosts/common/optional/services/xorg.nix
+++ b/hosts/common/optional/services/xorg.nix
@@ -1,47 +1,49 @@
-{ 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.chafa
+ pkgs.evince
+ pkgs.feh
+ pkgs.gcr
+ pkgs.geeqie
+ pkgs.ghostty
+ pkgs.gimp
+ #pkgs.gimp-with-plugins
+ pkgs.google-chrome
+ pkgs.gv
+ pkgs.inkscape
+ pkgs.kdePackages.okular
+ pkgs.libreoffice
+ pkgs.libva-utils
+ pkgs.mesa-demos
+ pkgs.mpv
+ pkgs.polkit_gnome
+ pkgs.rdesktop
+ pkgs.read-edid
+ pkgs.st
+ pkgs.sxiv
+ pkgs.tigervnc
+ pkgs.turbovnc
+ pkgs.vdpauinfo
+ pkgs.vlc
+ pkgs.vulkan-tools
+ pkgs.wireshark
+ pkgs.x11vnc
+ pkgs.xclip
+ pkgs.xdotool
+ pkgs.xorg.appres
+ pkgs.xorg.editres
+ pkgs.xorg.xdpyinfo
+ pkgs.xorg.xev
+ pkgs.xscreensaver
+ pkgs.xsnow
+ pkgs.xterm
];
- #};
- programs.firefox.enable = true;
+ programs.firefox = {
+ enable = true;
+ package = pkgs.master.firefox;
+ };
security.polkit = {
enable = true;
@@ -63,27 +65,37 @@
'';
};
- services.blueman.enable = true;
- services.printing.enable = true;
- services.displayManager.defaultSession = "xsession";
- services.libinput.enable = true;
- services.xserver = {
- displayManager.lightdm = {
+ services = {
+ blueman.enable = true;
+ displayManager = lib.mkIf (config.networking.hostName != "fangorn") {
+ defaultSession = "xsession";
+ };
+ libinput.enable = true;
+ picom.enable = true;
+ printing.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;
- extraSeatDefaults = ''greeter-hide-users=true'';
+ xkb.layout = "us";
+ xkb.options = "caps:super,compose:ralt";
};
-
- displayManager.session = [
- {
- manage = "desktop";
- name = "xsession";
- start = ''exec $HOME/.xsession'';
- }
- ];
-
- enable = true;
- xkb.layout = "us";
- xkb.options = "caps:super,compose:ralt";
};
systemd = {
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-03 18:24:46 +0000