johno/nixos-configs
1
0
Fork 0
Code Issues 3 Pull Requests 8 Actions Packages Projects Releases Wiki Activity

Replace customPkgs with pkgs.custom and add pkgs.unstable and flake update

Browse Source
This commit is contained in:
John Ogle
2025-11-08 13:06:51 -08:00
parent 1bc65ceb51
commit fad6e61aac
9 changed files with 60 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
flake.lock generated
View File

@@ -3,11 +3,11 @@
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1747046372, "lastModified": 1761588595,
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -64,11 +64,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1761339987, "lastModified": 1762501326,
"narHash": "sha256-IUaawVwItZKi64IA6kF6wQCLCzpXbk2R46dHn8sHkig=", "narHash": "sha256-QbhsksHaIN6qU3oXhwUFbYycKX1GRxObpQSWAM5fhRY=",
"owner": "nix-darwin", "owner": "nix-darwin",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "7cd9aac79ee2924a85c211d21fafd394b06a38de", "rev": "e2b82ebd0f990a5d1b68fcc761b3d6383c86ccfd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -83,11 +83,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1760536587, "lastModified": 1762251193,
"narHash": "sha256-wfWqt+igns/VazjPLkyb4Z/wpn4v+XIjUeI3xY/1ENg=", "narHash": "sha256-CmSddz8e2kM+ITbYutluhKZyXXwI9Sg2lf7XXSvc8oY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "f98ee1de1fa36eca63c67b600f5d617e184e82ea", "rev": "e001844d4553aef268f97b32d3a825b6370eed91",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -99,11 +99,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1759733170, "lastModified": 1761907660,
"narHash": "sha256-TXnlsVb5Z8HXZ6mZoeOAIwxmvGHp1g4Dw89eLvIwKVI=", "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8913c168d1c56dc49a7718685968f38752171c3b", "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -113,13 +113,29 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1761173472, "lastModified": 1762363567,
"narHash": "sha256-m9W0dYXflzeGgKNravKJvTMR4Qqa2MVD11AwlGMufeE=", "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "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" "type": "github"
}, },
"original": { "original": {
@@ -139,11 +155,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1761078382, "lastModified": 1762274591,
"narHash": "sha256-JNJesbe9MMN1Brq41BHEpuH+Z+Zg74y/nI5AFZX84Vw=", "narHash": "sha256-Vbhluvk15qwiyNDyPd9tjJh9gxIfUjbKVT79c05Pd3I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "plasma-manager", "repo": "plasma-manager",
"rev": "27dfa61b64d0cdb8e4ba6f3aaa4d4e067d64cb5c", "rev": "6296d7100cc84b2ff732b7c103a50c2856974cf6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -159,6 +175,7 @@
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nixos-wsl": "nixos-wsl", "nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-unstable": "nixpkgs-unstable",
"plasma-manager": "plasma-manager" "plasma-manager": "plasma-manager"
} }
} }

21
flake.nix
View File

@@ -3,6 +3,7 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; 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"; nixos-wsl.url = "github:nix-community/NixOS-WSL/main";
nix-darwin = { nix-darwin = {
@@ -27,12 +28,21 @@
}; };
}; };
outputs = { self, nixpkgs, nixos-wsl, ... } @ inputs: let outputs = { self, nixpkgs, nixpkgs-unstable, nixos-wsl, ... } @ inputs: let
nixosModules = [ nixosModules = [
./roles ./roles
] ++ [ ] ++ [
inputs.home-manager.nixosModules.home-manager 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.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.sharedModules = [ home-manager.sharedModules = [
@@ -48,6 +58,15 @@
] ++ [ ] ++ [
inputs.home-manager.darwinModules.home-manager 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.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { home-manager.extraSpecialArgs = {

3
home/home-darwin-work.nix
View File

@@ -1,12 +1,9 @@
{ config, lib, pkgs, globalInputs, system, ... }: { config, lib, pkgs, globalInputs, system, ... }:
let let
customPkgs = pkgs.callPackage ../packages {};
leader = "cmd"; # Change this to experiment with different leader keys (e.g., "cmd", "ctrl") leader = "cmd"; # Change this to experiment with different leader keys (e.g., "cmd", "ctrl")
in in
{ {
# Provide arguments to role modules
_module.args = { inherit customPkgs; };
# Home Manager configuration for Darwin work laptop # Home Manager configuration for Darwin work laptop
# Corporate-friendly setup with essential development tools # Corporate-friendly setup with essential development tools

5
home/home-desktop.nix
View File

@@ -1,11 +1,6 @@
{ pkgs, globalInputs, system, ... }: { 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 Manager configuration for full desktop experience
home.username = "johno"; home.username = "johno";
home.homeDirectory = "/home/johno"; home.homeDirectory = "/home/johno";

5
home/home-laptop-compact.nix
View File

@@ -1,11 +1,6 @@
{ config, lib, pkgs, globalInputs, system, ... }: { 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 # Home Manager configuration for compact laptop setups
# Optimized for space-constrained environments # Optimized for space-constrained environments

5
home/home-live-usb.nix
View File

@@ -1,11 +1,6 @@
{ pkgs, globalInputs, system, ... }: { 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 # Home Manager configuration for live USB environments
# Minimal setup without persistent services # Minimal setup without persistent services

5
home/home-media-center.nix
View File

@@ -1,11 +1,6 @@
{ pkgs, globalInputs, system, ... }: { 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 # Home Manager configuration for media center setups
# Optimized for living room media consumption and gaming # Optimized for living room media consumption and gaming

4
home/roles/development/default.nix
View File

@@ -1,4 +1,4 @@
{ config, lib, pkgs, customPkgs, globalInputs, system, ... }: { config, lib, pkgs, globalInputs, system, ... }:
with lib; with lib;
@@ -16,7 +16,7 @@ in
pkgs.codex pkgs.codex
# Custom packages # Custom packages
customPkgs.tea-rbw pkgs.custom.tea-rbw
]; ];
programs.kubectl-secure.enable = true; programs.kubectl-secure.enable = true;

5
roles/kodi/default.nix
View File

@@ -4,7 +4,6 @@ with lib;
let let
cfg = config.roles.kodi; cfg = config.roles.kodi;
customPkgs = pkgs.callPackage ../../packages {};
in in
{ {
options.roles.kodi = { options.roles.kodi = {
@@ -54,7 +53,7 @@ in
kodiPkg kodiPkg
wget wget
firefox firefox
] ++ optional cfg.appLauncherServer.enable customPkgs.app-launcher-server; ] ++ optional cfg.appLauncherServer.enable pkgs.custom.app-launcher-server;
programs.kdeconnect.enable = true; programs.kdeconnect.enable = true;
@@ -65,7 +64,7 @@ in
after = [ "graphical-session.target" ]; after = [ "graphical-session.target" ];
serviceConfig = { serviceConfig = {
Type = "simple"; 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"; Restart = "always";
RestartSec = "5s"; RestartSec = "5s";
Environment = [ Environment = [