aboutsummaryrefslogtreecommitdiffstats
path: root/hosts/common/optional
diff options
context:
space:
mode:
Diffstat (limited to 'hosts/common/optional')
-rw-r--r--hosts/common/optional/db.nix9
-rw-r--r--hosts/common/optional/dev.nix33
-rw-r--r--hosts/common/optional/ebooks.nix6
-rw-r--r--hosts/common/optional/games.nix16
-rw-r--r--hosts/common/optional/google-authenticator.nix10
-rw-r--r--hosts/common/optional/misc.nix58
-rw-r--r--hosts/common/optional/multimedia.nix15
-rw-r--r--hosts/common/optional/pipewire.nix16
-rw-r--r--hosts/common/optional/printer.nix22
-rw-r--r--hosts/common/optional/sdr.nix10
-rw-r--r--hosts/common/optional/services/dhcp.nix9
-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.nix133
-rw-r--r--hosts/common/optional/sound.nix90
-rw-r--r--hosts/common/optional/wdt.nix2
18 files changed, 339 insertions, 204 deletions
diff --git a/hosts/common/optional/db.nix b/hosts/common/optional/db.nix
index af6766e..d4410bd 100644
--- a/hosts/common/optional/db.nix
+++ b/hosts/common/optional/db.nix
@@ -1,8 +1,7 @@
{ pkgs, ... }:
{
- environment.systemPackages = builtins.attrValues {
- inherit (pkgs)
- mariadb
- postgresql;
- };
+ environment.systemPackages = [
+ pkgs.mariadb
+ pkgs.postgresql
+ ];
}
diff --git a/hosts/common/optional/dev.nix b/hosts/common/optional/dev.nix
index c25ab08..8238424 100644
--- a/hosts/common/optional/dev.nix
+++ b/hosts/common/optional/dev.nix
@@ -1,20 +1,19 @@
{ pkgs, ... }:
{
- environment.systemPackages = builtins.attrValues {
- inherit (pkgs)
- autoconf
- automake
- cargo
- cmake
- gcc
- go
- nasm
- perl
- pkg-config
- python3
- rustc
- virtualenv
- yasm
- zig;
- };
+ environment.systemPackages = [
+ pkgs.autoconf
+ pkgs.automake
+ pkgs.cargo
+ pkgs.cmake
+ pkgs.gcc
+ pkgs.go
+ pkgs.nasm
+ pkgs.perl
+ pkgs.pkg-config
+ pkgs.python3
+ pkgs.rustc
+ pkgs.virtualenv
+ pkgs.yasm
+ pkgs.zig
+ ];
}
diff --git a/hosts/common/optional/ebooks.nix b/hosts/common/optional/ebooks.nix
index e25a76d..1805b7a 100644
--- a/hosts/common/optional/ebooks.nix
+++ b/hosts/common/optional/ebooks.nix
@@ -1,8 +1,8 @@
{ pkgs, ... }:
{
- environment.systemPackages = with pkgs; [
- libgourou
- calibre
+ environment.systemPackages = [
+ pkgs.libgourou
+ pkgs.calibre
];
services.udisks2.enable = true;
diff --git a/hosts/common/optional/games.nix b/hosts/common/optional/games.nix
index 77f14e4..8158c34 100644
--- a/hosts/common/optional/games.nix
+++ b/hosts/common/optional/games.nix
@@ -1,14 +1,12 @@
{ pkgs, ... }:
{
- environment.systemPackages = with pkgs; [
- #master.godot
- mame
- mame.tools
- mednafen
- mednaffe
- protontricks
- winetricks
- wineWowPackages.stagingFull
+ environment.systemPackages = [
+ pkgs.godot
+ pkgs.mame
+ pkgs.mame.tools
+ pkgs.mednafen
+ pkgs.mednaffe
+ pkgs.protontricks
];
programs.steam = {
diff --git a/hosts/common/optional/google-authenticator.nix b/hosts/common/optional/google-authenticator.nix
index 09079d8..87e43fd 100644
--- a/hosts/common/optional/google-authenticator.nix
+++ b/hosts/common/optional/google-authenticator.nix
@@ -1,9 +1,11 @@
{ pkgs, ... }:
{
- environment.systemPackages = builtins.attrValues {
- inherit (pkgs)
- #other
- google-authenticator;
+ environment = {
+ etc."pam.d/xscreensaver".source = "/etc/static/pam.d/xlock";
+ systemPackages = [
+ #pkgs.other
+ pkgs.google-authenticator
+ ];
};
security.pam.services = {
diff --git a/hosts/common/optional/misc.nix b/hosts/common/optional/misc.nix
index 492d13f..a784324 100644
--- a/hosts/common/optional/misc.nix
+++ b/hosts/common/optional/misc.nix
@@ -1,37 +1,39 @@
{ pkgs, ... }:
{
- environment.systemPackages = with pkgs; [
- ansible
- aspell
- aspellDicts.en
- aspellDicts.en-computers
- aspellDicts.en-science
- dict
- encfs
- enscript
- expect
- fio
- fortune
- ghostscript
- imagemagick
- inxi
- iotop
- ipcalc
- iperf
- mutt
- poppler_utils
- powertop
- qrencode
- radeontop
- speedtest-cli
- sshfs
- (weechat.override {
+ environment.systemPackages = [
+ pkgs.amdgpu_top
+ pkgs.ansible
+ pkgs.aspell
+ pkgs.aspellDicts.en
+ pkgs.aspellDicts.en-computers
+ pkgs.aspellDicts.en-science
+ pkgs.dict
+ pkgs.encfs
+ pkgs.enscript
+ pkgs.expect
+ pkgs.fio
+ pkgs.fortune
+ pkgs.ghostscript
+ pkgs.imagemagick
+ pkgs.inxi
+ pkgs.iotop
+ pkgs.ipcalc
+ pkgs.iperf
+ pkgs.mutt
+ pkgs.perf
+ pkgs.poppler-utils
+ pkgs.powertop
+ pkgs.qrencode
+ pkgs.radeontop
+ pkgs.speedtest-cli
+ pkgs.sshfs
+ (pkgs.weechat.override {
configure = { availablePlugins, ...}: {
plugins = with availablePlugins; [
(perl.withPackages(p: [ p.PodParser ]))
] ++ [ python ];
- scripts = with pkgs.weechatScripts; [
- wee-slack
+ scripts = [
+ pkgs.weechatScripts.wee-slack
];
};
})
diff --git a/hosts/common/optional/multimedia.nix b/hosts/common/optional/multimedia.nix
index f519992..03f8c03 100644
--- a/hosts/common/optional/multimedia.nix
+++ b/hosts/common/optional/multimedia.nix
@@ -1,13 +1,10 @@
{ pkgs, ... }:
{
- #environment.systemPackages = builtins.attrValues {
- # inherit (pkgs)
- environment.systemPackages = with pkgs; [
- ffmpeg
- flac
- lame
- mkvtoolnix-cli
- x265#;
+ environment.systemPackages = [
+ pkgs.ffmpeg
+ pkgs.flac
+ pkgs.lame
+ pkgs.mkvtoolnix-cli
+ pkgs.x265
];
- #};
}
diff --git a/hosts/common/optional/pipewire.nix b/hosts/common/optional/pipewire.nix
index a2c9b1a..f87dea4 100644
--- a/hosts/common/optional/pipewire.nix
+++ b/hosts/common/optional/pipewire.nix
@@ -1,11 +1,11 @@
{ pkgs, ... }:
{
- environment.systemPackages = with pkgs; [
- easyeffects
- pamixer
- pavucontrol
- pwvucontrol
- qpwgraph
+ environment.systemPackages = [
+ pkgs.easyeffects
+ #pkgs.pamixer
+ pkgs.pavucontrol
+ pkgs.pwvucontrol
+ pkgs.qpwgraph
];
security.pam.loginLimits = [
@@ -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 8e1e5d2..3ac2c3c 100644
--- a/hosts/common/optional/sdr.nix
+++ b/hosts/common/optional/sdr.nix
@@ -1,10 +1,10 @@
{ pkgs, ... }:
{
- environment.systemPackages = builtins.attrValues {
- inherit (pkgs)
- fldigi
- sdrconnect;
- };
+ environment.systemPackages = [
+ pkgs.chirp
+ pkgs.fldigi
+ pkgs.sdrconnect
+ ];
services.udev.extraRules = ''
SUBSYSTEM=="usb",ENV{DEVTYPE}=="usb_device",ATTRS{idVendor}=="1df7",ATTRS{idProduct}=="2500",MODE:="0666"
diff --git a/hosts/common/optional/services/dhcp.nix b/hosts/common/optional/services/dhcp.nix
index 3eed193..2492d05 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
- tftp-hpa
- wol
+ systemPackages = [
+ pkgs.ipxe
+ pkgs.tftp-hpa
+ pkgs.wol
];
};
@@ -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 c5950e9..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. (
- 2025051101 ; 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 174.31.28.77
+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 174.31.28.77
+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 174.31.28.77
+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 a124998..0c5ca0c 100644
--- a/hosts/common/optional/services/xorg.nix
+++ b/hosts/common/optional/services/xorg.nix
@@ -1,68 +1,85 @@
{ config, lib, pkgs, ... }:
{
- environment.systemPackages = with pkgs; [
- chafa
- evince
- feh
- gcr
- geeqie
- ghostty
- gimp
- #gimp-with-plugins
- google-chrome
- gv
- inkscape
- kdePackages.okular
- libreoffice
- libva-utils
- mesa-demos
- mpv
- polkit_gnome
- 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.gimp3
+ #pkgs.gimp-with-plugins
+ pkgs.google-chrome
+ pkgs.gv
+ pkgs.inkscape
+ pkgs.kdePackages.okular
+ pkgs.libreoffice
+ pkgs.libva-utils
+ pkgs.mangohud
+ 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;
- 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 fcd55d9..1750ba6 100644
--- a/hosts/common/optional/sound.nix
+++ b/hosts/common/optional/sound.nix
@@ -1,51 +1,51 @@
{ pkgs, ... }:
{
environment = {
- systemPackages = with pkgs; [
- artyFX
- audacity
- bespokesynth
- boops
- cardinal
- carla
- chow-tape-model
- cmus
- distrho-ports
- fluidsynth
- #master.fmsynth
- #gearmulator
- geonkick
- guitarix
- gxplugins-lv2
- lilypond-unstable-with-fonts
- lsp-plugins
- metersLv2
- odin2
- master.oxefmsynth
- polyphone
- qsynth
- reaper
- rosegarden
- samplv1
- sfizz
- sorcer
- surge-XT
- synthv1
- talentedhack
- #master.tunefish
- v4l-utils
- vapoursynth
- vital
- vmpk
- vocproc
- wavpack
- winetricks
- wineWowPackages.stagingFull
- master.yabridge
- master.yabridgectl
- yoshimi
- zam-plugins
- zynaddsubfx
+ systemPackages = [
+ #pkgs.artyFX
+ pkgs.audacity
+ pkgs.bespokesynth
+ pkgs.boops
+ pkgs.cardinal
+ #pkgs.carla
+ #pkgs.chow-tape-model
+ pkgs.cmus
+ pkgs.distrho-ports
+ pkgs.fluidsynth
+ #pkgs.fmsynth
+ #pkgs.gearmulator
+ pkgs.geonkick
+ pkgs.guitarix
+ pkgs.gxplugins-lv2
+ pkgs.lilypond-unstable-with-fonts
+ pkgs.lsp-plugins
+ pkgs.metersLv2
+ pkgs.odin2
+ pkgs.oxefmsynth
+ pkgs.polyphone
+ pkgs.qsynth
+ pkgs.reaper
+ pkgs.rosegarden
+ pkgs.samplv1
+ pkgs.sfizz
+ #pkgs.sorcer
+ pkgs.surge-XT
+ pkgs.synthv1
+ pkgs.talentedhack
+ #pkgs.tunefish
+ pkgs.v4l-utils
+ pkgs.vapoursynth
+ pkgs.vital
+ pkgs.vmpk
+ pkgs.vocproc
+ pkgs.wavpack
+ pkgs.winetricks
+ pkgs.master.wineWowPackages.stagingFull
+ 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:46 +0000