From 140394b7ab67124f186358a4471164cb4a1ae967 Mon Sep 17 00:00:00 2001 From: arpitchakladar Date: Wed, 9 Sep 2026 19:37:41 +0530 Subject: refactor: removing with pkgs blocks, other minor changes --- modules/development/git/default.nix | 1 + modules/development/qemu/default.nix | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'modules/development') diff --git a/modules/development/git/default.nix b/modules/development/git/default.nix index ce92674..15dcc80 100644 --- a/modules/development/git/default.nix +++ b/modules/development/git/default.nix @@ -61,6 +61,7 @@ log.showSignature = true; pull.rebase = true; init.defaultBranch = "master"; + merge.ff = false; } (lib.optionalAttrs config.development.delta.enable { diff --git a/modules/development/qemu/default.nix b/modules/development/qemu/default.nix index c426e75..db5f7cf 100644 --- a/modules/development/qemu/default.nix +++ b/modules/development/qemu/default.nix @@ -12,11 +12,11 @@ type = lib.types.package; default = pkgs.symlinkJoin { name = "qemu-bundle"; - paths = with pkgs; [ - qemu - libvirt - virtiofsd - virt-manager + paths = [ + pkgs.qemu + pkgs.libvirt + pkgs.virtiofsd + pkgs.virt-manager ]; }; description = "Bundle of QEMU-related packages."; -- cgit v1.2.3