merge changes from main

5 files changed, 10 insertions, 6 deletions

diff --git a/hosts/jupiter/config.nix b/hosts/jupiter/config.nix
index 17cf67b..a0c1583 100644
--- a/hosts/jupiter/config.nix
+++ b/hosts/jupiter/config.nix
@@ -44,6 +44,7 @@
     };
 
     boot = {
+      timeout = 5;
       systemd-boot.enable = true;
       plymouth.enable = true;
     };
diff --git a/hosts/jupiter/hjem.nix b/hosts/jupiter/hjem.nix
index 3c85521..3ab44d4 100644
--- a/hosts/jupiter/hjem.nix
+++ b/hosts/jupiter/hjem.nix
@@ -1,15 +1,11 @@
 {pkgs, ...}: {
   packages = with pkgs; [
-    orca-slicer
-    bambu-studio
-
-    freecad-wayland
     gimp
     qbittorrent
     bottles
 
     vital
     musescore
-    helvum
+    qpwgraph
   ];
 }
diff --git a/hosts/jupiter/nixos.nix b/hosts/jupiter/nixos.nix
index 5afeefe..e39328a 100644
--- a/hosts/jupiter/nixos.nix
+++ b/hosts/jupiter/nixos.nix
@@ -8,6 +8,8 @@
     inputs.nixos-facter-modules.nixosModules.facter
   ];
 
+  boot.blacklistedKernelModules = ["snd_seq_dummy"];
+
   systemd.network.wait-online.enable = false; # fix for weird wifi issue
 
   fonts.packages = [pkgs.nerd-fonts.iosevka];
diff --git a/modules/boot/nixos/default.nix b/modules/boot/nixos/default.nix
index 8e710c8..026226b 100644
--- a/modules/boot/nixos/default.nix
+++ b/modules/boot/nixos/default.nix
@@ -24,7 +24,7 @@ in {
           configurationLimit = 3;
         };
         efi.canTouchEfiVariables = true;
-        timeout = 0; # hold space to show boot menu
+        timeout = cfg.timeout; # hold space to show boot menu
       };
     }
     // (lib.optionalAttrs cfg.secureBoot.enable {
diff --git a/modules/boot/options.nix b/modules/boot/options.nix
index dc6d3b3..2f670f9 100644
--- a/modules/boot/options.nix
+++ b/modules/boot/options.nix
@@ -8,6 +8,11 @@ in {
   options = {
     collinux.boot = {
       systemd-boot.enable = mkEnableOption "systemd-boot";
+      timeout = mkOption {
+        description = "bootloader timeout";
+        type = lib.types.int;
+        default = 0;
+      };
       plymouth = {
         enable = mkEnableOption "plymouth bootsplash";
         theme = mkOption {