From 394f71cfb67abf36114d16d099b86a74a413cb97 Mon Sep 17 00:00:00 2001 From: DACHXY Date: Fri, 20 Dec 2024 22:35:43 +0800 Subject: [PATCH] add libvirt --- home/user/default.nix | 1 + home/user/programs.nix | 19 +++++++++---------- home/user/shell.nix | 13 ++++++------- home/user/virtualization.nix | 9 +++++++++ system/modules/default.nix | 2 +- system/modules/virtualisation.nix | 13 ------------- system/modules/virtualization.nix | 22 ++++++++++++++++++++++ 7 files changed, 48 insertions(+), 31 deletions(-) create mode 100644 home/user/virtualization.nix delete mode 100644 system/modules/virtualisation.nix create mode 100644 system/modules/virtualization.nix diff --git a/home/user/default.nix b/home/user/default.nix index 60d8e1b..bacc180 100644 --- a/home/user/default.nix +++ b/home/user/default.nix @@ -7,6 +7,7 @@ ./packages.nix ./programs.nix ./environment.nix + ./virtualization.nix ]; nixpkgs = { diff --git a/home/user/programs.nix b/home/user/programs.nix index c6999ff..e6429ee 100644 --- a/home/user/programs.nix +++ b/home/user/programs.nix @@ -1,14 +1,13 @@ -{ inputs, pkgs, ... }: - +{ pkgs, ... }: { - programs = { - neovim = { - enable = true; - withNodeJs = true; - extraLuaPackages = ps: [ ps.magick ]; - extraPackages = [ pkgs.imagemagick ]; - }; + programs = { + neovim = { + enable = true; + withNodeJs = true; + extraLuaPackages = ps: [ ps.magick ]; + extraPackages = [ pkgs.imagemagick ]; + }; bash.enable = true; - }; + }; } diff --git a/home/user/shell.nix b/home/user/shell.nix index a657032..e6bd7d8 100644 --- a/home/user/shell.nix +++ b/home/user/shell.nix @@ -1,6 +1,5 @@ -{ config, pkgs, ... }: -let - in { +{ ... }: +{ programs = { nushell = { enable = true; @@ -11,13 +10,13 @@ let carapace.enable = true; carapace.enableNushellIntegration = true; - starship = { - enable = true; + starship = { + enable = true; }; zoxide = { - enable = true; - enableNushellIntegration = true; + enable = true; + enableNushellIntegration = true; }; }; } diff --git a/home/user/virtualization.nix b/home/user/virtualization.nix new file mode 100644 index 0000000..da99ca6 --- /dev/null +++ b/home/user/virtualization.nix @@ -0,0 +1,9 @@ +{ ... }: +{ + dconf.settings = { + "org/virt-manager/virt-manager/connections" = { + autoconnect = [ "qemu:///system" ]; + uris = [ "qemu:///system" ]; + }; + }; +} diff --git a/system/modules/default.nix b/system/modules/default.nix index 47bf795..3fd6def 100644 --- a/system/modules/default.nix +++ b/system/modules/default.nix @@ -24,6 +24,6 @@ ./wireguard.nix ./dn-ca.nix ./environment.nix - ./virtualisation.nix + ./virtualization.nix ]; } diff --git a/system/modules/virtualisation.nix b/system/modules/virtualisation.nix deleted file mode 100644 index 993c7a5..0000000 --- a/system/modules/virtualisation.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ pkgs, ... }: - -{ - virtualisation = { - docker.enable = true; - - # Run container as systemd service - oci-containers = { - backend = "docker"; - containers = {}; - }; - }; - } diff --git a/system/modules/virtualization.nix b/system/modules/virtualization.nix new file mode 100644 index 0000000..6b421dd --- /dev/null +++ b/system/modules/virtualization.nix @@ -0,0 +1,22 @@ +{ pkgs, ... }: + +{ + programs.virt-manager.enable = true; + users.groups.libvirtd.members = [ "danny" ]; + + virtualisation = { + docker.enable = true; + + # Run container as systemd service + oci-containers = { + backend = "docker"; + containers = { }; + }; + + libvirtd = { + enable = true; + }; + + spiceUSBRedirection.enable = true; + }; +}