diff --git a/flake.lock b/flake.lock index f0578bd..7cb8a45 100644 --- a/flake.lock +++ b/flake.lock @@ -165,11 +165,11 @@ ] }, "locked": { - "lastModified": 1736883540, - "narHash": "sha256-dgPgoPUSg8cGAMqbhQRkww665sZtgzpWXxWjlyqhv94=", + "lastModified": 1737221749, + "narHash": "sha256-igllW0yG+UbetvhT11jnt9RppSHXYgMykYhZJeqfHs0=", "owner": "nix-community", "repo": "home-manager", - "rev": "0dfec9deb275854a56c97c356c40ef72e3a2e632", + "rev": "97d7946b5e107dd03cc82f21165251d4e0159655", "type": "github" }, "original": { @@ -222,11 +222,11 @@ ] }, "locked": { - "lastModified": 1737007397, - "narHash": "sha256-uJ7Lk0moWSn8Tr0QkUbOCWR7WrhiLeha4E00rckhl8I=", + "lastModified": 1737126697, + "narHash": "sha256-k1YhjONkiKBHzbjNy4ZsjysBac5UJSolCVq9cTKLeKM=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "6bbb19666e753c18ef8af35f590cbc3ba42dd0ca", + "rev": "27a0ddac1a14e10ba98530f59db728951495f2ce", "type": "github" }, "original": { @@ -323,11 +323,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736916166, - "narHash": "sha256-puPDoVKxkuNmYIGMpMQiK8bEjaACcCksolsG36gdaNQ=", + "lastModified": 1737165118, + "narHash": "sha256-s40Kk/OulP3J/1JvC3VT16U4r/Xw6Qdi7SRw3LYkPWs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e24b4c09e963677b1beea49d411cd315a024ad3a", + "rev": "6a3ae7a5a12fb8cac2d59d7df7cbd95f9b2f0566", "type": "github" }, "original": { @@ -337,22 +337,6 @@ "type": "github" } }, - "nixpkgs-orca": { - "locked": { - "lastModified": 1736169020, - "narHash": "sha256-oQVXeu+TNGSy4cq1GvXh7J16lbW5g0pTMEucmVwCRGk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "aa1203429f56d2e816a77fda34f069705e975f97", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "aa1203429f56d2e816a77fda34f069705e975f97", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1730741070, @@ -371,11 +355,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1736883708, - "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", + "lastModified": 1737062831, + "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", + "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", "type": "github" }, "original": { @@ -423,7 +407,6 @@ "microvm": "microvm", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", - "nixpkgs-orca": "nixpkgs-orca", "nixpkgs-unstable": "nixpkgs-unstable" } }, diff --git a/flake.nix b/flake.nix index ad19397..306a416 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +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"; + #nixpkgs-orca.url = "github:NixOS/nixpkgs/aa1203429f56d2e816a77fda34f069705e975f97"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; microvm = { @@ -50,12 +50,12 @@ }; - 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. + 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. rec { nixosConfigurations = ( # NixOS configurations import ./hosts { # Imports ./hosts/default.nix inherit (nixpkgs) lib; - 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. + 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. nix.allowedUsers = [ "@wheel" ]; security.sudo.execWheelOnly = true; } diff --git a/hosts/default.nix b/hosts/default.nix index 0945824..528e495 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -11,7 +11,7 @@ # └─ ./home.nix # -{ lib, inputs, nixpkgs, nixpkgs-unstable, nixpkgs-orca, nixos-hardware, home-manager, home-manager-unstable, agenix, jovian-nixos, microvm, impermanence, lanzaboote, ... }: +{ lib, inputs, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, home-manager-unstable, agenix, jovian-nixos, microvm, impermanence, lanzaboote, ... }: let user = "kabbone"; @@ -31,21 +31,21 @@ let config.allowUnfree = true; # Allow proprietary software }; - pkgs-orca = import nixpkgs-orca { - 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; - }) - ]; +# nixpkgs-unstable.overlays = [ +# (self: super: { +# orca-slicer = pkgs-orca.orca-slicer; +# }) +# ]; hades = lib.nixosSystem { # Desktop profile inherit system;