More fixes and options

snowfallorg · Oct 30, 2023 · d0ed77a · d0ed77a
1 parent aab48d5
commit d0ed77a
Show file tree

Hide file tree

Showing 8 changed files with 210 additions and 67 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/modules/nixos/biosboot/default.nix b/modules/nixos/biosboot/default.nix
@@ -5,9 +5,6 @@ let
   cfg = config.modules.biosboot;
 in
 {
-  options.modules.biosboot = with types; {
-  };
-
   config = {
     boot.loader = {
       systemd-boot.enable = false;

diff --git a/modules/nixos/gnome/default.nix b/modules/nixos/gnome/default.nix
@@ -6,9 +6,9 @@ let
 in
 {
   options.modules.gnome = with types; {
-    gsconnect =
+    gsconnect.enable =
       mkEnableOption "Enable KDE Connect integration";
-    removeUtils =
+    removeUtils.enable =
       mkEnableOption "Remove non-essential GNOME utilities";
   };
 
@@ -24,12 +24,14 @@ in
     systemd.services."getty@tty1".enable = false;
     systemd.services."autovt@tty1".enable = false;
 
-    programs.kdeconnect = mkIf cfg.gsconnect {
+    programs.gnupg.agent.pinentryFlavor = mkDefault "gnome3";
+
+    programs.kdeconnect = mkIf cfg.gsconnect.enable {
       package = pkgs.gnomeExtensions.gsconnect;
       enable = true;
     };
 
-    environment.gnome.excludePackages = mkIf cfg.removeUtils (with pkgs.gnome; [
+    environment.gnome.excludePackages = mkIf cfg.removeUtils.enable (with pkgs.gnome; [
       baobab
       cheese
       eog

diff --git a/modules/nixos/networking/default.nix b/modules/nixos/networking/default.nix
@@ -1,8 +1,14 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 with lib;
 {
   config = {
     networking.networkmanager.enable = mkDefault true;
     networking.wireless.enable = mkDefault false;
+    # Workaround for https://github.com/NixOS/nixpkgs/issues/180175
+    systemd.services.NetworkManager-wait-online = {
+      serviceConfig = {
+        ExecStart = [ "" "${pkgs.networkmanager}/bin/nm-online -q" ];
+      };
+    };
   };
 }
diff --git a/modules/nixos/packagemanagers/default.nix b/modules/nixos/packagemanagers/default.nix
@@ -6,11 +6,11 @@ let
 in
 {
   options.modules.packagemanagers = with types; {
-    appimage =
+    appimage.enable =
       mkEnableOption "Enable AppImage";
   };
 
-  config = mkIf cfg.appimage {
+  config = mkIf cfg.appimage.enable {
     environment.systemPackages = [ pkgs.appimage-run ];
   };
 }
diff --git a/modules/nixos/packagemanagers/module.yml b/modules/nixos/packagemanagers/module.yml
@@ -15,7 +15,7 @@ options:
   type: !switch
     default: false
 - label: "AppImage"
-  id: modules.packagemanagers.appimage
+  id: modules.packagemanagers.appimage.enable
   description: "Enable AppImage support by installing the \"appimage-run\" package. For AppImages to work, you must run them with the \"appimage-run\" command."
   type: !switch
     default: false