From 02272d9ec5ec01770153cc1accf2a2d94dbe6829 Mon Sep 17 00:00:00 2001 From: Kabbone Date: Sun, 12 Jan 2025 12:21:59 +0100 Subject: [PATCH] steamdeck: use orca-slicer fix --- flake.nix | 5 +++-- hosts/default.nix | 20 ++++++++++++++++++-- hosts/home.nix | 10 ++++++++-- 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 3679b90..ad19397 100644 --- a/flake.nix +++ b/flake.nix @@ -13,6 +13,7 @@ { 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 = { @@ -49,12 +50,12 @@ }; - outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, home-manager-unstable, agenix, jovian-nixos, microvm, impermanence, lanzaboote, ... }: # Function that tells my flake which to use and what do what to do with the dependencies. + outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, nixpkgs-orca, nixos-hardware, home-manager, home-manager-unstable, agenix, jovian-nixos, microvm, impermanence, lanzaboote, ... }: # Function that tells my flake which to use and what do what to do with the dependencies. rec { nixosConfigurations = ( # NixOS configurations import ./hosts { # Imports ./hosts/default.nix inherit (nixpkgs) lib; - inherit inputs nixpkgs nixpkgs-unstable nixos-hardware home-manager home-manager-unstable agenix jovian-nixos microvm impermanence lanzaboote; # Also inherit home-manager so it does not need to be defined here. + inherit inputs nixpkgs nixpkgs-unstable nixpkgs-orca nixos-hardware home-manager home-manager-unstable agenix jovian-nixos microvm impermanence lanzaboote; # Also inherit home-manager so it does not need to be defined here. nix.allowedUsers = [ "@wheel" ]; security.sudo.execWheelOnly = true; } diff --git a/hosts/default.nix b/hosts/default.nix index c7fe8ef..0945824 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -11,7 +11,7 @@ # └─ ./home.nix # -{ lib, inputs, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, home-manager-unstable, agenix, jovian-nixos, microvm, impermanence, lanzaboote, ... }: +{ lib, inputs, nixpkgs, nixpkgs-unstable, nixpkgs-orca, nixos-hardware, home-manager, home-manager-unstable, agenix, jovian-nixos, microvm, impermanence, lanzaboote, ... }: let user = "kabbone"; @@ -26,11 +26,27 @@ let config.allowUnfree = true; # Allow proprietary software }; + pkgs-unstable = import nixpkgs-unstable { + inherit system; + config.allowUnfree = true; # Allow proprietary software + }; + + pkgs-orca = import nixpkgs-orca { + 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; }; @@ -105,7 +121,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 user location nixos-hardware agenix jovian-nixos lanzaboote nixpkgs; }; modules = [ agenix.nixosModules.default jovian-nixos.nixosModules.default diff --git a/hosts/home.nix b/hosts/home.nix index 822984b..cbba9d8 100644 --- a/hosts/home.nix +++ b/hosts/home.nix @@ -15,8 +15,7 @@ # └─ default.nix # -{ config, lib, pkgs, user, ... }: -#{ config, lib, pkgs, user, ... }: +{ config, lib, pkgs, user, nixpkgs, ... }: { imports = @@ -26,6 +25,12 @@ (import ../modules/services) ++ (import ../modules/shell); +# pkgs.overlays = [ +# (self: super: { +# orca-slicer = nixpkgs.orca-slicer; +# }) +# ]; + home = { username = "${user}"; homeDirectory = "/home/${user}"; @@ -100,6 +105,7 @@ sdkmanager android-tools ]; + file.".config/wall".source = ../modules/themes/wall.jpg; file.".config/lockwall".source = ../modules/themes/lockwall.jpg; # pointerCursor = { # This will set cursor systemwide so applications can not choose their own