diff --git a/modules/backup.nix b/modules/misc/backup.nix similarity index 99% rename from modules/backup.nix rename to modules/misc/backup.nix index 1b39daf..6db0cdf 100644 --- a/modules/backup.nix +++ b/modules/misc/backup.nix @@ -4,7 +4,7 @@ let cfg = config.custom.misc.backup; in { - options.custom.backup = { + options.custom.misc.backup = { enable = mkEnableOption "Enables backup"; }; @@ -105,5 +105,5 @@ in mkIf cfg.enable { }; }; }; -} + }; } diff --git a/modules/misc/default.nix b/modules/misc/default.nix index 8ee2fce..8e08a51 100644 --- a/modules/misc/default.nix +++ b/modules/misc/default.nix @@ -1,6 +1,7 @@ { pkgs, config, ...}: { imports = [ + ./backup.nix ./wireshark.nix ./virt-manager.nix ./nftables.nix diff --git a/systems/mini-pc/configuration.nix b/systems/mini-pc/configuration.nix index 52852a8..adb2c6b 100644 --- a/systems/mini-pc/configuration.nix +++ b/systems/mini-pc/configuration.nix @@ -33,6 +33,11 @@ firmware.enable = true; ssd.enable = true; }; + misc = { + backup = { + enable = true; + }; + }; services = { acme.enable = true; nginx.enable = true; diff --git a/systems/pc/configuration.nix b/systems/pc/configuration.nix index bc1fb0c..f0bd0c2 100644 --- a/systems/pc/configuration.nix +++ b/systems/pc/configuration.nix @@ -36,7 +36,6 @@ docker.enable = true; }; hardware = { - vfio.enable = true; nvidia.enable = true; firmware.enable = true; ssd.enable = true; @@ -60,23 +59,23 @@ mainUser.layout = "de"; mainUser.variant = "us"; age.identityPaths = [ /home/kopatz/.ssh/id_rsa ]; - #services.xserver.displayManager.session = [ - # { - # manage = "desktop"; - # name = "hyprland"; - # start = '' - # ${lib.getExe pkgs.hyprland} & - # waitPID=$! - # ''; - # } - # { - # manage = "desktop"; - # name = "plasma5"; - # start = '' - # env ${pkgs.plasma-workspace}/bin/startplasma-x11 - # ''; - # } - #]; + services.xserver.displayManager.session = [ + { + manage = "desktop"; + name = "hyprland"; + start = '' + ${lib.getExe pkgs.hyprland} & + waitPID=$! + ''; + } + { + manage = "desktop"; + name = "plasma5"; + start = '' + env ${pkgs.plasma-workspace}/bin/startplasma-x11 + ''; + } + ]; # Bootloader. boot.loader.systemd-boot.enable = true;