From 8bb13a904cdb9ed4cda4f1459c1d91121893ff13 Mon Sep 17 00:00:00 2001 From: Annika Merris Date: Fri, 10 Jan 2025 10:50:53 -0500 Subject: [PATCH 1/2] Add orca slicer --- flake.lock | 34 ++++++++++++------------- flake.nix | 2 +- hosts/kim/default.nix | 12 ++++++++- modules/common/applications/slicers.nix | 11 ++++++++ 4 files changed, 40 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index 3c3212f..d5411b0 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ ] }, "locked": { - "lastModified": 1735048446, - "narHash": "sha256-Tc35Y8H+krA6rZeOIczsaGAtobSSBPqR32AfNTeHDRc=", + "lastModified": 1736437680, + "narHash": "sha256-9Sy17XguKdEU9M5peTrkWSlI/O5IAqjHzdzxbXnc30g=", "owner": "nix-community", "repo": "disko", - "rev": "3a4de9fa3a78ba7b7170dda6bd8b4cdab87c0b21", + "rev": "4d5d07d37ff773338e40a92088f45f4f88e509c8", "type": "github" }, "original": { @@ -77,11 +77,11 @@ ] }, "locked": { - "lastModified": 1735053786, - "narHash": "sha256-Gm+0DcbUS338vvkwyYWms5jsWlx8z8MeQBzcnIDuIkw=", + "lastModified": 1736508663, + "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", "owner": "nix-community", "repo": "home-manager", - "rev": "35b98d20ca8f4ca1f6a2c30b8a2c8bb305a36d84", + "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", "type": "github" }, "original": { @@ -114,15 +114,15 @@ ] }, "locked": { - "lastModified": 1729360442, - "narHash": "sha256-6U0CyPycIBc04hbYy2hBINnVso58n/ZyywY2BD3hu+s=", - "rev": "9098ac95768f7006d7e070b88bae76939f6034e6", + "lastModified": 1732605668, + "narHash": "sha256-DN5/166jhiiAW0Uw6nueXaGTueVxhfZISAkoxasmz/g=", + "rev": "f19bd752910bbe3a861c9cad269bd078689d50fe", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/9098ac95768f7006d7e070b88bae76939f6034e6.tar.gz?rev=9098ac95768f7006d7e070b88bae76939f6034e6" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/f19bd752910bbe3a861c9cad269bd078689d50fe.tar.gz?rev=f19bd752910bbe3a861c9cad269bd078689d50fe" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz" + "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz" } }, "nixpkgs": { @@ -143,11 +143,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1736344531, + "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", "type": "github" }, "original": { @@ -188,11 +188,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1734546875, - "narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=", + "lastModified": 1736515725, + "narHash": "sha256-4P99yL8vGehwzytkpP87eklBePt6aqeEC5JFsIzhfUs=", "owner": "Mic92", "repo": "sops-nix", - "rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d", + "rev": "f214c1b76c347a4e9c8fb68c73d4293a6820d125", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1dddd79..d713697 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz"; + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/hosts/kim/default.nix b/hosts/kim/default.nix index d02df06..495475f 100644 --- a/hosts/kim/default.nix +++ b/hosts/kim/default.nix @@ -74,6 +74,7 @@ inputs.nixpkgs.lib.nixosSystem { # netbird.enable = true; See netbird.nix (I can't access the sops stuff from here?) obsidian.enable = true; openrgb.enable = true; + orca-slicer = true; prusa-slicer.enable = true; spotifyd.enable = true; thunderbird.enable = true; @@ -93,8 +94,17 @@ inputs.nixpkgs.lib.nixosSystem { appimage.enable = true; docker.enable = true; yubikey.enable = true; - kdeconnect.enable = true; + kdeconnect.enable = false; tailscale.enable = true; + + # TODO: Move this to it's own config file + # Printer stuff + services.printing.enable = true; + services.avahi = { + enable = true; + nssmdns4 = true; + openFirewall = true; + }; } ]; } diff --git a/modules/common/applications/slicers.nix b/modules/common/applications/slicers.nix index 48e0a19..d4ed5a6 100644 --- a/modules/common/applications/slicers.nix +++ b/modules/common/applications/slicers.nix @@ -13,6 +13,12 @@ default = false; }; }; + orca-slicer = { + enable = lib.mkEnableOption { + description = "Enable Orca Slicer"; + default = false; + }; + }; }; config = lib.mkIf (config.gui.enable) { home-manager.users.${config.user} = lib.mkMerge [ @@ -27,6 +33,11 @@ pkgs.bambu-studio ]; }) + (lib.mkIf (config.orca-slicer.enable) { + home.packages = [ + pkgs.orca-slicer + ]; + }) ]; }; } From 59e7a61edea2e78171031f5b1d4389d893267943 Mon Sep 17 00:00:00 2001 From: Annika Merris Date: Fri, 10 Jan 2025 10:59:20 -0500 Subject: [PATCH 2/2] enable --- hosts/kim/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/kim/default.nix b/hosts/kim/default.nix index 495475f..bcd1406 100644 --- a/hosts/kim/default.nix +++ b/hosts/kim/default.nix @@ -74,7 +74,7 @@ inputs.nixpkgs.lib.nixosSystem { # netbird.enable = true; See netbird.nix (I can't access the sops stuff from here?) obsidian.enable = true; openrgb.enable = true; - orca-slicer = true; + orca-slicer.enable = true; prusa-slicer.enable = true; spotifyd.enable = true; thunderbird.enable = true;