Compare commits
No commits in common. "62acac7285af37c861e0e66f77df88a249235b96" and "d65b9b558d942ce529a52bdd3e4874c43d7603dd" have entirely different histories.
62acac7285
...
d65b9b558d
@ -22,9 +22,10 @@
|
|||||||
{
|
{
|
||||||
imports = # For now, if applying to other system, swap files
|
imports = # For now, if applying to other system, swap files
|
||||||
[(import ./hardware-configuration.nix)] ++ # Current system hardware config @ /etc/nixos/hardware-configuration.nix
|
[(import ./hardware-configuration.nix)] ++ # Current system hardware config @ /etc/nixos/hardware-configuration.nix
|
||||||
|
#[(import ../../modules/desktop/hyprland/default.nix)] ++ # Window Manager
|
||||||
[(import ../../modules/desktop/sway/default.nix)] ++ # Window Manager
|
[(import ../../modules/desktop/sway/default.nix)] ++ # Window Manager
|
||||||
(import ../../modules/desktop/virtualisation) ++ # libvirt + Docker
|
#[(import ../../modules/editors/nvim/config/default.nix)] ++ # Window Manager
|
||||||
[(import ../../modules/desktop/virtualisation/kvm-amd)] ++ # kvm module options
|
(import ../../modules/desktop/virtualisation) ++ # Docker
|
||||||
(import ../../modules/hardware); # Hardware devices
|
(import ../../modules/hardware); # Hardware devices
|
||||||
|
|
||||||
boot = { # Boot options
|
boot = { # Boot options
|
||||||
|
@ -23,7 +23,6 @@
|
|||||||
imports = # For now, if applying to other system, swap files
|
imports = # For now, if applying to other system, swap files
|
||||||
[(import ./hardware-configuration.nix)] ++ # Current system hardware config @ /etc/nixos/hardware-configuration.nix
|
[(import ./hardware-configuration.nix)] ++ # Current system hardware config @ /etc/nixos/hardware-configuration.nix
|
||||||
[(import ../../modules/desktop/virtualisation/docker.nix)] ++ # Docker
|
[(import ../../modules/desktop/virtualisation/docker.nix)] ++ # Docker
|
||||||
[(import ../../modules/desktop/virtualisation/kvm-amd.nix)] ++ # kvm module options
|
|
||||||
(import ../../modules/services/server) ++ # Server Services
|
(import ../../modules/services/server) ++ # Server Services
|
||||||
(import ../../modules/hardware); # Hardware devices
|
(import ../../modules/hardware); # Hardware devices
|
||||||
|
|
||||||
|
@ -25,7 +25,6 @@
|
|||||||
#[(import ../../modules/desktop/hyprland/default.nix)] ++ # Window Manager
|
#[(import ../../modules/desktop/hyprland/default.nix)] ++ # Window Manager
|
||||||
[(import ../../modules/desktop/sway/default.nix)] ++ # Window Manager
|
[(import ../../modules/desktop/sway/default.nix)] ++ # Window Manager
|
||||||
[(import ../../modules/desktop/virtualisation/docker.nix)] ++ # Docker
|
[(import ../../modules/desktop/virtualisation/docker.nix)] ++ # Docker
|
||||||
[(import ../../modules/desktop/virtualisation/kvm-intel.nix)] ++ # kvm module options
|
|
||||||
(import ../../modules/hardware); # Hardware devices
|
(import ../../modules/hardware); # Hardware devices
|
||||||
|
|
||||||
boot = { # Boot options
|
boot = { # Boot options
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
{
|
{
|
||||||
imports = # For now, if applying to other system, swap files
|
imports = # For now, if applying to other system, swap files
|
||||||
[(import ./hardware-configuration.nix)] ++ # Current system hardware config @ /etc/nixos/hardware-configuration.nix
|
[(import ./hardware-configuration.nix)] ++ # Current system hardware config @ /etc/nixos/hardware-configuration.nix
|
||||||
#[(import ../../modules/desktop/virtualisation/docker.nix)] ++ # Docker
|
(import ../../modules/desktop/virtualisation) ++ # Docker
|
||||||
(import ../../modules/services/nasbackup) ++ # Server Services
|
(import ../../modules/services/nasbackup) ++ # Server Services
|
||||||
(import ../../modules/hardware); # Hardware devices
|
(import ../../modules/hardware); # Hardware devices
|
||||||
|
|
||||||
|
@ -27,12 +27,10 @@
|
|||||||
NAS-RAID1 = {
|
NAS-RAID1 = {
|
||||||
device = "/dev/disk/by-uuid/57e6446d-faca-4b67-9063-e8d9afb80088";
|
device = "/dev/disk/by-uuid/57e6446d-faca-4b67-9063-e8d9afb80088";
|
||||||
keyFile = "/root/NASKeyfile";
|
keyFile = "/root/NASKeyfile";
|
||||||
bypassWorkqueues = true;
|
|
||||||
};
|
};
|
||||||
NAS-RAID2 = {
|
NAS-RAID2 = {
|
||||||
device = "/dev/disk/by-uuid/b9edc489-ac37-4b28-981d-442722df7ae2";
|
device = "/dev/disk/by-uuid/b9edc489-ac37-4b28-981d-442722df7ae2";
|
||||||
keyFile = "/root/NASKeyfile";
|
keyFile = "/root/NASKeyfile";
|
||||||
bypassWorkqueues = true;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
boot.kernelModules = [ "kvm-intel" ];
|
||||||
|
@ -22,10 +22,9 @@
|
|||||||
{
|
{
|
||||||
imports = # For now, if applying to other system, swap files
|
imports = # For now, if applying to other system, swap files
|
||||||
[(import ./hardware-configuration.nix)] ++ # Current system hardware config @ /etc/nixos/hardware-configuration.nix
|
[(import ./hardware-configuration.nix)] ++ # Current system hardware config @ /etc/nixos/hardware-configuration.nix
|
||||||
[(import ../../modules/desktop/steam/default.nix)] ++ # jovian steam
|
[(import ../../modules/desktop/steam/default.nix)] ++ # Window Manager
|
||||||
[(import ../../modules/desktop/kde/default.nix)] ++ # Window Manager
|
[(import ../../modules/desktop/kde/default.nix)] ++ # Window Manager
|
||||||
(import ../../modules/desktop/virtualisation) ++ # libvirt + Docker
|
[(import ../../modules/desktop/virtualisation/docker.nix)] ++ # Docker
|
||||||
[(import ../../modules/desktop/virtualisation/kvm-amd.nix)] ++ # kvm module options
|
|
||||||
(import ../../modules/hardware); # Hardware devices
|
(import ../../modules/hardware); # Hardware devices
|
||||||
|
|
||||||
boot = { # Boot options
|
boot = { # Boot options
|
||||||
@ -88,5 +87,5 @@
|
|||||||
tailscale.enable = true;
|
tailscale.enable = true;
|
||||||
|
|
||||||
};
|
};
|
||||||
security.pam.sshAgentAuth.enable = true;
|
security.pam.enableSSHAgentAuth = true;
|
||||||
}
|
}
|
||||||
|
@ -13,5 +13,5 @@
|
|||||||
|
|
||||||
[
|
[
|
||||||
./docker.nix
|
./docker.nix
|
||||||
./qemu.nix
|
# ./qemu.nix
|
||||||
]
|
]
|
||||||
|
@ -1,12 +0,0 @@
|
|||||||
#
|
|
||||||
# KVM module options amd
|
|
||||||
#
|
|
||||||
|
|
||||||
{ config, pkgs, user, ... }:
|
|
||||||
|
|
||||||
{ # Add libvirtd and kvm to userGroups
|
|
||||||
boot.extraModprobeConfig = ''
|
|
||||||
options kvm_amd nested=0 avic=1 npt=1
|
|
||||||
''; # Needed to run OSX-KVM
|
|
||||||
}
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
|||||||
#
|
|
||||||
# KVM module options intel
|
|
||||||
#
|
|
||||||
|
|
||||||
{ config, pkgs, user, ... }:
|
|
||||||
|
|
||||||
{ # Add libvirtd and kvm to userGroups
|
|
||||||
boot.extraModprobeConfig = ''
|
|
||||||
options kvm_intel nested=1
|
|
||||||
options kvm_intel emulate_invalid_guest_state=0
|
|
||||||
options kvm ignore_nsrs=1
|
|
||||||
''; # Needed to run OSX-KVM
|
|
||||||
}
|
|
@ -5,6 +5,12 @@
|
|||||||
{ config, pkgs, user, ... }:
|
{ config, pkgs, user, ... }:
|
||||||
|
|
||||||
{ # Add libvirtd and kvm to userGroups
|
{ # Add libvirtd and kvm to userGroups
|
||||||
|
boot.extraModprobeConfig = ''
|
||||||
|
options kvm_intel nested=1
|
||||||
|
options kvm_intel emulate_invalid_guest_state=0
|
||||||
|
options kvm ignore_nsrs=1
|
||||||
|
''; # Needed to run OSX-KVM
|
||||||
|
|
||||||
users.groups.libvirtd.members = [ "root" "${user}" ];
|
users.groups.libvirtd.members = [ "root" "${user}" ];
|
||||||
|
|
||||||
virtualisation = {
|
virtualisation = {
|
||||||
|
Loading…
Reference in New Issue
Block a user