From 9cedd06b8589a5d39a7a85e2efe646a8edebac53 Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 8 May 2023 00:21:41 -0400 Subject: modules: merge base and nixos --- modules/base/default.nix | 49 ------------------------------------------ modules/base/documentation.nix | 19 ---------------- modules/base/packages.nix | 34 ----------------------------- 3 files changed, 102 deletions(-) delete mode 100644 modules/base/default.nix delete mode 100644 modules/base/documentation.nix delete mode 100644 modules/base/packages.nix (limited to 'modules/base') diff --git a/modules/base/default.nix b/modules/base/default.nix deleted file mode 100644 index 72911a5..0000000 --- a/modules/base/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: let - cfg = config.getchoo.base; - inherit (lib) mkDefault mkEnableOption mkIf; -in { - options.getchoo.base.enable = mkEnableOption "base module"; - - imports = [ - ./documentation.nix - ./packages.nix - ]; - - config = let - channelPath = "/etc/nix/channels/nixpkgs"; - in - mkIf cfg.enable { - getchoo.base = { - documentation.enable = mkDefault true; - defaultPackages.enable = mkDefault true; - }; - - nix = { - package = mkDefault pkgs.nixFlakes; - - gc = { - automatic = mkDefault true; - dates = mkDefault "weekly"; - options = mkDefault "--delete-older-than 7d"; - }; - - settings = { - auto-optimise-store = true; - experimental-features = ["nix-command" "flakes"]; - }; - - nixPath = [ - "nixpkgs=${channelPath}" - ]; - }; - - systemd.tmpfiles.rules = [ - "L+ ${channelPath} - - - - ${pkgs.path}" - ]; - }; -} diff --git a/modules/base/documentation.nix b/modules/base/documentation.nix deleted file mode 100644 index 9064507..0000000 --- a/modules/base/documentation.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: let - cfg = config.getchoo.base.documentation; - inherit (lib) mkEnableOption mkIf; -in { - options.getchoo.base.documentation.enable = mkEnableOption "base module documentation"; - - config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [man-pages man-pages-posix]; - documentation = { - dev.enable = true; - man.enable = true; - }; - }; -} diff --git a/modules/base/packages.nix b/modules/base/packages.nix deleted file mode 100644 index a082196..0000000 --- a/modules/base/packages.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: let - cfg = config.getchoo.base.defaultPackages; - inherit (lib) mkEnableOption mkIf; -in { - options.getchoo.base.defaultPackages.enable = mkEnableOption "base module default packages"; - - config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [ - cachix - hyfetch - neofetch - pinentry-curses - python311 - ]; - - programs = { - git.enable = true; - - gnupg = { - agent = { - enable = true; - pinentryFlavor = lib.mkDefault "curses"; - }; - }; - - vim.defaultEditor = true; - }; - }; -} -- cgit v1.2.3