From 6174f3650cf42aaf008012e828d5a1f8e2ce037f Mon Sep 17 00:00:00 2001 From: Leander Scherer Date: Thu, 8 Jan 2026 02:48:11 +0100 Subject: refactor(modules): separate nixos/home-manager modules, use standard option conventions --- modules/services/default.nix | 14 -------------- modules/services/keyring.nix | 16 ---------------- modules/services/mullvad.nix | 16 ---------------- modules/services/nextcloud-client.nix | 22 ---------------------- modules/services/openssh.nix | 17 ----------------- modules/services/pipewire.nix | 19 ------------------- modules/services/polkit.nix | 29 ----------------------------- modules/services/printer.nix | 21 --------------------- modules/services/wooting.nix | 16 ---------------- 9 files changed, 170 deletions(-) delete mode 100644 modules/services/default.nix delete mode 100644 modules/services/keyring.nix delete mode 100644 modules/services/mullvad.nix delete mode 100644 modules/services/nextcloud-client.nix delete mode 100644 modules/services/openssh.nix delete mode 100644 modules/services/pipewire.nix delete mode 100644 modules/services/polkit.nix delete mode 100644 modules/services/printer.nix delete mode 100644 modules/services/wooting.nix (limited to 'modules/services') diff --git a/modules/services/default.nix b/modules/services/default.nix deleted file mode 100644 index 85a5d80..0000000 --- a/modules/services/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ ... }: - -{ - imports = [ - ./printer.nix - ./polkit.nix - ./pipewire.nix - ./mullvad.nix - ./nextcloud-client.nix - ./wooting.nix - ./openssh.nix - ./keyring.nix - ]; -} diff --git a/modules/services/keyring.nix b/modules/services/keyring.nix deleted file mode 100644 index c08ca1e..0000000 --- a/modules/services/keyring.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - config, - lib, - ... -}: - -{ - options.nx.services.keyring.enable = lib.mkEnableOption "Enable keyring service"; - - config = lib.mkIf config.nx.services.keyring.enable { - security.pam.services.login.enableKwallet = lib.mkIf config.nx.desktop.kde.enable true; - - # default keyring to use - services.gnome.gnome-keyring.enable = lib.mkIf (!config.nx.desktop.kde.enable) true; - }; -} diff --git a/modules/services/mullvad.nix b/modules/services/mullvad.nix deleted file mode 100644 index 0d486be..0000000 --- a/modules/services/mullvad.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -{ - options.nx.services.mullvad.enable = lib.mkEnableOption "Enable and setup mullvad"; - config = lib.mkIf config.nx.services.mullvad.enable { - services.mullvad-vpn = { - enable = true; - package = pkgs.mullvad-vpn; - }; - }; -} diff --git a/modules/services/nextcloud-client.nix b/modules/services/nextcloud-client.nix deleted file mode 100644 index 8bf7b1e..0000000 --- a/modules/services/nextcloud-client.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - config, - lib, - pkgs, - username, - ... -}: - -{ - options.nx.services.nextcloud-client.enable = - lib.mkEnableOption "Enable and setup nextcloud-client"; - config = lib.mkIf config.nx.services.nextcloud-client.enable { - nx.services.keyring.enable = true; - home-manager.users."${username}" = { - home.packages = with pkgs; [ nextcloud-client ]; - services.nextcloud-client = { - enable = true; - startInBackground = true; - }; - }; - }; -} diff --git a/modules/services/openssh.nix b/modules/services/openssh.nix deleted file mode 100644 index c6a73cb..0000000 --- a/modules/services/openssh.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - config, - username, - lib, - ... -}: -{ - options.nx.services.openssh.enable = lib.mkEnableOption "Enable openssh service"; - config = lib.mkIf config.nx.services.openssh.enable { - services.openssh = { - enable = true; - settings = { - AllowUsers = [ username ]; - }; - }; - }; -} diff --git a/modules/services/pipewire.nix b/modules/services/pipewire.nix deleted file mode 100644 index 12b1ae2..0000000 --- a/modules/services/pipewire.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - config, - lib, - ... -}: - -{ - options.nx.services.pipewire.enable = lib.mkEnableOption "Enable pipewire for audio"; - config = lib.mkIf config.nx.services.pipewire.enable { - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - wireplumber.enable = true; - }; - }; -} diff --git a/modules/services/polkit.nix b/modules/services/polkit.nix deleted file mode 100644 index abd050f..0000000 --- a/modules/services/polkit.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: -{ - options.nx.services.polkit.enable = lib.mkEnableOption "Enable and setup polkit service"; - config = lib.mkIf config.nx.services.polkit.enable { - environment.systemPackages = with pkgs; [ - polkit - polkit_gnome - ]; - security.polkit.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/modules/services/printer.nix b/modules/services/printer.nix deleted file mode 100644 index 0f6d82b..0000000 --- a/modules/services/printer.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: -{ - options.nx.services.printer.enable = lib.mkEnableOption "Enable printer service"; - config = lib.mkIf config.nx.services.printer.enable { - services.printing = { - enable = true; - drivers = [ pkgs.brlaser ]; - }; - # printer autodiscovery - services.avahi = { - enable = true; - nssmdns4 = true; - openFirewall = true; - }; - }; -} diff --git a/modules/services/wooting.nix b/modules/services/wooting.nix deleted file mode 100644 index 6cab0b1..0000000 --- a/modules/services/wooting.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -{ - options.nx.services.wooting.enable = lib.mkEnableOption "Wootility service"; - config = lib.mkIf config.nx.services.wooting.enable { - services.udev.packages = [ pkgs.wooting-udev-rules ]; - environment.systemPackages = with pkgs; [ - wootility - ]; - }; -} -- cgit v1.3.1