From 15a20dd8e09c75ef26b4230f5e23ba8a029b79cb Mon Sep 17 00:00:00 2001 From: cnst Date: Sun, 5 Oct 2025 19:27:15 +0200 Subject: [PATCH] feat(pkgs): adding some dev pkgs to sobotka and dig as default --- flake.lock | 6 +++--- hosts/sobotka/modules.nix | 2 +- modules/nixos/programs/pkgs/default.nix | 14 ++++++-------- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 1216586a..1065dafb 100644 --- a/flake.lock +++ b/flake.lock @@ -803,11 +803,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1759530922, - "narHash": "sha256-9NgZKpibALekGTPDc2O8lP8vFealQSZkXe+L+S7MMZU=", + "lastModified": 1759674289, + "narHash": "sha256-k5rLyuqOpiks2nKINgPmzui1cpi03tMdabQFmITI7/w=", "owner": "hyprwm", "repo": "hyprland", - "rev": "76d998743ac10e712238c1016db4d8e8d16f1049", + "rev": "cfac27251af5df4352f747c4539ea9f65450f05a", "type": "github" }, "original": { diff --git a/hosts/sobotka/modules.nix b/hosts/sobotka/modules.nix index 4d70c502..1637c853 100644 --- a/hosts/sobotka/modules.nix +++ b/hosts/sobotka/modules.nix @@ -109,7 +109,7 @@ enable = true; }; dev = { - enable = false; + enable = true; }; }; mysql-workbench = { diff --git a/modules/nixos/programs/pkgs/default.nix b/modules/nixos/programs/pkgs/default.nix index 1c11ca03..cbef6e73 100644 --- a/modules/nixos/programs/pkgs/default.nix +++ b/modules/nixos/programs/pkgs/default.nix @@ -3,17 +3,16 @@ config, lib, ... -}: -let - inherit (lib) +}: let + inherit + (lib) mkIf mkOption mkMerge types ; cfg = config.nixos.programs.pkgs; -in -{ +in { options = { nixos.programs.pkgs = { enable = mkOption { @@ -51,8 +50,7 @@ in }; config = mkIf cfg.enable { - environment.systemPackages = - with pkgs; + environment.systemPackages = with pkgs; mkMerge [ [ pciutils @@ -78,6 +76,7 @@ in openssl xmrig ocl-icd + dig ] (mkIf cfg.common.enable [ @@ -110,7 +109,6 @@ in (mkIf cfg.server.enable [ nvtopPackages.intel nvtopPackages.amd - dig helix zfs zfstools