Merge branch 'main' into cosmic

hosts/vm-base.nix

@@ -1,19 +1,21 @@
-{ ... }:
+{ lib, modulesPath, ... }:
 
 {
   imports = [
-    ../nix-os/core.nix
-    ../nix-os/docker.nix
-    ../nix-os/desktopManagers/gnome.nix
-    ../nix-os/displayManagers/gdm.nix
-    #../nix-os/desktop/kde-plasma.nix
-    ../nix-os/shell.nix
-    ../nix-os/virtualization.nix
-    ../nix-os/polkit/disable-shutdown.nix
-    ../nix-os/locale.nix
-    ../nix-os/adb.nix
+    "${modulesPath}/virtualisation/qemu-vm.nix"
     ../nix-os/account.nix
-    ../nix-os/xdg-default-apps.nix
+    ../nix-os/core.nix
+    ../nix-os/locale.nix
+    ../nix-os/polkit/disable-shutdown.nix
+    ../nix-os/shell.nix
     ../nix-os/udev.nix
+    ../nix-os/xdg-default-apps.nix
   ];
+
+  config = {
+    services.syncthing.enable = lib.mkForce false;
+    virtualisation = {
+      memorySize = 4096;
+    };
+  };
 }

hosts/vm-gnome.nix

@@ -0,0 +1,9 @@
+{ lib, ... }:
+
+{
+  imports = [
+    ./vm-base.nix
+    ../nix-os/desktopManagers/gnome.nix
+    ../nix-os/displayManagers/gdm.nix
+  ];
+}

lock.nix

@@ -4,8 +4,8 @@
     sha256 = "1rq8mrlmbzpcbv9ys0x88alw30ks70jlmvnfr2j8v830yy5wvw7h";
   };
   nixpkgs = {
-    revision = "05405724efa137a0b899cce5ab4dde463b4fd30b";
-    sha256 = "06490pn22x9xl4chfx12iwdgx7nlbn14v8x05rnv2y1nancljisl";
+    revision = "883180e6550c1723395a3a342f830bfc5c371f6b";
+    sha256 = "01axrf25mahbxmp6vgfgx09dflbyaavr5liynkp6rpm4lkacr27f";
   };
   cosmic-modules = {
     revision = "d8b2b9aee034c10ca67848653171f576f87434a8";

nix-os/account.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, unstablePkgs, ... }:
+{ config, lib, pkgs, unstablePkgs, ... }:
 
 {
   imports = [
@@ -11,8 +11,7 @@
     extraGroups = [
       "users"
       "wheel"
-      (if config.programs.adb.enable then "adbusers" else null)
-    ];
+    ] ++ lib.optional config.programs.adb.enable "adbusers";
     linger = true;
     initialPassword = "nixos";
     packages = with pkgs; [

nix-os/dconf-common.nix

@@ -65,15 +65,11 @@
           "color-picker@tuberry"
         ];
         favorite-apps = [
-          (if builtins.elem pkgs.kitty config.environment.systemPackages then
           "kitty.desktop"
-          else none)
           "vivaldi-stable.desktop"
           "code.desktop"
           "org.gnome.Nautilus.desktop"
-          (if config.programs.steam.enable then
           "steam.desktop"
-          else none)
           "pavucontrol.desktop"
         ];
       };