From 6aaa5993e4c1cfb205ed555d958702f9bba1770d Mon Sep 17 00:00:00 2001 From: adikro Date: Wed, 24 Dec 2025 16:21:00 +0100 Subject: a bunch of changes, renames sys to os and refactored some of the logic --- sys/srv/compat.nix | 24 ------------------------ sys/srv/docker.nix | 14 -------------- sys/srv/files.nix | 46 ---------------------------------------------- sys/srv/gaming.nix | 50 -------------------------------------------------- sys/srv/kvm.nix | 18 ------------------ sys/srv/nix-helper.nix | 23 ----------------------- sys/srv/ollama.nix | 28 ---------------------------- sys/srv/srv.nix | 12 ------------ 8 files changed, 215 deletions(-) delete mode 100644 sys/srv/compat.nix delete mode 100644 sys/srv/docker.nix delete mode 100644 sys/srv/files.nix delete mode 100644 sys/srv/gaming.nix delete mode 100644 sys/srv/kvm.nix delete mode 100644 sys/srv/nix-helper.nix delete mode 100644 sys/srv/ollama.nix delete mode 100644 sys/srv/srv.nix (limited to 'sys/srv') diff --git a/sys/srv/compat.nix b/sys/srv/compat.nix deleted file mode 100644 index ab9560f..0000000 --- a/sys/srv/compat.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ config, lib, pkgs, ... }: -let - cfg = config.sys.srv.compat; -in -{ - options.sys.srv.compat.enable = lib.mkEnableOption "enables compatibility with windows & x11"; - config = lib.mkIf cfg.enable { - programs.xwayland = { - enable = true; - package = pkgs.xwayland-satellite; - }; - - environment.sessionVariables = { - NIXOS_OZONE_WL = "1"; - ELECTRON_ENABLE_WAYLAND = "1"; - WINE_RT_PRIO = "1"; - }; - - environment.systemPackages = with pkgs; [ - winetricks - wineWowPackages.waylandFull - ]; - }; -} diff --git a/sys/srv/docker.nix b/sys/srv/docker.nix deleted file mode 100644 index 0ed1541..0000000 --- a/sys/srv/docker.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ config, lib, pkgs, username, ... }: -let - cfg = config.sys.srv.docker; -in -{ - options.sys.srv.docker.enable = lib.mkEnableOption "enables the docker container engine"; - config = lib.mkIf cfg.enable { - virtualisation.docker.enable = true; - - environment.systemPackages = [ pkgs.docker-compose ]; - - users.users.${username}.extraGroups = [ "docker" ]; - }; -} diff --git a/sys/srv/files.nix b/sys/srv/files.nix deleted file mode 100644 index 9b5759e..0000000 --- a/sys/srv/files.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ config, lib, pkgs, ... }: -let - cfg = config.sys.srv.files; -in -{ - options.sys.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; - } - - (lib.mkIf cfg.thunar.enable { - programs.thunar = { - enable = true; - plugins = with pkgs.xfce; [ - thunar-volman - thunar-archive-plugin - thunar-vcs-plugin - ]; - }; - services = { - tumbler.enable = true; - gnome.gnome-keyring.enable = true; - }; - environment.systemPackages = with pkgs; [ file-roller ]; - }) - - (lib.mkIf cfg.utils.enable { - services.gvfs.enable = true; - - environment.systemPackages = with pkgs; [ - trashy - gdu - - unzip - p7zip - unrar - pxz - pigz - ]; - }) - ]; -} diff --git a/sys/srv/gaming.nix b/sys/srv/gaming.nix deleted file mode 100644 index ee7f608..0000000 --- a/sys/srv/gaming.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ config, lib, pkgs, username, ... }: -let - cfg = config.sys.srv.gaming; -in -{ - options.sys.srv.gaming = { - enable = lib.mkEnableOption "enables gaming utilities"; - steam.enable = lib.mkEnableOption "enables steam utilities"; - vr.enable = lib.mkEnableOption "enables vr support"; - }; - config = lib.mkMerge [ - (lib.mkIf cfg.enable { - programs.gamescope.enable = true; - - programs.gamemode = { - enable = true; - enableRenice = true; - }; - - environment.systemPackages = with pkgs; [ - heroic - prismlauncher - ]; - - home-manager.users.${username}.hm.soft.mangohud.enable = true; - }) - - (lib.mkIf cfg.steam.enable { - programs.steam = { - enable = true; - localNetworkGameTransfers.openFirewall = true; - dedicatedServer.openFirewall = true; - remotePlay.openFirewall = false; - extest.enable = true; - protontricks.enable = true; - - extraCompatPackages = with pkgs; [ - proton-ge-custom - ]; - }; - }) - - (lib.mkIf cfg.vr.enable { - programs.alvr = { - enable = true; - openFirewall = true; - }; - }) - ]; -} diff --git a/sys/srv/kvm.nix b/sys/srv/kvm.nix deleted file mode 100644 index 2cf8c26..0000000 --- a/sys/srv/kvm.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ config, lib, pkgs, ... }: -let - cfg = config.sys.srv.kvm; -in -{ - options.sys.srv.kvm.enable = lib.mkEnableOption "KVM/QEMU virtualization with Virt-Manager"; - config = lib.mkIf cfg.enable { - virtualisation.libvirtd = { - enable = true; - qemu.package = pkgs.qemu_kvm; - qemu.swtpm.enable = true; - }; - - programs.virt-manager.enable = true; - - boot.initrd.kernelModules = lib.optional (config.sys.core.drivers.amd.enable or false) "kvm-amd"; - }; -} diff --git a/sys/srv/nix-helper.nix b/sys/srv/nix-helper.nix deleted file mode 100644 index 5eb3353..0000000 --- a/sys/srv/nix-helper.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ config, lib, pkgs, ... }: -let - cfg = config.sys.srv.nix-helper; -in -{ - options.sys.srv.nix-helper.enable = lib.mkEnableOption "enables nix-helper"; - config = lib.mkIf cfg.enable { - nix.settings = { - trusted-users = [ "root" "adam" ]; - experimental-features = [ "nix-command" "flakes" ]; - }; - - programs.nh = { - enable = true; - flake = "/etc/nixos"; - }; - - environment.systemPackages = with pkgs; [ - nix-output-monitor - nvd - ]; - }; -} diff --git a/sys/srv/ollama.nix b/sys/srv/ollama.nix deleted file mode 100644 index 11babd6..0000000 --- a/sys/srv/ollama.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ config, lib, pkgs, ... }: -let - cfg = config.sys.srv.ollama; -in -{ - options.sys.srv.ollama.enable = lib.mkEnableOption "Ollama AI service"; - config = lib.mkIf cfg.enable { - fileSystems."/models" = { - device = "/home/ollama"; - fsType = "none"; - options = [ "bind" ]; - }; - - services.ollama = { - enable = true; - package = pkgs.ollama-rocm; - - user = "ollama"; - models = "/models"; - - syncModels = true; - loadModels = [ - "deepseek-r1:14b" - "qwen3:14b" - ]; - }; - }; -} diff --git a/sys/srv/srv.nix b/sys/srv/srv.nix deleted file mode 100644 index 19e959e..0000000 --- a/sys/srv/srv.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ ... }: -{ - imports = [ - ./compat.nix - ./docker.nix - ./files.nix - ./gaming.nix - ./kvm.nix - ./nix-helper.nix - ./ollama.nix - ]; -} -- cgit v1.3