FreeCAD

flake.lock

@@ -24,11 +24,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733168902,
+        "lastModified": 1735048446,
-        "narHash": "sha256-8dupm9GfK+BowGdQd7EHK5V61nneLfr9xR6sc5vtDi0=",
+        "narHash": "sha256-Tc35Y8H+krA6rZeOIczsaGAtobSSBPqR32AfNTeHDRc=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "785c1e02c7e465375df971949b8dcbde9ec362e5",
+        "rev": "3a4de9fa3a78ba7b7170dda6bd8b4cdab87c0b21",
         "type": "github"
       },
       "original": {
@@ -77,11 +77,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733754861,
+        "lastModified": 1735053786,
-        "narHash": "sha256-3JKzIou54yjiMVmvgdJwopekEvZxX3JDT8DpKZs4oXY=",
+        "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,
+        "lastModified": 1734649271,
-        "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=",
+        "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01",
+        "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
         "type": "github"
       },
       "original": {
@@ -188,11 +188,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1733128155,
+        "lastModified": 1734546875,
-        "narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=",
+        "narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856",
+        "rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d",
         "type": "github"
       },
       "original": {

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?)

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
   ];

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
+    ];
+  };
+}

modules/common/applications/prusa-slicer.nix

@@ -1,18 +0,0 @@
-{ config, pkgs, lib, ... }:
-{
-  options = {
-    prusa-slicer = {
-      enable = lib.mkEnableOption {
-        description = "Enable Prusa Slicer";
-        default = false;
-      };
-    };
-  };
-  config = lib.mkIf (config.gui.enable && config.prusa-slicer.enable) {
-    home-manager.users.${config.user} = {
-      home.packages = [
-        pkgs.prusa-slicer
-      ];
-    };
-  };
-}

modules/common/applications/slicers.nix

@@ -0,0 +1,32 @@
+{ 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) {
+    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
+        ];
+      })
+    ];
+  };
+}