From a353ea74c0bc3094d413016af1f168cf08a3ae3c Mon Sep 17 00:00:00 2001 From: uttarayan21 Date: Sat, 19 Apr 2025 20:13:37 +0530 Subject: [PATCH] feat: Added orca-slicer stable --- home/apps/bambu-studio.nix | 15 ++++++++++----- nixos/default.nix | 2 ++ nixos/deoxys/configuration.nix | 20 ++++++++++---------- nixos/ryu/configuration.nix | 3 ++- 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/home/apps/bambu-studio.nix b/home/apps/bambu-studio.nix index e8ddfbbc..d757a934 100644 --- a/home/apps/bambu-studio.nix +++ b/home/apps/bambu-studio.nix @@ -1,13 +1,18 @@ -{pkgs, ...}: { +{ + pkgs, + stablePkgs, + ... +}: { home.packages = with pkgs; lib.optionals pkgs.stdenv.isLinux [ # (bambu-studio.overrideAttrs (oldAttrs: { # nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [pkgs.cudatoolkit]; # buildInputs = oldAttrs.buildInputs ++ [pkgs.cudatoolkit]; # })) - (orca-slicer.overrideAttrs (oldAttrs: { - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [pkgs.cudatoolkit]; - buildInputs = oldAttrs.buildInputs ++ [pkgs.cudatoolkit]; - })) + # (orca-slicer.overrideAttrs (oldAttrs: { + # nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [pkgs.cudatoolkit]; + # buildInputs = oldAttrs.buildInputs ++ [pkgs.cudatoolkit]; + # })) + stablePkgs.orca-slicer ]; } diff --git a/nixos/default.nix b/nixos/default.nix index d88ac2a1..985cb337 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -13,6 +13,7 @@ builtins.listToAttrs (builtins.map (device: { system = device.system; specialArgs = { inherit device; + stablePkgs = inputs.nixpkgs-stable.legacyPackages.${device.system}; lanzaboote = inputs.lanzaboote; }; modules = [ @@ -34,6 +35,7 @@ builtins.listToAttrs (builtins.map (device: { extraSpecialArgs = { inherit inputs; inherit device; + stablePkgs = inputs.nixpkgs-stable.legacyPackages.${device.system}; }; users.${device.user}.imports = [../home]; }; diff --git a/nixos/deoxys/configuration.nix b/nixos/deoxys/configuration.nix index 723c2e2d..d9f27dec 100644 --- a/nixos/deoxys/configuration.nix +++ b/nixos/deoxys/configuration.nix @@ -60,18 +60,18 @@ time.timeZone = "Asia/Kolkata"; # Select internationalisation properties. - i18n.defaultLocale = "en_IN"; + i18n.defaultLocale = "en_US"; i18n.extraLocaleSettings = { - LC_ADDRESS = "en_IN"; - LC_IDENTIFICATION = "en_IN"; - LC_MEASUREMENT = "en_IN"; - LC_MONETARY = "en_IN"; - LC_NAME = "en_IN"; - LC_NUMERIC = "en_IN"; - LC_PAPER = "en_IN"; - LC_TELEPHONE = "en_IN"; - LC_TIME = "en_IN"; + LC_ADDRESS = "en_US"; + LC_IDENTIFICATION = "en_US"; + LC_MEASUREMENT = "en_US"; + LC_MONETARY = "en_US"; + LC_NAME = "en_US"; + LC_NUMERIC = "en_US"; + LC_PAPER = "en_US"; + LC_TELEPHONE = "en_US"; + LC_TIME = "en_US"; }; # Configure keymap in X11 diff --git a/nixos/ryu/configuration.nix b/nixos/ryu/configuration.nix index faae2a81..53b40511 100644 --- a/nixos/ryu/configuration.nix +++ b/nixos/ryu/configuration.nix @@ -237,6 +237,7 @@ defaultLocale = "en_US.UTF-8"; extraLocaleSettings = { + LC_ALL = "en_US.UTF-8"; LC_ADDRESS = "en_US.UTF-8"; LC_IDENTIFICATION = "en_US.UTF-8"; LC_MEASUREMENT = "en_US.UTF-8"; @@ -253,7 +254,7 @@ # Allow unfree packages nixpkgs.config.allowUnfree = true; - nixpkgs.config.cudaSupport = true; + # nixpkgs.config.cudaSupport = true; fonts.fontconfig.enable = true; fonts.fontDir.enable = true;