From 25d9e9a52c62f3fca0bce6b1985a82e45cb3de56 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Thu, 3 Oct 2024 16:32:41 -0400 Subject: [PATCH] qemu + enabled refactor --- hosts/fwbook.nix | 14 +++++------ hosts/hl-bigbox1.nix | 14 +++++------ hosts/hl-fws1.nix | 4 ++-- hosts/hl-minipc1.nix | 4 ++-- hosts/hl-minipc2.nix | 6 ++--- hosts/hl-terra1.nix | 4 ++-- modules/core/user.nix | 4 ++-- modules/main.nix | 2 +- modules/network-drives.nix | 4 ++-- modules/nixos/common/default.nix | 1 + modules/nixos/common/qemu.nix | 25 ++++++++++++++++++++ modules/nixos/common/ssh-server.nix | 4 ++-- modules/nixos/desktop/cosmic.nix | 4 ++-- modules/nixos/desktop/crypto.nix | 4 ++-- modules/nixos/desktop/default.nix | 4 ++-- modules/nixos/desktop/hyprland/common.nix | 2 +- modules/nixos/desktop/hyprland/default.nix | 2 +- modules/nixos/desktop/hyprland/mine.nix | 2 +- modules/nixos/desktop/hyprland/nwg-shell.nix | 2 +- modules/nixos/desktop/kde.nix | 4 ++-- modules/nixos/desktop/packages.nix | 2 +- modules/nixos/desktop/wayland.nix | 2 +- modules/nixos/desktop/x11.nix | 2 +- 23 files changed, 71 insertions(+), 45 deletions(-) create mode 100644 modules/nixos/common/qemu.nix diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 9ccaa75..3010dfe 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -11,19 +11,20 @@ in imports = [ ./fwbook.hardware-configuration.nix ]; # Skyg skyg = { - user.enabled = true; + user.enable = true; server.admin.enable = true; + core.qemu.enable = true; nixos = { common.hardware.sound.enable = true; desktop = { - enabled = true; - kde.enabled = true; - cosmic.enabled = false; + enable = true; + kde.enable = true; + cosmic.enable = false; hyprland = { - enabled = true; + enable = true; useNWG = false; }; - crypto.enabled = true; + crypto.enable = true; }; }; }; @@ -70,7 +71,6 @@ in dvc-with-remotes google-cloud-sdk awscli - quickemu # Photo Editing krita gimp-with-plugins diff --git a/hosts/hl-bigbox1.nix b/hosts/hl-bigbox1.nix index 83d0a12..d4aa25b 100644 --- a/hosts/hl-bigbox1.nix +++ b/hosts/hl-bigbox1.nix @@ -2,15 +2,15 @@ { pkgs, lib, config, ... }: { imports = [ ./hl-bigbox1.hardware-configuration.nix ]; - skyg.user.enabled = true; - skyg.nixos.common.ssh-server.enabled = true; + skyg.user.enable = true; + skyg.nixos.common.ssh-server.enable = true; skyg.nixos.server.services.ai.enable = true; skyg.nixos.server.services.jellyfin.enable = true; - skyg.nixos.desktop.kde.enabled = true; - skyg.nixos.desktop.enabled = true; - skyg.server.admin.enable = true; - users.users.ari.extraGroups = [ "input" ]; - # firmware updater + skyg.nixos.desktop.kde.enable = true; + skyg.nixos.desktop.enable = true; + skyg.server.admin.enable = true; + users.users.ari.extraGroups = [ "input" ]; + # firmware updater services.fwupd.enable = true; virtualisation.docker.enableNvidia = true; hardware.nvidia-container-toolkit.enable = true; diff --git a/hosts/hl-fws1.nix b/hosts/hl-fws1.nix index 4896790..77dd625 100644 --- a/hosts/hl-fws1.nix +++ b/hosts/hl-fws1.nix @@ -1,8 +1,8 @@ { user }: { pkgs, lib, config, ... }: { imports = [ ./hl-minipc1.hardware-configuration.nix ]; - skyg.user.enabled = true; - skyg.nixos.common.ssh-server.enabled = true; + skyg.user.enable = true; + skyg.nixos.common.ssh-server.enable = true; skyg.server.admin.enable = true; # firmware updater diff --git a/hosts/hl-minipc1.nix b/hosts/hl-minipc1.nix index 5da546b..e825ed6 100644 --- a/hosts/hl-minipc1.nix +++ b/hosts/hl-minipc1.nix @@ -10,8 +10,8 @@ let in { imports = [ ./hl-minipc1.hardware-configuration.nix ]; - skyg.user.enabled = true; - skyg.nixos.common.ssh-server.enabled = true; + skyg.user.enable = true; + skyg.nixos.common.ssh-server.enable = true; skyg.server.admin.enable = true; # Nix Stores diff --git a/hosts/hl-minipc2.nix b/hosts/hl-minipc2.nix index 26926c1..cae66ef 100644 --- a/hosts/hl-minipc2.nix +++ b/hosts/hl-minipc2.nix @@ -1,14 +1,14 @@ { user }: { pkgs, lib, config, ... }: { imports = [ ./hl-minipc2.hardware-configuration.nix ]; - skyg.user.enabled = true; - skyg.nixos.common.ssh-server.enabled = true; + skyg.user.enable = true; + skyg.nixos.common.ssh-server.enable = true; # firmware updater services.fwupd.enable = true; # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - # Disable firewall + # Disable firewall networking.firewall.enable = false; # Special udev rule for google's coral tpu skyg.nixos.server.udevrules.coraltpu.enable = true; diff --git a/hosts/hl-terra1.nix b/hosts/hl-terra1.nix index b1dbc2e..64fb2ef 100644 --- a/hosts/hl-terra1.nix +++ b/hosts/hl-terra1.nix @@ -15,8 +15,8 @@ let in { imports = [ ./hl-terra1.hardware-configuration.nix ]; - skyg.user.enabled = true; - skyg.nixos.common.ssh-server.enabled = true; + skyg.user.enable = true; + skyg.nixos.common.ssh-server.enable = true; skyg.server.admin.enable = true; # firmware updater services.fwupd.enable = true; diff --git a/modules/core/user.nix b/modules/core/user.nix index 3cd8438..31f286a 100644 --- a/modules/core/user.nix +++ b/modules/core/user.nix @@ -14,7 +14,7 @@ in default = [ ]; }; skyg.user = { - enabled = mkEnableOption ""; + enable = mkEnableOption ""; name = mkOption { type = types.str; }; @@ -45,7 +45,7 @@ in stateVersion = cfg.home-manager.version; }); in - mkIf cfg.user.enabled + mkIf cfg.user.enable { programs.zsh.enable = true; home-manager.users.root = diff --git a/modules/main.nix b/modules/main.nix index 3ee15a8..1c36376 100644 --- a/modules/main.nix +++ b/modules/main.nix @@ -22,7 +22,7 @@ skyg.core.hostName = hostName; skyg.home-manager.version = homeManagerVersion; skyg.core.substituters = localNixCaches; - skyg.networkDrives.enabled = enableNetworkDrives; + skyg.networkDrives.enable = enableNetworkDrives; skyg.nixos.common.containers = (if os.enable then os.containers else { }); system.stateVersion = systemStateVersion; nixpkgs.config.allowUnfree = true; diff --git a/modules/network-drives.nix b/modules/network-drives.nix index e72d1b7..749f386 100644 --- a/modules/network-drives.nix +++ b/modules/network-drives.nix @@ -9,11 +9,11 @@ in { options = { skyg.networkDrives = { - enabled = mkEnableOption + enable = mkEnableOption "Network Drives"; }; }; - config = mkIf cfg.enabled { + config = mkIf cfg.enable { fileSystems."/torrents" = { device = "tnas1.lab.internal:/mnt/EightTerra/DownloadedTorrents"; fsType = "nfs"; diff --git a/modules/nixos/common/default.nix b/modules/nixos/common/default.nix index d535d37..55a246d 100644 --- a/modules/nixos/common/default.nix +++ b/modules/nixos/common/default.nix @@ -8,5 +8,6 @@ ./user.nix ./fonts.nix ./ssh-server.nix + ./qemu.nix ]; } diff --git a/modules/nixos/common/qemu.nix b/modules/nixos/common/qemu.nix new file mode 100644 index 0000000..668236b --- /dev/null +++ b/modules/nixos/common/qemu.nix @@ -0,0 +1,25 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.skyg.core.qemu; +in +{ + options = { + skyg.core.qemu = { + enable = lib.mkEnableOption + "Enable qemu"; + }; + }; + config = lib.mkIf cfg.enable { + environment = { + systemPackages = with pkgs; [ + qemu + quickemu + spice-vdagent + spice-autorandr + ]; + services.spice-vdagentd.enable = true; + services.spice-autorandr.enable = true; + }; + }; +} diff --git a/modules/nixos/common/ssh-server.nix b/modules/nixos/common/ssh-server.nix index 0e647fb..24653e1 100644 --- a/modules/nixos/common/ssh-server.nix +++ b/modules/nixos/common/ssh-server.nix @@ -7,7 +7,7 @@ in { options = { skyg.nixos.common.ssh-server = { - enabled = mkEnableOption + enable = mkEnableOption "enable ssh server"; masterPubKey = mkOption { type = types.str; @@ -15,7 +15,7 @@ in }; }; }; - config = mkIf cfg.enabled { + config = mkIf cfg.enable { services.openssh = { enable = true; openFirewall = true; diff --git a/modules/nixos/desktop/cosmic.nix b/modules/nixos/desktop/cosmic.nix index ee3ee78..6aef5fe 100644 --- a/modules/nixos/desktop/cosmic.nix +++ b/modules/nixos/desktop/cosmic.nix @@ -5,11 +5,11 @@ in { options = { skyg.nixos.desktop.cosmic = { - enabled = lib.mkEnableOption + enable = lib.mkEnableOption "Cosmic"; }; }; - config = lib.mkIf cfg.enabled { + config = lib.mkIf cfg.enable { services.desktopManager.cosmic.enable = true; # services.displayManager.cosmic-greeter.enable = true; }; diff --git a/modules/nixos/desktop/crypto.nix b/modules/nixos/desktop/crypto.nix index c3b7e60..ca63d8e 100644 --- a/modules/nixos/desktop/crypto.nix +++ b/modules/nixos/desktop/crypto.nix @@ -7,11 +7,11 @@ in { options = { skyg.nixos.desktop.crypto = { - enabled = mkEnableOption + enable = mkEnableOption "Enable crypto wallets"; }; }; - config = mkIf cfg.enabled { + config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ trezor-suite trezord diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index f07c2a2..a17154c 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -15,11 +15,11 @@ in options = { skyg.nixos.desktop = { - enabled = lib.mkEnableOption + enable = lib.mkEnableOption "Enable Desktop"; }; }; - config = lib.mkIf cfg.desktop.enabled { + config = lib.mkIf cfg.desktop.enable { services.displayManager.sddm.enable = false; services.displayManager.sddm.wayland.enable = false; services.xserver.displayManager.gdm.enable = true; diff --git a/modules/nixos/desktop/hyprland/common.nix b/modules/nixos/desktop/hyprland/common.nix index 9b81efb..2271f01 100644 --- a/modules/nixos/desktop/hyprland/common.nix +++ b/modules/nixos/desktop/hyprland/common.nix @@ -10,7 +10,7 @@ in else pkgs ; in - lib.mkIf cfg.enabled { + lib.mkIf cfg.enable { programs.hyprland = { enable = true; package = hyprpkgs.hyprland; diff --git a/modules/nixos/desktop/hyprland/default.nix b/modules/nixos/desktop/hyprland/default.nix index 9681e8b..44d3b17 100644 --- a/modules/nixos/desktop/hyprland/default.nix +++ b/modules/nixos/desktop/hyprland/default.nix @@ -7,7 +7,7 @@ ]; options = { skyg.nixos.desktop.hyprland = with lib; { - enabled = mkEnableOption + enable = mkEnableOption "Hyprland"; useNWG = mkEnableOption "nwg-shell experience"; diff --git a/modules/nixos/desktop/hyprland/mine.nix b/modules/nixos/desktop/hyprland/mine.nix index 11d54a9..14d65ea 100644 --- a/modules/nixos/desktop/hyprland/mine.nix +++ b/modules/nixos/desktop/hyprland/mine.nix @@ -3,7 +3,7 @@ let cfg = config.skyg.nixos.desktop.hyprland; in { - config = lib.mkIf (cfg.enabled && !cfg.useNWG) { + config = lib.mkIf (cfg.enable && !cfg.useNWG) { home-manager.users.${config.skyg.user.name}.wayland.windowManager.hyprland = { enable = true; xwayland.enable = true; diff --git a/modules/nixos/desktop/hyprland/nwg-shell.nix b/modules/nixos/desktop/hyprland/nwg-shell.nix index 011dc0a..9549468 100644 --- a/modules/nixos/desktop/hyprland/nwg-shell.nix +++ b/modules/nixos/desktop/hyprland/nwg-shell.nix @@ -5,7 +5,7 @@ let cfg = config.skyg.nixos.desktop.hyprland; in { - config = mkIf (cfg.enabled && cfg.useNWG) { + config = mkIf (cfg.enable && cfg.useNWG) { programs.hyprlock.enable = true; environment.systemPackages = with pkgs; [ # general utilities diff --git a/modules/nixos/desktop/kde.nix b/modules/nixos/desktop/kde.nix index ec35184..d42a576 100644 --- a/modules/nixos/desktop/kde.nix +++ b/modules/nixos/desktop/kde.nix @@ -5,11 +5,11 @@ in { options = { skyg.nixos.desktop.kde = { - enabled = lib.mkEnableOption + enable = lib.mkEnableOption "KDE"; }; }; - config = lib.mkIf cfg.enabled { + config = lib.mkIf cfg.enable { services.desktopManager.plasma6.enable = true; services.desktopManager.plasma6.enableQt5Integration = true; environment.plasma6.excludePackages = with pkgs.kdePackages; [ diff --git a/modules/nixos/desktop/packages.nix b/modules/nixos/desktop/packages.nix index e55890a..c86504f 100644 --- a/modules/nixos/desktop/packages.nix +++ b/modules/nixos/desktop/packages.nix @@ -3,7 +3,7 @@ let cfg = config.skyg.nixos.desktop; in { - config = lib.mkIf cfg.enabled { + config = lib.mkIf cfg.enable { # Flatpak services.flatpak.enable = true; # Mobile Connect diff --git a/modules/nixos/desktop/wayland.nix b/modules/nixos/desktop/wayland.nix index 4447192..6d6d91d 100644 --- a/modules/nixos/desktop/wayland.nix +++ b/modules/nixos/desktop/wayland.nix @@ -3,7 +3,7 @@ let cfg = config.skyg.nixos.desktop; in { - config = lib.mkIf cfg.enabled { + config = lib.mkIf cfg.enable { # Flatpak environment.systemPackages = with pkgs; [ wayland diff --git a/modules/nixos/desktop/x11.nix b/modules/nixos/desktop/x11.nix index 21d6b05..55fdb54 100644 --- a/modules/nixos/desktop/x11.nix +++ b/modules/nixos/desktop/x11.nix @@ -3,7 +3,7 @@ let cfg = config.skyg.nixos.desktop; in { - config = lib.mkIf cfg.enabled { + config = lib.mkIf cfg.enable { services.xserver = { enable = true; xkb.layout = "us";