diff --git a/README.org b/README.org index 0922968..9783ea2 100644 --- a/README.org +++ b/README.org @@ -262,6 +262,20 @@ Now lets turn on docker and podman. I create a lot of containers for my job. #+begin_src nix virtualisation.podman.enable = true; virtualisation.docker.enable = true; +virtualisation.libvirtd = { + enable = true; + qemu = { + runAsRoot = false; + ovmf = { + enable = true; + packages = [ + pkgs.OVMFFull.fd + pkgs.pkgsCross.aarch64-multiplatform.OVMF.fd + ]; + }; + swtpm.enable = true; + }; +}; #+end_src *** Packages @@ -305,6 +319,8 @@ procs pandoc samba blesh +# OVMFFull +quickemu #+end_src These are just for general graphical machines. Laptops, and desktops. @@ -366,6 +382,8 @@ scribus # appflowy darktable qutebrowser +virt-manager +virt-viewer # firefox kate kdialog @@ -404,8 +422,6 @@ pfetch macchina gimp powertop -quickemu -OVMFFull element-desktop-wayland scrcpy python @@ -497,7 +513,13 @@ Emacs service #+begin_src nix services.emacs = { enable = true; - package = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages (epkgs: [ epkgs.vterm epkgs.magit epkgs.pdf-tools pkgs.mu ])); + package = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages [ + (epkgs: with epkgs.melpaPackages; [ + epkgs.vterm + epkgs.magit + epkgs.pdf-tools + ]) + pkgs.mu ]); }; #+end_src @@ -1740,6 +1762,7 @@ I also use home-manager for managing dotfiles. This means that everything is con suspend = "systemctl suspend"; sysuse = "systemctl --user"; myip = "curl icanhazip.com"; + nixs = "nix search nixpkgs"; ytd = "yt-dlp -o ~/Videos/%(title)s.%(ext)s"; }; @@ -1751,9 +1774,10 @@ I also use home-manager for managing dotfiles. This means that everything is con programs.bash = { enable = true; bashrcExtra = '' - # source $(blesh-share) - # ble-face auto_complete="fg=238" - eval "$(starship init bash)" + # export ENV_EFI_CODE_SECURE=/run/libvirt/nix-ovmf/OVMF_CODE.fd ENV_EFI_VARS_SECURE=/run/libvirt/nix-ovmf/OVMF_VARS.fd + source $(blesh-share) + ble-face auto_complete="fg=238" + # eval "$(starship init bash)" ''; }; diff --git a/system/kaladin/configuration.nix b/system/kaladin/configuration.nix index 35639eb..e01701b 100644 --- a/system/kaladin/configuration.nix +++ b/system/kaladin/configuration.nix @@ -40,6 +40,20 @@ imports = virtualisation.podman.enable = true; virtualisation.docker.enable = true; + virtualisation.libvirtd = { + enable = true; + qemu = { + runAsRoot = false; + ovmf = { + enable = true; + packages = [ + pkgs.OVMFFull.fd + pkgs.pkgsCross.aarch64-multiplatform.OVMF.fd + ]; + }; + swtpm.enable = true; + }; + }; # Select internationalisation properties. i18n.defaultLocale = "en_US.UTF-8"; @@ -200,6 +214,8 @@ imports = pandoc samba blesh + # OVMFFull + quickemu discover # kde-rounded-corners lightly-qt @@ -256,6 +272,8 @@ imports = # appflowy darktable qutebrowser + virt-manager + virt-viewer # firefox kate kdialog @@ -294,8 +312,6 @@ imports = macchina gimp powertop - quickemu - OVMFFull element-desktop-wayland scrcpy python @@ -377,7 +393,13 @@ imports = services.emacs = { enable = true; - package = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages (epkgs: [ epkgs.vterm epkgs.magit epkgs.pdf-tools pkgs.mu ])); + package = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages [ + (epkgs: with epkgs.melpaPackages; [ + epkgs.vterm + epkgs.magit + epkgs.pdf-tools + ]) + pkgs.mu ]); }; services.samba-wsdd.enable = true; services.samba = { diff --git a/system/syl/configuration.nix b/system/syl/configuration.nix index 3d9dfbc..ff8dab4 100644 --- a/system/syl/configuration.nix +++ b/system/syl/configuration.nix @@ -40,6 +40,20 @@ virtualisation.podman.enable = true; virtualisation.docker.enable = true; + virtualisation.libvirtd = { + enable = true; + qemu = { + runAsRoot = false; + ovmf = { + enable = true; + packages = [ + pkgs.OVMFFull.fd + pkgs.pkgsCross.aarch64-multiplatform.OVMF.fd + ]; + }; + swtpm.enable = true; + }; + }; # Select internationalisation properties. i18n.defaultLocale = "en_US.UTF-8"; @@ -213,6 +227,8 @@ pandoc samba blesh + # OVMFFull + quickemu discover # kde-rounded-corners lightly-qt @@ -269,6 +285,8 @@ # appflowy darktable qutebrowser + virt-manager + virt-viewer # firefox kate kdialog @@ -307,8 +325,6 @@ macchina gimp powertop - quickemu - OVMFFull element-desktop-wayland scrcpy python diff --git a/user/home.nix b/user/home.nix index fe6559d..44bdca3 100644 --- a/user/home.nix +++ b/user/home.nix @@ -425,6 +425,7 @@ suspend = "systemctl suspend"; sysuse = "systemctl --user"; myip = "curl icanhazip.com"; + nixs = "nix search nixpkgs"; ytd = "yt-dlp -o ~/Videos/%(title)s.%(ext)s"; }; @@ -436,8 +437,9 @@ programs.bash = { enable = true; bashrcExtra = '' - # source $(blesh-share) - # ble-face auto_complete="fg=238" + # export ENV_EFI_CODE_SECURE=/run/libvirt/nix-ovmf/OVMF_CODE.fd ENV_EFI_VARS_SECURE=/run/libvirt/nix-ovmf/OVMF_VARS.fd + source $(blesh-share) + ble-face auto_complete="fg=238" eval "$(starship init bash)" ''; };