refactor: removing with pkgs blocks, other minor changes

7 files changed, 20 insertions, 19 deletions

diff --git a/modules/desktop/xdg/default.nix b/modules/desktop/xdg/default.nix
index ff9a3ff..b97ddfa 100644
--- a/modules/desktop/xdg/default.nix
+++ b/modules/desktop/xdg/default.nix
@@ -19,9 +19,9 @@ in
 
     xdg.portal = {
       enable = true;
-      extraPortals = with pkgs; [
-        xdg-desktop-portal-termfilechooser
-        xdg-desktop-portal-gtk
+      extraPortals = [
+        pkgs.xdg-desktop-portal-termfilechooser
+        pkgs.xdg-desktop-portal-gtk
       ];
       configPackages = [ pkgs.niri ];
       config.common = {
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.";
diff --git a/modules/file-management/usb/default.nix b/modules/file-management/usb/default.nix
index 0f0e191..b9b05d9 100644
--- a/modules/file-management/usb/default.nix
+++ b/modules/file-management/usb/default.nix
@@ -12,10 +12,10 @@
 
   config = lib.mkIf config.file-management.usb.enable {
     # Tools for manual mounting of usb devices
-    home.packages = with pkgs; [
-      udisks
+    home.packages = [
+      pkgs.udisks
       # For MTP devices (like phones)
-      simple-mtpfs
+      pkgs.simple-mtpfs
     ];
   };
 }
diff --git a/modules/fonts/default.nix b/modules/fonts/default.nix
index 352bc87..c7a3ec0 100644
--- a/modules/fonts/default.nix
+++ b/modules/fonts/default.nix
@@ -64,8 +64,8 @@
   config = {
     fonts.normal = lib.mkDefault "Fira Code Nerd Font";
 
-    home.packages = with pkgs; [
-      nerd-fonts.fira-code
+    home.packages = [
+      pkgs.nerd-fonts.fira-code
     ];
   };
 }
diff --git a/modules/gaming/heroic/default.nix b/modules/gaming/heroic/default.nix
index c1fb1de..ccdebed 100644
--- a/modules/gaming/heroic/default.nix
+++ b/modules/gaming/heroic/default.nix
@@ -12,11 +12,11 @@
       type = lib.types.package;
       default = pkgs.symlinkJoin {
         name = "heroic-wrapped";
-        paths = with pkgs; [
-          winetricks
-          xdg-user-dirs
-          gamemode
-          heroic
+        paths = [
+          pkgs.winetricks
+          pkgs.xdg-user-dirs
+          pkgs.gamemode
+          pkgs.heroic
         ];
         buildInputs = [ pkgs.makeWrapper ];
         postBuild = ''
diff --git a/modules/office/calcurse/calcurse-sync.sh b/modules/office/calcurse/calcurse-sync.sh
index 8323bff..9165f67 100644
--- a/modules/office/calcurse/calcurse-sync.sh
+++ b/modules/office/calcurse/calcurse-sync.sh
@@ -24,7 +24,7 @@
 set -euo pipefail
 
 DATA_DIR="${CALCURSE_DATA_DIR:-${XDG_DATA_HOME:-$HOME/.local/share}/calcurse}"
-BRANCH="main"
+BRANCH="master"
 SYNC_TIMEOUT="8"   # seconds before a network op gives up
 
 info()  { printf '\033[1;34m==>\033[0m %s\n' "$*"; }