aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/desktop/hjem/wm/sway.nix1
-rw-r--r--modules/desktop/options.nix1
-rw-r--r--modules/services/nixos/cgit/default.nix4
-rw-r--r--modules/services/nixos/goaccess.nix4
-rw-r--r--modules/services/nixos/qbittorrent.nix7
-rw-r--r--modules/services/options.nix2
-rw-r--r--modules/system/nixos/networking/default.nix2
-rw-r--r--modules/wireguard/nixos/default.nix50
-rw-r--r--modules/wireguard/options.nix41
9 files changed, 14 insertions, 98 deletions
diff --git a/modules/desktop/hjem/wm/sway.nix b/modules/desktop/hjem/wm/sway.nix
index 14f8637..62e4203 100644
--- a/modules/desktop/hjem/wm/sway.nix
+++ b/modules/desktop/hjem/wm/sway.nix
@@ -38,7 +38,6 @@
settings = ''
exec ${config.collinux.desktop.wallpaper_cmd}
exec ${pkgs.dunst}/bin/dunst
- exec ${pkgs.soteria}/bin/soteria
include catppuccin-mocha
diff --git a/modules/desktop/options.nix b/modules/desktop/options.nix
index 1bd03fe..9081ba9 100644
--- a/modules/desktop/options.nix
+++ b/modules/desktop/options.nix
@@ -25,6 +25,7 @@ in {
autologin = {
enable = mkEnableOption "autologin";
command = mkOption {
+ internal = true;
type = lib.types.str;
default = with config.collinux.desktop;
if (wm.sway.enable && !gnome.enable && !wm.niri.enable)
diff --git a/modules/services/nixos/cgit/default.nix b/modules/services/nixos/cgit/default.nix
index b35a631..3c225ee 100644
--- a/modules/services/nixos/cgit/default.nix
+++ b/modules/services/nixos/cgit/default.nix
@@ -60,8 +60,8 @@ in {
root-desc=Git repos associated with Ganymede
readme=:README.md
- about-filter=${custom_cgit}/lib/cgit/filters/html-converters/md2html
- source-filter=${custom_cgit}/lib/cgit/filters/syntax-highlighting.py
+ about-filter=${pkgs.cgit}/lib/cgit/filters/html-converters/md2html
+ source-filter=${pkgs.cgit}/lib/cgit/filters/syntax-highlighting.py
footer=
virtual-root=/
diff --git a/modules/services/nixos/goaccess.nix b/modules/services/nixos/goaccess.nix
index f8940c9..bb174cb 100644
--- a/modules/services/nixos/goaccess.nix
+++ b/modules/services/nixos/goaccess.nix
@@ -7,8 +7,8 @@
cfg = config.collinux.services.goaccess;
geoip = pkgs.fetchurl {
- url = "https://github.com/P3TERX/GeoLite.mmdb/releases/download/2026.02.13/GeoLite2-City.mmdb";
- hash = "sha256-FnvfGHH8b0506muEvlDXjgNKruorWeMXEbquGdZoH6Q=";
+ url = "https://github.com/P3TERX/GeoLite.mmdb/releases/download/2026.03.01/GeoLite2-City.mmdb";
+ hash = "sha256-SZ/m8b53sawF86Ak46uX7CxdzEMFrmob7Yd12Y+xJfA=";
};
settings = {
diff --git a/modules/services/nixos/qbittorrent.nix b/modules/services/nixos/qbittorrent.nix
index d0249d0..13bf114 100644
--- a/modules/services/nixos/qbittorrent.nix
+++ b/modules/services/nixos/qbittorrent.nix
@@ -10,7 +10,10 @@ in {
];
config = lib.mkIf cfg.enable {
- users.users."qbittorrent".extraGroups = ["fileserver"]; # torrent files go to /media/library
+ users.users."qbittorrent" = {
+ uid = 985;
+ extraGroups = ["fileserver"]; # torrent files go to /media/library
+ };
networking.firewall.allowedTCPPorts = [49252];
networking.firewall.allowedUDPPorts = [49252];
@@ -20,5 +23,7 @@ in {
webuiPort = cfg.port;
torrentingPort = 49252;
};
+
+ systemd.services.qbittorrent.serviceConfig.PrivateUsers = lib.mkForce false;
};
}
diff --git a/modules/services/options.nix b/modules/services/options.nix
index bd0a990..16c5bea 100644
--- a/modules/services/options.nix
+++ b/modules/services/options.nix
@@ -115,6 +115,7 @@ in {
})
// {
users = mkOption {
+ description = "List of users to configure on the copyparty server";
type = lib.types.attrsOf (lib.types.submodule ({config, ...}: {
options = {
name = mkOption {
@@ -137,6 +138,7 @@ in {
caddy = {
enable = mkEnableOption "caddy https server";
envFile = mkOption {
+ description = "Absolute path to file that contains environment files to run caddy with";
type = types.str;
example = "/run/secrets.d/caddy-env";
};
diff --git a/modules/system/nixos/networking/default.nix b/modules/system/nixos/networking/default.nix
index 04cd1c3..f6baaac 100644
--- a/modules/system/nixos/networking/default.nix
+++ b/modules/system/nixos/networking/default.nix
@@ -19,8 +19,8 @@
networkmanager.enable = false;
};
- # disable all ipv6
boot.kernel.sysctl = {
+ # disable all ipv6
"net.ipv6.conf.all.disable_ipv6" = 1;
"net.ipv6.conf.default.disable_ipv6" = 1;
};
diff --git a/modules/wireguard/nixos/default.nix b/modules/wireguard/nixos/default.nix
deleted file mode 100644
index 9f05e43..0000000
--- a/modules/wireguard/nixos/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- config,
- lib,
- ...
-}: let
- cfg = config.collinux.wireguard;
-in
- lib.mkIf cfg.enable {
- networking.firewall.checkReversePath = "loose";
-
- networking.useNetworkd = true;
- systemd.network = {
- enable = true;
-
- netdevs."10-wg" = {
- netdevConfig = {
- Kind = "wireguard";
- Name = "wg0";
- };
-
- wireguardConfig = {
- PrivateKeyFile = cfg.privateKeyFile;
- ListenPort = 51820;
- };
-
- wireguardPeers =
- cfg.peers
- |> builtins.mapAttrs (_: m:
- {
- PublicKey = m.publicKey;
- AllowedIPs = [m.ip];
- PersistentKeepalive = 25;
- }
- // (lib.optionalAttrs (m.endpoint != null) {
- Endpoint = m.endpoint;
- }))
- |> builtins.attrValues;
- };
-
- networks."12-wireguard" = {
- name = "wg0";
-
- networkConfig = {
- Address = cfg.ip;
- DHCP = "no";
- Gateway = cfg.gateway;
- };
- };
- };
- }
diff --git a/modules/wireguard/options.nix b/modules/wireguard/options.nix
deleted file mode 100644
index c3c574f..0000000
--- a/modules/wireguard/options.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{lib, ...}: let
- inherit (lib) mkOption mkEnableOption;
-in {
- options = {
- collinux.wireguard = {
- enable = mkEnableOption "wireguard";
- ip = mkOption {
- type = lib.types.str;
- description = "host's ip address on the wireguard network (with cidr)";
- };
- gateway = mkOption {
- type = lib.types.str;
- description = "host's gateway";
- };
- privateKeyFile = mkOption {
- type = lib.types.str;
- description = "path to local private key file";
- example = "/run/secretd.d/wireguard-key";
- };
- peers = mkOption {
- type = lib.types.attrsOf (lib.types.submodule {
- options = {
- publicKey = mkOption {
- type = lib.types.str;
- description = "peer's public key";
- };
- ip = mkOption {
- type = lib.types.str;
- description = "peer's IP address";
- };
- endpoint = mkOption {
- type = lib.types.nullOr lib.types.str;
- description = "peer's endpoint";
- default = null;
- };
- };
- });
- };
- };
- };
-}