From 49403e9078d1169483bc4b1c9053dabbffeeecb2 Mon Sep 17 00:00:00 2001 From: Annika Merris Date: Fri, 27 Dec 2024 16:02:42 -0500 Subject: [PATCH 1/2] Flake update and try to add Bambu Studio --- flake.lock | 24 +++++++------- .../{prusa-slicer.nix => bambu-studio.nix} | 10 +++--- modules/common/applications/slicers.nix | 31 +++++++++++++++++++ 3 files changed, 48 insertions(+), 17 deletions(-) rename modules/common/applications/{prusa-slicer.nix => bambu-studio.nix} (58%) create mode 100644 modules/common/applications/slicers.nix diff --git a/flake.lock b/flake.lock index a6c9be2..3c3212f 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ ] }, "locked": { - "lastModified": 1733168902, - "narHash": "sha256-8dupm9GfK+BowGdQd7EHK5V61nneLfr9xR6sc5vtDi0=", + "lastModified": 1735048446, + "narHash": "sha256-Tc35Y8H+krA6rZeOIczsaGAtobSSBPqR32AfNTeHDRc=", "owner": "nix-community", "repo": "disko", - "rev": "785c1e02c7e465375df971949b8dcbde9ec362e5", + "rev": "3a4de9fa3a78ba7b7170dda6bd8b4cdab87c0b21", "type": "github" }, "original": { @@ -77,11 +77,11 @@ ] }, "locked": { - "lastModified": 1733754861, - "narHash": "sha256-3JKzIou54yjiMVmvgdJwopekEvZxX3JDT8DpKZs4oXY=", + "lastModified": 1735053786, + "narHash": "sha256-Gm+0DcbUS338vvkwyYWms5jsWlx8z8MeQBzcnIDuIkw=", "owner": "nix-community", "repo": "home-manager", - "rev": "9ebaa80a227eaca9c87c53ed515ade013bc2bca9", + "rev": "35b98d20ca8f4ca1f6a2c30b8a2c8bb305a36d84", "type": "github" }, "original": { @@ -143,11 +143,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1733581040, - "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { @@ -188,11 +188,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1733128155, - "narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=", + "lastModified": 1734546875, + "narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856", + "rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d", "type": "github" }, "original": { diff --git a/modules/common/applications/prusa-slicer.nix b/modules/common/applications/bambu-studio.nix similarity index 58% rename from modules/common/applications/prusa-slicer.nix rename to modules/common/applications/bambu-studio.nix index 041eff7..f16fae1 100644 --- a/modules/common/applications/prusa-slicer.nix +++ b/modules/common/applications/bambu-studio.nix @@ -1,18 +1,18 @@ { config, pkgs, lib, ... }: { options = { - prusa-slicer = { + bambu-studio = { enable = lib.mkEnableOption { - description = "Enable Prusa Slicer"; + description = "Enable Bambu Studio"; default = false; }; }; }; - config = lib.mkIf (config.gui.enable && config.prusa-slicer.enable) { + config = lib.mkIf (config.gui.enable && config.bambu-studio.enable) { home-manager.users.${config.user} = { home.packages = [ - pkgs.prusa-slicer + pkgs.bambu-studio ]; }; }; -} +} \ No newline at end of file diff --git a/modules/common/applications/slicers.nix b/modules/common/applications/slicers.nix new file mode 100644 index 0000000..c22b92f --- /dev/null +++ b/modules/common/applications/slicers.nix @@ -0,0 +1,31 @@ +{ config, pkgs, lib, ... }: +{ + options = { + prusa-slicer = { + enable = lib.mkEnableOption { + description = "Enable Prusa Slicer"; + default = false; + }; + }; + bambu-studio = { + enable = lib.mkEnableOption { + description = "Enable Bambu Studio"; + default = false; + }; + }; + }; + config = lib.mkIf (config.gui.enable && config.prusa-slicer.enable) { + home-manager.users.${config.user} = { + home.packages = [ + pkgs.prusa-slicer + ]; + }; + }; + config = lib.mkIf (config.gui.enable && config.bambu-studio.enable) { + home-manager.users.${config.user} = { + home.packages = [ + pkgs.bambu-studio + ]; + }; + }; +} From 14b172fa248570b8037d4d9a7ab79067e2fc6b73 Mon Sep 17 00:00:00 2001 From: Annika Merris Date: Fri, 27 Dec 2024 18:59:41 -0500 Subject: [PATCH 2/2] FreeCAD --- hosts/kim/default.nix | 2 ++ modules/common/applications/bambu-studio.nix | 18 ------------- modules/common/applications/default.nix | 3 ++- modules/common/applications/freecad.nix | 16 ++++++++++++ modules/common/applications/slicers.nix | 27 ++++++++++---------- 5 files changed, 34 insertions(+), 32 deletions(-) delete mode 100644 modules/common/applications/bambu-studio.nix create mode 100644 modules/common/applications/freecad.nix diff --git a/hosts/kim/default.nix b/hosts/kim/default.nix index bae0057..d02df06 100644 --- a/hosts/kim/default.nix +++ b/hosts/kim/default.nix @@ -64,9 +64,11 @@ inputs.nixpkgs.lib.nixosSystem { services.openssh.enable = true; services.flatpak.enable = true; # Apps + bambu-studio.enable = true; discord.enable = true; element.enable = true; firefox.enable = true; + freecad.enable = true; kcalc.enable = true; kitty.enable = true; # netbird.enable = true; See netbird.nix (I can't access the sops stuff from here?) diff --git a/modules/common/applications/bambu-studio.nix b/modules/common/applications/bambu-studio.nix deleted file mode 100644 index f16fae1..0000000 --- a/modules/common/applications/bambu-studio.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ config, pkgs, lib, ... }: -{ - options = { - bambu-studio = { - enable = lib.mkEnableOption { - description = "Enable Bambu Studio"; - default = false; - }; - }; - }; - config = lib.mkIf (config.gui.enable && config.bambu-studio.enable) { - home-manager.users.${config.user} = { - home.packages = [ - pkgs.bambu-studio - ]; - }; - }; -} \ No newline at end of file diff --git a/modules/common/applications/default.nix b/modules/common/applications/default.nix index dca9540..6a07ce1 100644 --- a/modules/common/applications/default.nix +++ b/modules/common/applications/default.nix @@ -4,13 +4,14 @@ ./discord.nix ./element.nix ./firefox.nix + ./freecad.nix ./kcalc.nix ./kitty.nix ./lutris.nix ./netbird.nix ./obsidian.nix ./openrgb.nix - ./prusa-slicer.nix + ./slicers.nix ./spotifyd.nix ./thunderbird.nix ]; diff --git a/modules/common/applications/freecad.nix b/modules/common/applications/freecad.nix new file mode 100644 index 0000000..0ccc4f1 --- /dev/null +++ b/modules/common/applications/freecad.nix @@ -0,0 +1,16 @@ +{ config, pkgs, lib, ... }: +{ + options = { + freecad = { + enable = lib.mkEnableOption { + description = "Enable FreeCAD"; + default = false; + }; + }; + }; + config = lib.mkIf (config.gui.enable && config.freecad.enable) { + environment.systemPackages = [ + pkgs.freecad + ]; + }; +} diff --git a/modules/common/applications/slicers.nix b/modules/common/applications/slicers.nix index c22b92f..48e0a19 100644 --- a/modules/common/applications/slicers.nix +++ b/modules/common/applications/slicers.nix @@ -14,18 +14,19 @@ }; }; }; - config = lib.mkIf (config.gui.enable && config.prusa-slicer.enable) { - home-manager.users.${config.user} = { - home.packages = [ - pkgs.prusa-slicer - ]; - }; - }; - config = lib.mkIf (config.gui.enable && config.bambu-studio.enable) { - home-manager.users.${config.user} = { - home.packages = [ - pkgs.bambu-studio - ]; - }; + config = lib.mkIf (config.gui.enable) { + home-manager.users.${config.user} = lib.mkMerge [ + {} + (lib.mkIf (config.prusa-slicer.enable) { + home.packages = [ + pkgs.prusa-slicer + ]; + }) + (lib.mkIf (config.bambu-studio.enable) { + home.packages = [ + pkgs.bambu-studio + ]; + }) + ]; }; }