qemu + enabled refactor

This commit is contained in:
ari committed 2024-10-03 16:32:41 -04:00
1 parent 61997ac276
commit 25d9e9a52c
23 files changed
+71 -45

No files matched your search

+7 -7
View File
@@ -11,19 +11,20 @@ in
imports = [ ./fwbook.hardware-configuration.nix ]; imports = [ ./fwbook.hardware-configuration.nix ];
# Skyg # Skyg
skyg = { skyg = {
user.enabled = true; user.enable = true;
server.admin.enable = true; server.admin.enable = true;
core.qemu.enable = true;
nixos = { nixos = {
common.hardware.sound.enable = true; common.hardware.sound.enable = true;
desktop = { desktop = {
enabled = true; enable = true;
kde.enabled = true; kde.enable = true;
cosmic.enabled = false; cosmic.enable = false;
hyprland = { hyprland = {
enabled = true; enable = true;
useNWG = false; useNWG = false;
}; };
crypto.enabled = true; crypto.enable = true;
}; };
}; };
}; };
@@ -70,7 +71,6 @@ in
dvc-with-remotes dvc-with-remotes
google-cloud-sdk google-cloud-sdk
awscli awscli
quickemu
# Photo Editing # Photo Editing
krita krita
gimp-with-plugins gimp-with-plugins
+7 -7
View File
@@ -2,15 +2,15 @@
{ pkgs, lib, config, ... }: { pkgs, lib, config, ... }:
{ {
imports = [ ./hl-bigbox1.hardware-configuration.nix ]; imports = [ ./hl-bigbox1.hardware-configuration.nix ];
skyg.user.enabled = true; skyg.user.enable = true;
skyg.nixos.common.ssh-server.enabled = true; skyg.nixos.common.ssh-server.enable = true;
skyg.nixos.server.services.ai.enable = true; skyg.nixos.server.services.ai.enable = true;
skyg.nixos.server.services.jellyfin.enable = true; skyg.nixos.server.services.jellyfin.enable = true;
skyg.nixos.desktop.kde.enabled = true; skyg.nixos.desktop.kde.enable = true;
skyg.nixos.desktop.enabled = true; skyg.nixos.desktop.enable = true;
skyg.server.admin.enable = true; skyg.server.admin.enable = true;
users.users.ari.extraGroups = [ "input" ]; users.users.ari.extraGroups = [ "input" ];
# firmware updater # firmware updater
services.fwupd.enable = true; services.fwupd.enable = true;
virtualisation.docker.enableNvidia = true; virtualisation.docker.enableNvidia = true;
hardware.nvidia-container-toolkit.enable = true; hardware.nvidia-container-toolkit.enable = true;
+2 -2
View File
@@ -1,8 +1,8 @@
{ user }: { user }:
{ pkgs, lib, config, ... }: { { pkgs, lib, config, ... }: {
imports = [ ./hl-minipc1.hardware-configuration.nix ]; imports = [ ./hl-minipc1.hardware-configuration.nix ];
skyg.user.enabled = true; skyg.user.enable = true;
skyg.nixos.common.ssh-server.enabled = true; skyg.nixos.common.ssh-server.enable = true;
skyg.server.admin.enable = true; skyg.server.admin.enable = true;
# firmware updater # firmware updater
+2 -2
View File
@@ -10,8 +10,8 @@ let
in in
{ {
imports = [ ./hl-minipc1.hardware-configuration.nix ]; imports = [ ./hl-minipc1.hardware-configuration.nix ];
skyg.user.enabled = true; skyg.user.enable = true;
skyg.nixos.common.ssh-server.enabled = true; skyg.nixos.common.ssh-server.enable = true;
skyg.server.admin.enable = true; skyg.server.admin.enable = true;
# Nix Stores # Nix Stores
+3 -3
View File
@@ -1,14 +1,14 @@
{ user }: { user }:
{ pkgs, lib, config, ... }: { { pkgs, lib, config, ... }: {
imports = [ ./hl-minipc2.hardware-configuration.nix ]; imports = [ ./hl-minipc2.hardware-configuration.nix ];
skyg.user.enabled = true; skyg.user.enable = true;
skyg.nixos.common.ssh-server.enabled = true; skyg.nixos.common.ssh-server.enable = true;
# firmware updater # firmware updater
services.fwupd.enable = true; services.fwupd.enable = true;
# Bootloader. # Bootloader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
# Disable firewall # Disable firewall
networking.firewall.enable = false; networking.firewall.enable = false;
# Special udev rule for google's coral tpu # Special udev rule for google's coral tpu
skyg.nixos.server.udevrules.coraltpu.enable = true; skyg.nixos.server.udevrules.coraltpu.enable = true;
+2 -2
View File
@@ -15,8 +15,8 @@ let
in in
{ {
imports = [ ./hl-terra1.hardware-configuration.nix ]; imports = [ ./hl-terra1.hardware-configuration.nix ];
skyg.user.enabled = true; skyg.user.enable = true;
skyg.nixos.common.ssh-server.enabled = true; skyg.nixos.common.ssh-server.enable = true;
skyg.server.admin.enable = true; skyg.server.admin.enable = true;
# firmware updater # firmware updater
services.fwupd.enable = true; services.fwupd.enable = true;
+2 -2
View File
@@ -14,7 +14,7 @@ in
default = [ ]; default = [ ];
}; };
skyg.user = { skyg.user = {
enabled = mkEnableOption ""; enable = mkEnableOption "";
name = mkOption { name = mkOption {
type = types.str; type = types.str;
}; };
@@ -45,7 +45,7 @@ in
stateVersion = cfg.home-manager.version; stateVersion = cfg.home-manager.version;
}); });
in in
mkIf cfg.user.enabled mkIf cfg.user.enable
{ {
programs.zsh.enable = true; programs.zsh.enable = true;
home-manager.users.root = home-manager.users.root =
+1 -1
View File
@@ -22,7 +22,7 @@
skyg.core.hostName = hostName; skyg.core.hostName = hostName;
skyg.home-manager.version = homeManagerVersion; skyg.home-manager.version = homeManagerVersion;
skyg.core.substituters = localNixCaches; skyg.core.substituters = localNixCaches;
skyg.networkDrives.enabled = enableNetworkDrives; skyg.networkDrives.enable = enableNetworkDrives;
skyg.nixos.common.containers = (if os.enable then os.containers else { }); skyg.nixos.common.containers = (if os.enable then os.containers else { });
system.stateVersion = systemStateVersion; system.stateVersion = systemStateVersion;
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
+2 -2
View File
@@ -9,11 +9,11 @@ in
{ {
options = { options = {
skyg.networkDrives = { skyg.networkDrives = {
enabled = mkEnableOption enable = mkEnableOption
"Network Drives"; "Network Drives";
}; };
}; };
config = mkIf cfg.enabled { config = mkIf cfg.enable {
fileSystems."/torrents" = { fileSystems."/torrents" = {
device = "tnas1.lab.internal:/mnt/EightTerra/DownloadedTorrents"; device = "tnas1.lab.internal:/mnt/EightTerra/DownloadedTorrents";
fsType = "nfs"; fsType = "nfs";
+1
View File
@@ -8,5 +8,6 @@
./user.nix ./user.nix
./fonts.nix ./fonts.nix
./ssh-server.nix ./ssh-server.nix
./qemu.nix
]; ];
} }
+25
View File
@@ -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;
};
};
}
+2 -2
View File
@@ -7,7 +7,7 @@ in
{ {
options = { options = {
skyg.nixos.common.ssh-server = { skyg.nixos.common.ssh-server = {
enabled = mkEnableOption enable = mkEnableOption
"enable ssh server"; "enable ssh server";
masterPubKey = mkOption { masterPubKey = mkOption {
type = types.str; type = types.str;
@@ -15,7 +15,7 @@ in
}; };
}; };
}; };
config = mkIf cfg.enabled { config = mkIf cfg.enable {
services.openssh = { services.openssh = {
enable = true; enable = true;
openFirewall = true; openFirewall = true;
+2 -2
View File
@@ -5,11 +5,11 @@ in
{ {
options = { options = {
skyg.nixos.desktop.cosmic = { skyg.nixos.desktop.cosmic = {
enabled = lib.mkEnableOption enable = lib.mkEnableOption
"Cosmic"; "Cosmic";
}; };
}; };
config = lib.mkIf cfg.enabled { config = lib.mkIf cfg.enable {
services.desktopManager.cosmic.enable = true; services.desktopManager.cosmic.enable = true;
# services.displayManager.cosmic-greeter.enable = true; # services.displayManager.cosmic-greeter.enable = true;
}; };
+2 -2
View File
@@ -7,11 +7,11 @@ in
{ {
options = { options = {
skyg.nixos.desktop.crypto = { skyg.nixos.desktop.crypto = {
enabled = mkEnableOption enable = mkEnableOption
"Enable crypto wallets"; "Enable crypto wallets";
}; };
}; };
config = mkIf cfg.enabled { config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
trezor-suite trezor-suite
trezord trezord
+2 -2
View File
@@ -15,11 +15,11 @@ in
options = { options = {
skyg.nixos.desktop = { skyg.nixos.desktop = {
enabled = lib.mkEnableOption enable = lib.mkEnableOption
"Enable Desktop"; "Enable Desktop";
}; };
}; };
config = lib.mkIf cfg.desktop.enabled { config = lib.mkIf cfg.desktop.enable {
services.displayManager.sddm.enable = false; services.displayManager.sddm.enable = false;
services.displayManager.sddm.wayland.enable = false; services.displayManager.sddm.wayland.enable = false;
services.xserver.displayManager.gdm.enable = true; services.xserver.displayManager.gdm.enable = true;
+1 -1
View File
@@ -10,7 +10,7 @@ in
else pkgs else pkgs
; ;
in in
lib.mkIf cfg.enabled { lib.mkIf cfg.enable {
programs.hyprland = { programs.hyprland = {
enable = true; enable = true;
package = hyprpkgs.hyprland; package = hyprpkgs.hyprland;
+1 -1
View File
@@ -7,7 +7,7 @@
]; ];
options = { options = {
skyg.nixos.desktop.hyprland = with lib; { skyg.nixos.desktop.hyprland = with lib; {
enabled = mkEnableOption enable = mkEnableOption
"Hyprland"; "Hyprland";
useNWG = mkEnableOption useNWG = mkEnableOption
"nwg-shell experience"; "nwg-shell experience";
+1 -1
View File
@@ -3,7 +3,7 @@ let
cfg = config.skyg.nixos.desktop.hyprland; cfg = config.skyg.nixos.desktop.hyprland;
in 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 = { home-manager.users.${config.skyg.user.name}.wayland.windowManager.hyprland = {
enable = true; enable = true;
xwayland.enable = true; xwayland.enable = true;
+1 -1
View File
@@ -5,7 +5,7 @@ let
cfg = config.skyg.nixos.desktop.hyprland; cfg = config.skyg.nixos.desktop.hyprland;
in in
{ {
config = mkIf (cfg.enabled && cfg.useNWG) { config = mkIf (cfg.enable && cfg.useNWG) {
programs.hyprlock.enable = true; programs.hyprlock.enable = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# general utilities # general utilities
+2 -2
View File
@@ -5,11 +5,11 @@ in
{ {
options = { options = {
skyg.nixos.desktop.kde = { skyg.nixos.desktop.kde = {
enabled = lib.mkEnableOption enable = lib.mkEnableOption
"KDE"; "KDE";
}; };
}; };
config = lib.mkIf cfg.enabled { config = lib.mkIf cfg.enable {
services.desktopManager.plasma6.enable = true; services.desktopManager.plasma6.enable = true;
services.desktopManager.plasma6.enableQt5Integration = true; services.desktopManager.plasma6.enableQt5Integration = true;
environment.plasma6.excludePackages = with pkgs.kdePackages; [ environment.plasma6.excludePackages = with pkgs.kdePackages; [
+1 -1
View File
@@ -3,7 +3,7 @@ let
cfg = config.skyg.nixos.desktop; cfg = config.skyg.nixos.desktop;
in in
{ {
config = lib.mkIf cfg.enabled { config = lib.mkIf cfg.enable {
# Flatpak # Flatpak
services.flatpak.enable = true; services.flatpak.enable = true;
# Mobile Connect # Mobile Connect
+1 -1
View File
@@ -3,7 +3,7 @@ let
cfg = config.skyg.nixos.desktop; cfg = config.skyg.nixos.desktop;
in in
{ {
config = lib.mkIf cfg.enabled { config = lib.mkIf cfg.enable {
# Flatpak # Flatpak
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
wayland wayland
+1 -1
View File
@@ -3,7 +3,7 @@ let
cfg = config.skyg.nixos.desktop; cfg = config.skyg.nixos.desktop;
in in
{ {
config = lib.mkIf cfg.enabled { config = lib.mkIf cfg.enable {
services.xserver = { services.xserver = {
enable = true; enable = true;
xkb.layout = "us"; xkb.layout = "us";