steamdeck: move orca-slicer to stable

This commit is contained in:
Kabbone 2025-02-02 19:44:55 +01:00
parent f77140e3f5
commit c3a45f7984
Signed by: Kabbone
SSH Key Fingerprint: SHA256:A5zPB5I6u5V78V51c362BBdCwhDhfDUVbt7NfKdjWBY
4 changed files with 18 additions and 28 deletions

View File

@ -13,7 +13,6 @@
{
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # Nix Packages
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
#nixpkgs-orca.url = "github:NixOS/nixpkgs/aa1203429f56d2e816a77fda34f069705e975f97";
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
microvm = {

View File

@ -10,7 +10,7 @@
# └─ default.nix
#
{ config, lib, pkgs, inputs, user, location, agenix, ... }:
{ config, lib, pkgs, pkgs-stable, inputs, user, location, agenix, ... }:
{
imports = # Import window or display manager.
@ -83,7 +83,7 @@
VISUAL = "nvim";
BROWSER = "firefox";
};
systemPackages = with pkgs; [ # Default packages install system-wide
systemPackages = (with pkgs; [ # Default packages install system-wide
vim
git
killall
@ -115,7 +115,13 @@
sbctl
ausweisapp
e2fsprogs
];
])
++
(with pkgs-stable; [
orca-slicer
]);
};
services = {

View File

@ -31,25 +31,19 @@ let
config.allowUnfree = true; # Allow proprietary software
};
# pkgs-orca = import nixpkgs-orca {
# inherit system;
# config.allowUnfree = true; # Allow proprietary software
# };
pkgs-stable = import nixpkgs {
inherit system;
config.allowUnfree = true; # Allow proprietary software
};
lib = nixpkgs.lib;
users.defaultShell = "pkgs.zsh";
in
{
# nixpkgs-unstable.overlays = [
# (self: super: {
# orca-slicer = pkgs-orca.orca-slicer;
# })
# ];
hades = lib.nixosSystem { # Desktop profile
inherit system;
specialArgs = { inherit inputs user location nixos-hardware agenix microvm nixpkgs lanzaboote; };
specialArgs = { inherit inputs pkgs-stable user location nixos-hardware agenix microvm nixpkgs lanzaboote; };
modules = [
agenix.nixosModules.default
microvm.nixosModules.host
@ -76,7 +70,7 @@ in
lifebook = lib.nixosSystem { # Laptop profile
inherit system;
specialArgs = { inherit inputs user location nixos-hardware agenix lanzaboote; };
specialArgs = { inherit inputs pkgs-stable user location nixos-hardware agenix lanzaboote; };
modules = [
agenix.nixosModules.default
lanzaboote.nixosModules.lanzaboote
@ -99,7 +93,7 @@ in
nbf5 = lib.nixosSystem { # Laptop profile
inherit system;
specialArgs = { inherit inputs user location nixos-hardware agenix; };
specialArgs = { inherit inputs pkgs-stable user location nixos-hardware agenix; };
modules = [
agenix.nixosModules.default
./nbf5
@ -121,7 +115,7 @@ in
steamdeck = nixpkgs-unstable.lib.nixosSystem { # steamdeck profile
inherit system;
specialArgs = { inherit inputs user location nixos-hardware agenix jovian-nixos lanzaboote; };
specialArgs = { inherit inputs pkgs-stable user location nixos-hardware agenix jovian-nixos lanzaboote; };
modules = [
agenix.nixosModules.default
jovian-nixos.nixosModules.default

View File

@ -15,7 +15,7 @@
# └─ default.nix
#
{ config, lib, pkgs, user, nixpkgs, ... }:
{ config, lib, pkgs, user, pkgs-stable, ... }:
{
imports =
@ -25,12 +25,6 @@
(import ../modules/services) ++
(import ../modules/shell);
# pkgs.overlays = [
# (self: super: {
# orca-slicer = nixpkgs.orca-slicer;
# })
# ];
home = {
username = "${user}";
homeDirectory = "/home/${user}";
@ -71,8 +65,6 @@
freecad
# Fileanagement
#okular # PDF viewer
#gnome.file-roller # Archive Manager
ark
pcmanfm # File Manager
rsync # Syncer $ rsync -r dir1/ dir2/
@ -88,7 +80,6 @@
# Flatpak
prusa-slicer
orca-slicer
#vscodium
(vscode-with-extensions.override {
vscode = vscodium;