From fad6e61aac2eb05de2a0650a5d5b02a923f06d8f Mon Sep 17 00:00:00 2001 From: John Ogle Date: Sat, 8 Nov 2025 13:06:51 -0800 Subject: [PATCH] Replace customPkgs with pkgs.custom and add pkgs.unstable and flake update --- flake.lock | 55 +++++++++++++++++++----------- flake.nix | 21 +++++++++++- home/home-darwin-work.nix | 3 -- home/home-desktop.nix | 5 --- home/home-laptop-compact.nix | 5 --- home/home-live-usb.nix | 5 --- home/home-media-center.nix | 5 --- home/roles/development/default.nix | 4 +-- roles/kodi/default.nix | 5 ++- 9 files changed, 60 insertions(+), 48 deletions(-) diff --git a/flake.lock b/flake.lock index 0055f68..e3d502a 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -64,11 +64,11 @@ ] }, "locked": { - "lastModified": 1761339987, - "narHash": "sha256-IUaawVwItZKi64IA6kF6wQCLCzpXbk2R46dHn8sHkig=", + "lastModified": 1762501326, + "narHash": "sha256-QbhsksHaIN6qU3oXhwUFbYycKX1GRxObpQSWAM5fhRY=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "7cd9aac79ee2924a85c211d21fafd394b06a38de", + "rev": "e2b82ebd0f990a5d1b68fcc761b3d6383c86ccfd", "type": "github" }, "original": { @@ -83,11 +83,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1760536587, - "narHash": "sha256-wfWqt+igns/VazjPLkyb4Z/wpn4v+XIjUeI3xY/1ENg=", + "lastModified": 1762251193, + "narHash": "sha256-CmSddz8e2kM+ITbYutluhKZyXXwI9Sg2lf7XXSvc8oY=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "f98ee1de1fa36eca63c67b600f5d617e184e82ea", + "rev": "e001844d4553aef268f97b32d3a825b6370eed91", "type": "github" }, "original": { @@ -99,11 +99,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1759733170, - "narHash": "sha256-TXnlsVb5Z8HXZ6mZoeOAIwxmvGHp1g4Dw89eLvIwKVI=", + "lastModified": 1761907660, + "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8913c168d1c56dc49a7718685968f38752171c3b", + "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15", "type": "github" }, "original": { @@ -113,13 +113,29 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs-unstable": { "locked": { - "lastModified": 1761173472, - "narHash": "sha256-m9W0dYXflzeGgKNravKJvTMR4Qqa2MVD11AwlGMufeE=", + "lastModified": 1762363567, + "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c8aa8cc00a5cb57fada0851a038d35c08a36a2bb", + "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1762498405, + "narHash": "sha256-Zg/SCgCaAioc0/SVZQJxuECGPJy+OAeBcGeA5okdYDc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "6faeb062ee4cf4f105989d490831713cc5a43ee1", "type": "github" }, "original": { @@ -139,11 +155,11 @@ ] }, "locked": { - "lastModified": 1761078382, - "narHash": "sha256-JNJesbe9MMN1Brq41BHEpuH+Z+Zg74y/nI5AFZX84Vw=", + "lastModified": 1762274591, + "narHash": "sha256-Vbhluvk15qwiyNDyPd9tjJh9gxIfUjbKVT79c05Pd3I=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "27dfa61b64d0cdb8e4ba6f3aaa4d4e067d64cb5c", + "rev": "6296d7100cc84b2ff732b7c103a50c2856974cf6", "type": "github" }, "original": { @@ -159,6 +175,7 @@ "nix-darwin": "nix-darwin", "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs_2", + "nixpkgs-unstable": "nixpkgs-unstable", "plasma-manager": "plasma-manager" } } diff --git a/flake.nix b/flake.nix index 2e80372..807de35 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixos-wsl.url = "github:nix-community/NixOS-WSL/main"; nix-darwin = { @@ -27,12 +28,21 @@ }; }; - outputs = { self, nixpkgs, nixos-wsl, ... } @ inputs: let + outputs = { self, nixpkgs, nixpkgs-unstable, nixos-wsl, ... } @ inputs: let nixosModules = [ ./roles ] ++ [ inputs.home-manager.nixosModules.home-manager { + nixpkgs.overlays = [ + (final: prev: { + unstable = import nixpkgs-unstable { + system = prev.system; + config.allowUnfree = true; + }; + custom = prev.callPackage ./packages {}; + }) + ]; home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.sharedModules = [ @@ -48,6 +58,15 @@ ] ++ [ inputs.home-manager.darwinModules.home-manager { + nixpkgs.overlays = [ + (final: prev: { + unstable = import nixpkgs-unstable { + system = prev.system; + config.allowUnfree = true; + }; + custom = prev.callPackage ./packages {}; + }) + ]; home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.extraSpecialArgs = { diff --git a/home/home-darwin-work.nix b/home/home-darwin-work.nix index 95aed6f..cf56712 100644 --- a/home/home-darwin-work.nix +++ b/home/home-darwin-work.nix @@ -1,12 +1,9 @@ { config, lib, pkgs, globalInputs, system, ... }: let - customPkgs = pkgs.callPackage ../packages {}; leader = "cmd"; # Change this to experiment with different leader keys (e.g., "cmd", "ctrl") in { - # Provide arguments to role modules - _module.args = { inherit customPkgs; }; # Home Manager configuration for Darwin work laptop # Corporate-friendly setup with essential development tools diff --git a/home/home-desktop.nix b/home/home-desktop.nix index 5bcf598..aa7ff7e 100644 --- a/home/home-desktop.nix +++ b/home/home-desktop.nix @@ -1,11 +1,6 @@ { pkgs, globalInputs, system, ... }: -let - customPkgs = pkgs.callPackage ../packages {}; -in { - # Provide arguments to role modules - _module.args = { inherit customPkgs; }; # Home Manager configuration for full desktop experience home.username = "johno"; home.homeDirectory = "/home/johno"; diff --git a/home/home-laptop-compact.nix b/home/home-laptop-compact.nix index c8d4ccf..6fe5fb1 100644 --- a/home/home-laptop-compact.nix +++ b/home/home-laptop-compact.nix @@ -1,11 +1,6 @@ { config, lib, pkgs, globalInputs, system, ... }: -let - customPkgs = pkgs.callPackage ../packages {}; -in { - # Provide arguments to role modules - _module.args = { inherit customPkgs; }; # Home Manager configuration for compact laptop setups # Optimized for space-constrained environments diff --git a/home/home-live-usb.nix b/home/home-live-usb.nix index 2e394c7..af156cc 100644 --- a/home/home-live-usb.nix +++ b/home/home-live-usb.nix @@ -1,11 +1,6 @@ { pkgs, globalInputs, system, ... }: -let - customPkgs = pkgs.callPackage ../packages {}; -in { - # Provide arguments to role modules - _module.args = { inherit customPkgs; }; # Home Manager configuration for live USB environments # Minimal setup without persistent services diff --git a/home/home-media-center.nix b/home/home-media-center.nix index 1907789..ab19200 100644 --- a/home/home-media-center.nix +++ b/home/home-media-center.nix @@ -1,11 +1,6 @@ { pkgs, globalInputs, system, ... }: -let - customPkgs = pkgs.callPackage ../packages {}; -in { - # Provide arguments to role modules - _module.args = { inherit customPkgs; }; # Home Manager configuration for media center setups # Optimized for living room media consumption and gaming diff --git a/home/roles/development/default.nix b/home/roles/development/default.nix index 660ec8c..33bcdeb 100644 --- a/home/roles/development/default.nix +++ b/home/roles/development/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, customPkgs, globalInputs, system, ... }: +{ config, lib, pkgs, globalInputs, system, ... }: with lib; @@ -16,7 +16,7 @@ in pkgs.codex # Custom packages - customPkgs.tea-rbw + pkgs.custom.tea-rbw ]; programs.kubectl-secure.enable = true; diff --git a/roles/kodi/default.nix b/roles/kodi/default.nix index aed1e2e..ab2944d 100644 --- a/roles/kodi/default.nix +++ b/roles/kodi/default.nix @@ -4,7 +4,6 @@ with lib; let cfg = config.roles.kodi; - customPkgs = pkgs.callPackage ../../packages {}; in { options.roles.kodi = { @@ -54,7 +53,7 @@ in kodiPkg wget firefox - ] ++ optional cfg.appLauncherServer.enable customPkgs.app-launcher-server; + ] ++ optional cfg.appLauncherServer.enable pkgs.custom.app-launcher-server; programs.kdeconnect.enable = true; @@ -65,7 +64,7 @@ in after = [ "graphical-session.target" ]; serviceConfig = { Type = "simple"; - ExecStart = "${customPkgs.app-launcher-server}/bin/app-launcher-server ${toString cfg.appLauncherServer.port}"; + ExecStart = "${pkgs.custom.app-launcher-server}/bin/app-launcher-server ${toString cfg.appLauncherServer.port}"; Restart = "always"; RestartSec = "5s"; Environment = [