aboutsummaryrefslogtreecommitdiffstats
path: root/hosts/common/optional
diff options
context:
space:
mode:
Diffstat (limited to 'hosts/common/optional')
-rw-r--r--hosts/common/optional/games.nix4
-rw-r--r--hosts/common/optional/google-authenticator.nix11
-rw-r--r--hosts/common/optional/misc.nix4
-rw-r--r--hosts/common/optional/pipewire.nix6
-rw-r--r--hosts/common/optional/printer.nix22
-rw-r--r--hosts/common/optional/sdr.nix1
-rw-r--r--hosts/common/optional/services/dhcp.nix1
-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.nix95
-rw-r--r--hosts/common/optional/services/xorg.nix63
-rw-r--r--hosts/common/optional/sound.nix18
-rw-r--r--hosts/common/optional/wdt.nix2
14 files changed, 194 insertions, 52 deletions
diff --git a/hosts/common/optional/games.nix b/hosts/common/optional/games.nix
index 71bcd95..8158c34 100644
--- a/hosts/common/optional/games.nix
+++ b/hosts/common/optional/games.nix
@@ -1,14 +1,12 @@
{ pkgs, ... }:
{
environment.systemPackages = [
- #pkgs.master.godot
+ pkgs.godot
pkgs.mame
pkgs.mame.tools
pkgs.mednafen
pkgs.mednaffe
pkgs.protontricks
- pkgs.winetricks
- pkgs.master.wineWowPackages.stagingFull
];
programs.steam = {
diff --git a/hosts/common/optional/google-authenticator.nix b/hosts/common/optional/google-authenticator.nix
index 721346e..87e43fd 100644
--- a/hosts/common/optional/google-authenticator.nix
+++ b/hosts/common/optional/google-authenticator.nix
@@ -1,9 +1,12 @@
{ pkgs, ... }:
{
- environment.systemPackages = [
- #pkgs.other
- pkgs.google-authenticator
- ];
+ environment = {
+ etc."pam.d/xscreensaver".source = "/etc/static/pam.d/xlock";
+ systemPackages = [
+ #pkgs.other
+ pkgs.google-authenticator
+ ];
+ };
security.pam.services = {
chfn.googleAuthenticator.enable = true;
diff --git a/hosts/common/optional/misc.nix b/hosts/common/optional/misc.nix
index df71ea0..a784324 100644
--- a/hosts/common/optional/misc.nix
+++ b/hosts/common/optional/misc.nix
@@ -1,6 +1,7 @@
{ pkgs, ... }:
{
environment.systemPackages = [
+ pkgs.amdgpu_top
pkgs.ansible
pkgs.aspell
pkgs.aspellDicts.en
@@ -19,7 +20,8 @@
pkgs.ipcalc
pkgs.iperf
pkgs.mutt
- pkgs.poppler_utils
+ pkgs.perf
+ pkgs.poppler-utils
pkgs.powertop
pkgs.qrencode
pkgs.radeontop
diff --git a/hosts/common/optional/pipewire.nix b/hosts/common/optional/pipewire.nix
index ef50b9c..f87dea4 100644
--- a/hosts/common/optional/pipewire.nix
+++ b/hosts/common/optional/pipewire.nix
@@ -2,7 +2,7 @@
{
environment.systemPackages = [
pkgs.easyeffects
- pkgs.pamixer
+ #pkgs.pamixer
pkgs.pavucontrol
pkgs.pwvucontrol
pkgs.qpwgraph
@@ -22,11 +22,11 @@
alsa.support32Bit = true;
enable = true;
jack.enable = true;
- package = pkgs.master.pipewire;
+ #package = pkgs.master.pipewire;
pulse.enable = true;
wireplumber = {
enable = true;
- package = pkgs.master.wireplumber;
+ #package = pkgs.master.wireplumber;
};
# use the example session manager (no others are packaged yet so this is enabled by default,
diff --git a/hosts/common/optional/printer.nix b/hosts/common/optional/printer.nix
new file mode 100644
index 0000000..32e4c76
--- /dev/null
+++ b/hosts/common/optional/printer.nix
@@ -0,0 +1,22 @@
+{ lib, ... }:
+{
+ hardware.printers = let
+ brother = "Brother_HL-L2340D";
+ ip = "192.168.1.20";
+ in {
+ ensureDefaultPrinter = brother;
+ ensurePrinters = [{
+ name = brother;
+ deviceUri = "ipp://${ip}/ipp";
+ model = "everywhere";
+ description = lib.replaceStrings [ "_" ] [ " " ] brother;
+ location = "home";
+ }];
+ };
+
+ systemd.services."ensure-printers" = {
+ after = [ "network-online.target" ];
+ preStart = "sleep 5";
+ wants = [ "network-online.target" ];
+ };
+}
diff --git a/hosts/common/optional/sdr.nix b/hosts/common/optional/sdr.nix
index 8362605..3ac2c3c 100644
--- a/hosts/common/optional/sdr.nix
+++ b/hosts/common/optional/sdr.nix
@@ -1,6 +1,7 @@
{ pkgs, ... }:
{
environment.systemPackages = [
+ pkgs.chirp
pkgs.fldigi
pkgs.sdrconnect
];
diff --git a/hosts/common/optional/services/dhcp.nix b/hosts/common/optional/services/dhcp.nix
index 36f8bdb..2492d05 100644
--- a/hosts/common/optional/services/dhcp.nix
+++ b/hosts/common/optional/services/dhcp.nix
@@ -103,6 +103,7 @@
({ 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 = "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
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 9ed4df5..b1988e3 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. (
- 2025052301 ; serial
+ 2025121201 ; 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.119.200
+ns2 in a 174.31.4.250
; 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.119.200
+arrakis 1m in a 174.31.4.250
;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.119.200
+darkstar 1m in a 174.31.4.250
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..493e0e4
--- /dev/null
+++ b/hosts/common/optional/services/wayland.nix
@@ -0,0 +1,95 @@
+{ config, lib, pkgs, ... }:
+{
+ environment.systemPackages = [
+ pkgs.chafa
+ pkgs.evince
+ pkgs.feh
+ pkgs.gcr
+ #pkgs.geeqie
+ pkgs.ghostty
+ pkgs.gimp3
+ #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.swayimg
+ pkgs.sxiv
+ #pkgs.tigervnc
+ #pkgs.turbovnc
+ pkgs.vdpauinfo
+ pkgs.vlc
+ pkgs.vulkan-tools
+ pkgs.wireshark
+ pkgs.wl-clipboard
+ pkgs.wlvncc
+ #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 e0150f4..0c5ca0c 100644
--- a/hosts/common/optional/services/xorg.nix
+++ b/hosts/common/optional/services/xorg.nix
@@ -5,9 +5,9 @@
pkgs.evince
pkgs.feh
pkgs.gcr
- pkgs.geeqie
+ #pkgs.geeqie
pkgs.ghostty
- pkgs.gimp
+ pkgs.gimp3
#pkgs.gimp-with-plugins
pkgs.google-chrome
pkgs.gv
@@ -15,6 +15,7 @@
pkgs.kdePackages.okular
pkgs.libreoffice
pkgs.libva-utils
+ pkgs.mangohud
pkgs.mesa-demos
pkgs.mpv
pkgs.polkit_gnome
@@ -22,7 +23,7 @@
pkgs.read-edid
pkgs.st
pkgs.sxiv
- pkgs.tigervnc
+ #pkgs.tigervnc
pkgs.turbovnc
pkgs.vdpauinfo
pkgs.vlc
@@ -40,29 +41,45 @@
pkgs.xterm
];
- programs.firefox = {
- enable = true;
- package = pkgs.master.firefox;
+ programs = {
+ dconf = {
+ enable = true;
+ profiles.user.databases = [{
+ settings."org/gnome/desktop/interface".color-scheme = "prefer-dark";
+ }];
+ };
+
+ firefox = {
+ enable = true;
+ #package = pkgs.master.firefox;
+ };
};
- security.polkit = {
- enable = true;
- extraConfig = ''
- polkit.addRule(function(action, subject) {
- if (
- subject.isInGroup("users")
- && (
- action.id == "org.freedesktop.login1.reboot" ||
- action.id == "org.freedesktop.login1.reboot-multiple-sessions" ||
- action.id == "org.freedesktop.login1.power-off" ||
- action.id == "org.freedesktop.login1.power-off-multiple-sessions"
+ security = {
+ pam = {
+ loginLimits = [
+ { domain = "@users"; item = "rtprio"; type = "-"; value = 1; }
+ ];
+ };
+ polkit = {
+ enable = true;
+ extraConfig = ''
+ polkit.addRule(function(action, subject) {
+ if (
+ subject.isInGroup("users")
+ && (
+ action.id == "org.freedesktop.login1.reboot" ||
+ action.id == "org.freedesktop.login1.reboot-multiple-sessions" ||
+ action.id == "org.freedesktop.login1.power-off" ||
+ action.id == "org.freedesktop.login1.power-off-multiple-sessions"
+ )
)
- )
- {
- return polkit.Result.YES;
- }
- })
- '';
+ {
+ return polkit.Result.YES;
+ }
+ })
+ '';
+ };
};
services = {
diff --git a/hosts/common/optional/sound.nix b/hosts/common/optional/sound.nix
index bc77050..1750ba6 100644
--- a/hosts/common/optional/sound.nix
+++ b/hosts/common/optional/sound.nix
@@ -2,17 +2,17 @@
{
environment = {
systemPackages = [
- pkgs.artyFX
+ #pkgs.artyFX
pkgs.audacity
pkgs.bespokesynth
pkgs.boops
pkgs.cardinal
- pkgs.carla
- pkgs.chow-tape-model
+ #pkgs.carla
+ #pkgs.chow-tape-model
pkgs.cmus
pkgs.distrho-ports
pkgs.fluidsynth
- #pkgs.master.fmsynth
+ #pkgs.fmsynth
#pkgs.gearmulator
pkgs.geonkick
pkgs.guitarix
@@ -21,18 +21,18 @@
pkgs.lsp-plugins
pkgs.metersLv2
pkgs.odin2
- pkgs.master.oxefmsynth
+ pkgs.oxefmsynth
pkgs.polyphone
pkgs.qsynth
pkgs.reaper
pkgs.rosegarden
pkgs.samplv1
pkgs.sfizz
- pkgs.sorcer
+ #pkgs.sorcer
pkgs.surge-XT
pkgs.synthv1
pkgs.talentedhack
- #pkgs.master.tunefish
+ #pkgs.tunefish
pkgs.v4l-utils
pkgs.vapoursynth
pkgs.vital
@@ -41,8 +41,8 @@
pkgs.wavpack
pkgs.winetricks
pkgs.master.wineWowPackages.stagingFull
- pkgs.master.yabridge
- pkgs.master.yabridgectl
+ pkgs.yabridge
+ pkgs.yabridgectl
pkgs.yoshimi
pkgs.zam-plugins
pkgs.zynaddsubfx
diff --git a/hosts/common/optional/wdt.nix b/hosts/common/optional/wdt.nix
index 3c3943e..3d60706 100644
--- a/hosts/common/optional/wdt.nix
+++ b/hosts/common/optional/wdt.nix
@@ -1,3 +1,3 @@
{
- systemd.watchdog.runtimeTime = "60s";
+ systemd.settings.Manager.RuntimeWatchdogSec = "60s";
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-15 21:11:59 +0000