diff --git a/base/env.nix b/base/env.nix index 95248dc..0eaf068 100644 --- a/base/env.nix +++ b/base/env.nix @@ -2,6 +2,7 @@ mkDashDefault, pkgs, config, + lib, ... }: { environment = { diff --git a/modules/programs/basePackages.nix b/modules/programs/basePackages.nix index 0f2ff25..3531f77 100644 --- a/modules/programs/basePackages.nix +++ b/modules/programs/basePackages.nix @@ -1,4 +1,5 @@ { + mkDashDefault, config, lib, options, @@ -84,14 +85,15 @@ if config.mods.basePackages.enable then { - upower.enable = true; + preload.enable = mkDashDefault true; + upower.enable = mkDashDefault true; dbus = { - enable = true; + enable = mkDashDefault true; }; avahi = { - enable = true; - nssmdns4 = true; - openFirewall = true; + enable = mkDashDefault true; + nssmdns4 = mkDashDefault true; + openFirewall = mkDashDefault true; }; } // config.mods.basePackages.specialServices @@ -102,23 +104,23 @@ then { nix-ld = { - enable = true; + enable = mkDashDefault true; libraries = with pkgs; [ jdk zlib ]; }; direnv = { - package = pkgs.direnv; - silent = false; - loadInNixShell = true; - direnvrcExtra = ""; + package = mkDashDefault pkgs.direnv; + silent = mkDashDefault false; + loadInNixShell = mkDashDefault true; + direnvrcExtra = mkDashDefault ""; nix-direnv = { - enable = true; - package = pkgs.nix-direnv; + enable = mkDashDefault true; + package = mkDashDefault pkgs.nix-direnv; }; }; - gnupg.agent.enable = true; + gnupg.agent.enable = mkDashDefault true; } // config.mods.basePackages.specialPrograms else config.mods.basePackages.specialPrograms; diff --git a/modules/programs/coding.nix b/modules/programs/coding.nix index 781f9e1..46007ee 100644 --- a/modules/programs/coding.nix +++ b/modules/programs/coding.nix @@ -47,6 +47,12 @@ description = "Extensions to be installed"; }; }; + penpot = lib.mkOption { + default = false; + example = true; + type = lib.types.bool; + description = "Enables penpot"; + }; useDefaultPackages = lib.mkOption { default = true; example = false; @@ -469,6 +475,7 @@ [ (lib.mkIf config.mods.coding.dashvim neovide) (lib.mkIf config.mods.coding.jetbrains jetbrains-toolbox) + (lib.mkIf config.mods.coding.penpot pkgs.penpot-desktop) ] ++ config.mods.coding.additionalPackages ++ (lib.lists.optionals config.mods.coding.useDefaultPackages basePackages) diff --git a/modules/programs/hyprland/hyprland.nix b/modules/programs/hyprland/hyprland.nix index 9ba4c3e..c6ce857 100644 --- a/modules/programs/hyprland/hyprland.nix +++ b/modules/programs/hyprland/hyprland.nix @@ -1,4 +1,5 @@ { + mkDashDefault, config, lib, options, @@ -297,7 +298,7 @@ in { cursor = { enable_hyprcursor = true; - no_hardware_cursors = lib.mkDefault config.mods.gpu.nvidia.enable; + no_hardware_cursors = mkDashDefault config.mods.gpu.nvidia.enable; # done with nix, this would break the current setup otherwise sync_gsettings_theme = false; };