From e0c1ea8d629ea2d4ef7812d9e4d263f06513ef9f Mon Sep 17 00:00:00 2001
From: Annika Merris <me@annikamerris.com>
Date: Wed, 28 Aug 2024 11:08:02 -0400
Subject: [PATCH] Added Appimage and virt-manager

---
 hosts/kim/default.nix                   |  1 +
 modules/common/utilities/appimage.nix   | 16 ++++++++++++++++
 modules/common/utilities/default.nix    |  1 +
 modules/nixos/software/virt-manager.nix |  5 ++++-
 modules/nixos/users/annika.nix          |  2 +-
 5 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 modules/common/utilities/appimage.nix

diff --git a/hosts/kim/default.nix b/hosts/kim/default.nix
index c1c7bf7..1ccb4f3 100644
--- a/hosts/kim/default.nix
+++ b/hosts/kim/default.nix
@@ -84,6 +84,7 @@ inputs.nixpkgs.lib.nixosSystem {
       virt-manager.enable = true;
       # Utilities
       # git is not optional
+      appimage.enable = true;
       docker.enable = true;
       yubikey.enable = true;
       kdeconnect.enable = true;
diff --git a/modules/common/utilities/appimage.nix b/modules/common/utilities/appimage.nix
new file mode 100644
index 0000000..76b867e
--- /dev/null
+++ b/modules/common/utilities/appimage.nix
@@ -0,0 +1,16 @@
+{ config, pkgs, lib, ... }:
+{
+  options = {
+    appimage = {
+      enable = lib.mkEnableOption {
+        description = "Install appimage-run";
+        default = false;
+      };
+    };
+  };
+  config = lib.mkIf (config.gui.enable && config.appimage.enable) {
+    environment.systemPackages = [
+      pkgs.appimage-run
+    ];
+  };
+}
\ No newline at end of file
diff --git a/modules/common/utilities/default.nix b/modules/common/utilities/default.nix
index 2a4aac3..f7820c8 100644
--- a/modules/common/utilities/default.nix
+++ b/modules/common/utilities/default.nix
@@ -1,6 +1,7 @@
 { ... }:
 {
   imports = [
+    ./appimage.nix
     ./docker.nix
     ./git.nix
     ./kdeconnect.nix
diff --git a/modules/nixos/software/virt-manager.nix b/modules/nixos/software/virt-manager.nix
index a6a8305..0921ae9 100644
--- a/modules/nixos/software/virt-manager.nix
+++ b/modules/nixos/software/virt-manager.nix
@@ -9,7 +9,10 @@
     };
   };
   config = lib.mkIf (config.virt-manager.enable) {
-    virtualization.libvirtd.enable = true;
+    virtualisation.libvirtd.enable = true;
     programs.virt-manager.enable = true;
+    environment.systemPackages = [
+      pkgs.virtiofsd
+    ];
   };
 }
diff --git a/modules/nixos/users/annika.nix b/modules/nixos/users/annika.nix
index c840255..4ffe962 100644
--- a/modules/nixos/users/annika.nix
+++ b/modules/nixos/users/annika.nix
@@ -6,7 +6,7 @@
     isNormalUser = true;
     home = "/home/annika";
     description = "Annika Merris";
-    extraGroups = [ "networkmanager" "wheel", "libvirtd" ];
+    extraGroups = [ "networkmanager" "wheel" "libvirtd" ];
     openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG9NhsAOBwWBdBeenfaPoRtqQrAIgg7E5m4sKYQU9cFx annika@kim" ];
     hashedPasswordFile = config.sops.secrets.annika_password.path;
   };