cleanup and secure boot

devices/inkvine/options.nix

@@ -4,7 +4,8 @@
     niri.enable = true;
     games.enable = true;
     extraLayout.enable = true;
-    vm.enable = false;
+    vm.enable = true;
+    secureboot.enable = true;
 
     stateVersion = "24.05";
     hmStateVersion = "24.11";

modules/apps/default.nix

@@ -3,6 +3,7 @@
   inherit (config) conf;
 in {
   imports = [
+    ./firefox.nix
     ./media.nix
     ./notes.nix
     ./programs.nix

modules/apps/programs.nix

@@ -2,56 +2,50 @@
   inherit (lib) mkIf;
   inherit (config) conf;
   mkXwlWrapper = import ../niri/xwl-wrapper.nix;
-in {
+in mkIf conf.apps.enable {
-  imports = [
+  services = {
-    ./firefox.nix
+    # Needed for some features in nautilus such as auto-mounting and trash
-  ];
+    gvfs.enable = true;
+  };
 
-  config = mkIf conf.apps.enable {
+  home-manager.users.${conf.username} = {
-    services = {
+    home.packages = with pkgs; [
-      # Needed for some features in nautilus such as auto-mounting and trash
+      signal-desktop
-      gvfs.enable = true;
+      vesktop
+      fractal
+      snapshot
+      nautilus
+      libreoffice-qt6-fresh
+      inkscape
+      blender
+      gnome-disk-utility
+    ] ++ [(mkXwlWrapper { lib = lib; pkgs = pkgs; app = "${pkgs.prusa-slicer}/bin/prusa-slicer"; name = "Prusa"; })];
+
+    home.file = {
+      ".config/vesktop/settings.json" = {
+        source = ./vesktop.conf.json;
+      };
+      ".config/vesktop/settings/settings.json" = {
+        source = ./vencord.conf.json;
+      };
     };
 
-    home-manager.users.${conf.username} = {
+    programs.pandoc = {
-      home.packages = with pkgs; [
+      enable = true;
-        signal-desktop
+    };
-        vesktop
-        fractal
-        snapshot
-        nautilus
-        libreoffice-qt6-fresh
-        inkscape
-        blender
-        # freecad -- broken dependency
-      ] ++ [(mkXwlWrapper { lib = lib; pkgs = pkgs; app = "${pkgs.prusa-slicer}/bin/prusa-slicer"; name = "Prusa"; })];
 
-      home.file = {
+    programs.thunderbird = {
-        ".config/vesktop/settings.json" = {
+      enable = true;
-          source = ./vesktop.conf.json;
+      profiles = {
-        };
+        "default" = {
-        ".config/vesktop/settings/settings.json" = {
+          isDefault = true;
-          source = ./vencord.conf.json;
         };
       };
+    };
 
-      programs.pandoc = {
+    programs.alacritty = {
-        enable = true;
+      enable = true;
-      };
+      settings = import ./alacritty.conf.nix { config = config; };
-
-      programs.thunderbird = {
-        enable = true;
-        profiles = {
-          "default" = {
-            isDefault = true;
-          };
-        };
-      };
-
-      programs.alacritty = {
-        enable = true;
-        settings = import ./alacritty.conf.nix { config = config; };
-      };
     };
   };
 }