From c4ee6b973f70d93de3c084a55a66a79440728506 Mon Sep 17 00:00:00 2001 From: Tyler Starr Date: Thu, 24 Oct 2024 22:31:43 -0700 Subject: [PATCH] clean up devel folder --- provision/modules/devel/default.nix | 5 ++++- provision/modules/devel/engineering.nix | 12 ++++-------- provision/modules/devel/notes.nix | 9 ++------- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/provision/modules/devel/default.nix b/provision/modules/devel/default.nix index 9e373682..7e5d079c 100644 --- a/provision/modules/devel/default.nix +++ b/provision/modules/devel/default.nix @@ -1,4 +1,7 @@ { ... }: { - imports = [ ./notes.nix ./engineering.nix ]; + imports = [ + ./engineering.nix + ./notes.nix + ]; } diff --git a/provision/modules/devel/engineering.nix b/provision/modules/devel/engineering.nix index a76ab6ab..3864da0b 100644 --- a/provision/modules/devel/engineering.nix +++ b/provision/modules/devel/engineering.nix @@ -1,18 +1,14 @@ -# CAD and 3d printing and everything nice - { config, lib, pkgs, user, ... }: -let - cfg = config.modules.devel.engineering; +let cfg = config.modules.devel.engineering; in { options.modules.devel.engineering.enable = lib.mkEnableOption "engineering"; config = lib.mkIf cfg.enable { - environment.systemPackages = with pkgs; [ - prusa-slicer # Slicing software optimized for Prusa 3D printers, offering user-friendly interface and settings. - freecad # Open-source parametric 3D CAD modeler. blender # Open-source 3D creation suite for modeling, animation, rendering, and more. - openscad + freecad # Open-source parametric 3D CAD modeler. + openscad # Open-source script-only based modeller. + prusa-slicer # Slicing software optimized for Prusa 3D printers, offering user-friendly interface and settings. ]; }; } diff --git a/provision/modules/devel/notes.nix b/provision/modules/devel/notes.nix index 5abd824e..5ddd3e52 100644 --- a/provision/modules/devel/notes.nix +++ b/provision/modules/devel/notes.nix @@ -1,17 +1,12 @@ { config, lib, pkgs, user, ... }: -let - cfg = config.modules.devel.notes; +let cfg = config.modules.devel.notes; in { options.modules.devel.notes.enable = lib.mkEnableOption "notes"; config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ - pandoc # Universal document converter. - gollum # Wiki software that provides a simple, Git-based wiki engine. obsidian # Note-taking and knowledge management application. - zk # Command-line tool for interacting with Apache ZooKeeper, a centralized service for distributed systems. - bat # Cat clone with syntax highlighting and Git integration. - fzf # Command-line fuzzy finder for Unix-like operating systems. + pandoc # Universal document converter. ]; }; }