From db44d490d1b6e25212a5bd7cd0f3a390cf394b55 Mon Sep 17 00:00:00 2001 From: adikro Date: Fri, 26 Dec 2025 21:19:02 +0100 Subject: added ssh support, renamed sys to os --- os/srv/autoclicker.nix | 4 ++-- os/srv/compat.nix | 4 ++-- os/srv/docker.nix | 4 ++-- os/srv/files.nix | 6 +++--- os/srv/gaming.nix | 4 ++-- os/srv/kvm.nix | 6 +++--- os/srv/nix-helper.nix | 4 ++-- os/srv/ollama.nix | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) (limited to 'os/srv') diff --git a/os/srv/autoclicker.nix b/os/srv/autoclicker.nix index 84cba2e..e9a5d0b 100644 --- a/os/srv/autoclicker.nix +++ b/os/srv/autoclicker.nix @@ -1,9 +1,9 @@ { config, lib, pkgs, ... }: let - cfg = config.sys.srv.autoclicker; + cfg = config.os.srv.autoclicker; in { - options.sys.srv.autoclicker.enable = lib.mkEnableOption "enables wl-autoclicker"; + options.os.srv.autoclicker.enable = lib.mkEnableOption "enables wl-autoclicker"; config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ wl-autoclicker diff --git a/os/srv/compat.nix b/os/srv/compat.nix index ab9560f..f174e02 100644 --- a/os/srv/compat.nix +++ b/os/srv/compat.nix @@ -1,9 +1,9 @@ { config, lib, pkgs, ... }: let - cfg = config.sys.srv.compat; + cfg = config.os.srv.compat; in { - options.sys.srv.compat.enable = lib.mkEnableOption "enables compatibility with windows & x11"; + options.os.srv.compat.enable = lib.mkEnableOption "enables compatibility with windows & x11"; config = lib.mkIf cfg.enable { programs.xwayland = { enable = true; diff --git a/os/srv/docker.nix b/os/srv/docker.nix index 0ed1541..a87ea5d 100644 --- a/os/srv/docker.nix +++ b/os/srv/docker.nix @@ -1,9 +1,9 @@ { config, lib, pkgs, username, ... }: let - cfg = config.sys.srv.docker; + cfg = config.os.srv.docker; in { - options.sys.srv.docker.enable = lib.mkEnableOption "enables the docker container engine"; + options.os.srv.docker.enable = lib.mkEnableOption "enables the docker container engine"; config = lib.mkIf cfg.enable { virtualisation.docker.enable = true; diff --git a/os/srv/files.nix b/os/srv/files.nix index 9b5759e..4a26c74 100644 --- a/os/srv/files.nix +++ b/os/srv/files.nix @@ -1,15 +1,15 @@ { config, lib, pkgs, ... }: let - cfg = config.sys.srv.files; + cfg = config.os.srv.files; in { - options.sys.srv.files = { + options.os.srv.files = { thunar.enable = lib.mkEnableOption "enables the thunar file manager"; utils.enable = lib.mkEnableOption "enables compression and trash utilities"; }; config = lib.mkMerge [ { - sys.srv.files.utils.enable = lib.mkDefault cfg.thunar.enable; + os.srv.files.utils.enable = lib.mkDefault cfg.thunar.enable; } (lib.mkIf cfg.thunar.enable { diff --git a/os/srv/gaming.nix b/os/srv/gaming.nix index ee7f608..b8d59e0 100644 --- a/os/srv/gaming.nix +++ b/os/srv/gaming.nix @@ -1,9 +1,9 @@ { config, lib, pkgs, username, ... }: let - cfg = config.sys.srv.gaming; + cfg = config.os.srv.gaming; in { - options.sys.srv.gaming = { + options.os.srv.gaming = { enable = lib.mkEnableOption "enables gaming utilities"; steam.enable = lib.mkEnableOption "enables steam utilities"; vr.enable = lib.mkEnableOption "enables vr support"; diff --git a/os/srv/kvm.nix b/os/srv/kvm.nix index 2cf8c26..47a4265 100644 --- a/os/srv/kvm.nix +++ b/os/srv/kvm.nix @@ -1,9 +1,9 @@ { config, lib, pkgs, ... }: let - cfg = config.sys.srv.kvm; + cfg = config.os.srv.kvm; in { - options.sys.srv.kvm.enable = lib.mkEnableOption "KVM/QEMU virtualization with Virt-Manager"; + options.os.srv.kvm.enable = lib.mkEnableOption "KVM/QEMU virtualization with Virt-Manager"; config = lib.mkIf cfg.enable { virtualisation.libvirtd = { enable = true; @@ -13,6 +13,6 @@ in programs.virt-manager.enable = true; - boot.initrd.kernelModules = lib.optional (config.sys.core.drivers.amd.enable or false) "kvm-amd"; + boot.initrd.kernelModules = lib.optional (config.os.core.drivers.amd.enable or false) "kvm-amd"; }; } diff --git a/os/srv/nix-helper.nix b/os/srv/nix-helper.nix index 6a64201..4999908 100644 --- a/os/srv/nix-helper.nix +++ b/os/srv/nix-helper.nix @@ -1,9 +1,9 @@ { config, lib, pkgs, username, ... }: let - cfg = config.sys.srv.nix-helper; + cfg = config.os.srv.nix-helper; in { - options.sys.srv.nix-helper.enable = lib.mkEnableOption "enables nix-helper"; + options.os.srv.nix-helper.enable = lib.mkEnableOption "enables nix-helper"; config = lib.mkIf cfg.enable { nix.settings = { trusted-users = [ "root" "${username}" ]; diff --git a/os/srv/ollama.nix b/os/srv/ollama.nix index 11babd6..7a9bc78 100644 --- a/os/srv/ollama.nix +++ b/os/srv/ollama.nix @@ -1,9 +1,9 @@ { config, lib, pkgs, ... }: let - cfg = config.sys.srv.ollama; + cfg = config.os.srv.ollama; in { - options.sys.srv.ollama.enable = lib.mkEnableOption "Ollama AI service"; + options.os.srv.ollama.enable = lib.mkEnableOption "Ollama AI service"; config = lib.mkIf cfg.enable { fileSystems."/models" = { device = "/home/ollama"; -- cgit v1.3