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 = {

hosts/configuration_desktop.nix

@@ -10,7 +10,7 @@
 #               └─ default.nix
 #
 
-{ config, lib, pkgs, pkgs-stable, inputs, user, location, agenix, ... }:
+{ config, lib, pkgs, 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,13 +115,7 @@
       sbctl
       ausweisapp
       e2fsprogs
-    ])
-
-    ++
-
-    (with pkgs-stable; [
-      orca-slicer
-    ]);
+    ];
   };
 
   services = {

hosts/default.nix

@@ -31,19 +31,25 @@ let
     config.allowUnfree = true;                              # Allow proprietary software
   };
 
-  pkgs-stable = import nixpkgs {
-    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 pkgs-stable user location nixos-hardware agenix microvm nixpkgs lanzaboote; };
+    specialArgs = { inherit inputs user location nixos-hardware agenix microvm nixpkgs lanzaboote; };
     modules = [
       agenix.nixosModules.default
       microvm.nixosModules.host
@@ -70,7 +76,7 @@ in
 
   lifebook = lib.nixosSystem {                                # Laptop profile
     inherit system;
-    specialArgs = { inherit inputs pkgs-stable user location nixos-hardware agenix lanzaboote; };
+    specialArgs = { inherit inputs user location nixos-hardware agenix lanzaboote; };
     modules = [
       agenix.nixosModules.default
       lanzaboote.nixosModules.lanzaboote
@@ -93,7 +99,7 @@ in
 
   nbf5 = lib.nixosSystem {                                # Laptop profile
     inherit system;
-    specialArgs = { inherit inputs pkgs-stable user location nixos-hardware agenix; };
+    specialArgs = { inherit inputs user location nixos-hardware agenix; };
     modules = [
       agenix.nixosModules.default
       ./nbf5
@@ -115,7 +121,7 @@ in
 
   steamdeck = nixpkgs-unstable.lib.nixosSystem {            # steamdeck profile
     inherit system;
-    specialArgs = { inherit inputs pkgs-stable user location nixos-hardware agenix jovian-nixos lanzaboote; };
+    specialArgs = { inherit inputs user location nixos-hardware agenix jovian-nixos lanzaboote; };
     modules = [
       agenix.nixosModules.default
       jovian-nixos.nixosModules.default

hosts/home.nix

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

hosts/steamdeck/default.nix

@@ -20,25 +20,14 @@
 { config, pkgs, user, jovian-nixos, lib, ... }:
 
 {
-  specialisation = {
-  	steam.configuration = {
-		imports =
-		  [(import ../../modules/wm/steam)] ++
-		  [(import ../../modules/wm/kde)];
-	};
-  	sway.configuration = {
-		imports =
-		[(import ../../modules/wm/sway)];
-	};
-  };
-
   imports =                                                         # For now, if applying to other system, swap files
     [(import ./hardware-configuration.nix)] ++                      # Current system hardware config @ /etc/nixos/hardware-configuration.nix
+    [(import ../../modules/wm/steam/default.nix)] ++            # jovian steam
+    [(import ../../modules/wm/kde/default.nix)] ++              # Window Manager
     (import ../../modules/wm/virtualisation) ++                 # libvirt + Docker
     [(import ../../modules/wm/virtualisation/kvm-amd.nix)] ++   # kvm module options
     (import ../../modules/hardware);                                 # Hardware devices
 
-
   boot = {                                  # Boot options
     loader = {                              # EFI Boot
       systemd-boot.enable = lib.mkForce false;
@@ -55,10 +44,20 @@
     };
   };
 
+#  hardware.sane = {                           # Used for scanning with Xsane
+#    enable = false;
+#    extraBackends = [ pkgs.sane-airscan ];
+#  };
   hardware = {
     nitrokey.enable = true;
   };
 
+#  environment = {
+#    systemPackages = with pkgs; [
+##       alacritty
+#    ];
+#  };
+
   programs = {                              # No xbacklight, this is the alterantive
     light.enable = true;
   };

hosts/steamdeck/home.nix

@@ -14,20 +14,10 @@
 { pkgs, ... }:
 
 {
-  specialisation = {
-  	steam.configuration = {
-		imports =
-		  [(import ../../modules/wm/steam/home.nix)] ++
-		  [(import ../../modules/wm/kde/home.nix)];
-	};
-  	sway.configuration = {
-		imports =
-		[(import ../../modules/wm/sway/home.nix)];
-	};
-  };
-
   imports =
     [
+      ../../modules/wm/steam/home.nix # Window Manager
+      ../../modules/wm/kde/home.nix # Window Manager
       ../../modules/home.nix # Window Manager
     ];