From 6e70c2e409b632c113364ce34c79aa1385d8e56f Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Thu, 13 Feb 2025 18:54:26 -0500 Subject: darwin/desktop: move to mixins and defaults --- modules/darwin/desktop/default.nix | 12 ------------ modules/darwin/desktop/fonts.nix | 20 -------------------- modules/darwin/desktop/homebrew.nix | 28 ---------------------------- modules/darwin/desktop/programs.nix | 20 -------------------- 4 files changed, 80 deletions(-) delete mode 100644 modules/darwin/desktop/default.nix delete mode 100644 modules/darwin/desktop/fonts.nix delete mode 100644 modules/darwin/desktop/homebrew.nix delete mode 100644 modules/darwin/desktop/programs.nix (limited to 'modules/darwin/desktop') diff --git a/modules/darwin/desktop/default.nix b/modules/darwin/desktop/default.nix deleted file mode 100644 index 878d13d..0000000 --- a/modules/darwin/desktop/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ lib, ... }: -{ - options.desktop = { - enable = lib.mkEnableOption "basic desktop settings"; - }; - - imports = [ - ./fonts.nix - ./homebrew.nix - ./programs.nix - ]; -} diff --git a/modules/darwin/desktop/fonts.nix b/modules/darwin/desktop/fonts.nix deleted file mode 100644 index b4d4ca3..0000000 --- a/modules/darwin/desktop/fonts.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -let - cfg = config.desktop.fonts; -in -{ - options.desktop.fonts = { - enable = lib.mkEnableOption "desktop fonts" // { - default = config.desktop.enable; - }; - }; - - config = lib.mkIf cfg.enable { - fonts.packages = [ pkgs.nerd-fonts.fira-code ]; - }; -} diff --git a/modules/darwin/desktop/homebrew.nix b/modules/darwin/desktop/homebrew.nix deleted file mode 100644 index 93fe4ad..0000000 --- a/modules/darwin/desktop/homebrew.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ config, lib, ... }: -let - cfg = config.desktop.homebrew; -in -{ - options.desktop.homebrew = { - enable = lib.mkEnableOption "Homebrew integration" // { - default = config.desktop.enable; - }; - }; - - config = lib.mkIf cfg.enable { - homebrew = { - enable = true; - - onActivation = lib.mkDefault { - autoUpdate = true; - cleanup = "zap"; - upgrade = true; - }; - - caskArgs = { - no_quarantine = true; - require_sha = false; - }; - }; - }; -} diff --git a/modules/darwin/desktop/programs.nix b/modules/darwin/desktop/programs.nix deleted file mode 100644 index fd635da..0000000 --- a/modules/darwin/desktop/programs.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ config, lib, ... }: -let - cfg = config.desktop.defaultPrograms; -in -{ - options.desktop.defaultPrograms = { - enable = lib.mkEnableOption "default desktop programs" // { - default = config.desktop.enable; - }; - }; - - config = lib.mkIf cfg.enable { - homebrew.casks = [ - "chromium" - "iterm2" - ]; - - programs.gnupg.agent.enable = lib.mkDefault true; - }; -} -- cgit v1.2.3