greg/nixos
1
0
Fork 1
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Updates to 23.05 Versioning

Browse Source
This commit is contained in:
Greg Hellings
2023-06-20 11:00:12 -05:00
parent 3faab8db04
commit e9c341a8ec
6 changed files with 87 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
darwin/default.nix
+13 -2
View File
@@ -1,4 +1,4 @@
{ agenix, darwin, nixstable, nixunstable, overlays, ... }: { agenix, darwin, nixstable, nixunstable, overlays, hm, ... }:
let let
mac = { mac = {
system ? "aarch64-darwin", system ? "aarch64-darwin",
@@ -13,7 +13,18 @@ let
specialArgs = { inherit nixpkgs; }; specialArgs = { inherit nixpkgs; };
modules = [ modules = [
{ nixpkgs.overlays = overlays; } { nixpkgs.overlays = overlays; }
agenix.nixosModule agenix.nixosModules.default
hm.darwinModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users."gregory.hellings" = import ../home/home.nix {
inherit (nixunstable) lib;
pkgs = nixunstable;
gui = true;
gnome = false;
};
}
../modules-all ../modules-all
../modules-darwin ../modules-darwin
./${name} ./${name}
flake.lock
Generated
+69 -24
View File
@@ -2,14 +2,16 @@
"nodes": { "nodes": {
"agenix": { "agenix": {
"inputs": { "inputs": {
"darwin": "darwin",
"home-manager": "home-manager",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1665870395, "lastModified": 1684153753,
"narHash": "sha256-Tsbqb27LDNxOoPLh0gw2hIb6L/6Ow/6lIBvqcHzEKBI=", "narHash": "sha256-PVbWt3qrjYAK+T5KplFcO+h7aZWfEj1UtyoKlvcDxh0=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "a630400067c6d03c9b3e0455347dc8559db14288", "rev": "db5637d10f797bb251b94ef9040b237f4702cde3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -19,17 +21,39 @@
} }
}, },
"darwin": { "darwin": {
"inputs": {
"nixpkgs": [
"agenix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1673295039,
"narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "87b9d090ad39b25b2400029c64825fc2a8868943",
"type": "github"
},
"original": {
"owner": "lnl7",
"ref": "master",
"repo": "nix-darwin",
"type": "github"
}
},
"darwin_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixunstable" "nixunstable"
] ]
}, },
"locked": { "locked": {
"lastModified": 1682773107, "lastModified": 1687110393,
"narHash": "sha256-+h94XeJnG3uk5imJlBi/1lVmcfCbxHpwZp5u7n3Krwg=", "narHash": "sha256-SnkdWeZ8PZd3Dc74iFF8xiE7qDp5+z3Yps2mE79tsM0=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "379d42fad6bc5c28f79d5f7ff2fa5f1c90cb7bf8", "rev": "8a5af0da9d8dab8a188436750489e304ac682085",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -44,11 +68,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1682729071, "lastModified": 1687135984,
"narHash": "sha256-N0oJwtZPEo+2waAZtsdxMGOkyGfiPldmHdP0t+vi0pk=", "narHash": "sha256-rKYTpYAAqBA07bOKNxnQFDSQ9BjAFFMP3m6k3uNUAJ8=",
"owner": "bandithedoge", "owner": "bandithedoge",
"repo": "nixpkgs-firefox-darwin", "repo": "nixpkgs-firefox-darwin",
"rev": "04b4ccccef58d9fc3f18192b6edc4b3c5decb3cf", "rev": "31d984614fa8525646f29bfe1bb4cebe48906e8e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -109,15 +133,15 @@
"hm": { "hm": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixstable" "nixunstable"
] ]
}, },
"locked": { "locked": {
"lastModified": 1687204608, "lastModified": 1687257796,
"narHash": "sha256-rZ0e0iAIQM7vlsMd2/pcGfymZzNBRawObFgqIpxE94c=", "narHash": "sha256-jWF0LtG4GczLGLsBvXIGaCX+JvTLfawVLLJPtB5CMW0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f06a43dca05fb7f1aa44742bf861d9c827b45122", "rev": "e8b5f8f9b3368dcc4814129d6f66c1af7cf3b6e5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -127,13 +151,34 @@
"type": "github" "type": "github"
} }
}, },
"home-manager": {
"inputs": {
"nixpkgs": [
"agenix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1682203081,
"narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1665732960, "lastModified": 1677676435,
"narHash": "sha256-WBZ+uSHKFyjvd0w4inbm0cNExYTn8lpYFcHEes8tmec=", "narHash": "sha256-6FxdcmQr5JeZqsQvfinIMr0XcTyTuR7EXX0H3ANShpQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4428e23312933a196724da2df7ab78eb5e67a88e", "rev": "a08d6979dd7c82c4cef0dcc6ac45ab16051c1169",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -177,11 +222,11 @@
}, },
"nixunstable": { "nixunstable": {
"locked": { "locked": {
"lastModified": 1686960236, "lastModified": 1684464849,
"narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=", "narHash": "sha256-f8th/GWE9M2hePTMZc0YyFboigt9AG/ioEcyHcdFK2I=",
"owner": "nixos", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "04af42f3b31dba0ef742d254456dc4c14eedac86", "rev": "b969a89c3e84a121c9b3af2e4ef277cd822b988a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -193,11 +238,11 @@
}, },
"nurpkgs": { "nurpkgs": {
"locked": { "locked": {
"lastModified": 1683002478, "lastModified": 1687203925,
"narHash": "sha256-af6LDktTjh3S6jWS2luOla1EW8uic0nFamkLenSvdRM=", "narHash": "sha256-DMMZiGmfYFQIzCV9mIWSvpfYbMn232/egV6Wg4ufRUY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "d889aaa91f9185bce2017679380ee9b233bb1c5e", "rev": "c6e103d3d88ebc99a3e09cc37f54f5957066eade",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -209,7 +254,7 @@
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"darwin": "darwin", "darwin": "darwin_2",
"ffmac": "ffmac", "ffmac": "ffmac",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"hm": "hm", "hm": "hm",
flake.nix
+3 -3
View File
@@ -11,7 +11,7 @@
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
hm = { hm = {
url = "github:nix-community/home-manager/master"; url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows = "nixstable"; inputs.nixpkgs.follows = "nixunstable";
}; };
darwin = { darwin = {
url = "github:lnl7/nix-darwin/master"; url = "github:lnl7/nix-darwin/master";
@@ -34,7 +34,7 @@
); );
local_overlay = import ./overlays; local_overlay = import ./overlays;
overlays = [ overlays = [
agenix.overlay agenix.overlays.default
pkg-sets pkg-sets
local_overlay local_overlay
nurpkgs.overlay nurpkgs.overlay
@@ -45,7 +45,7 @@
in { in {
nixosConfigurations = (import ./hosts { inherit nixstable nixunstable overlays wsl agenix; }); nixosConfigurations = (import ./hosts { inherit nixstable nixunstable overlays wsl agenix; });
darwinConfigurations = (import ./darwin { inherit agenix darwin nixstable nixunstable overlays; }); darwinConfigurations = (import ./darwin { inherit agenix darwin nixstable nixunstable overlays hm; });
defaultPackage = flake-utils.lib.eachDefaultSystemMap (system: inputs.self.homeConfigurations.gui."${system}".activationPackage); defaultPackage = flake-utils.lib.eachDefaultSystemMap (system: inputs.self.homeConfigurations.gui."${system}".activationPackage);
home/default.nix
+1 -1
View File
@@ -21,7 +21,7 @@ let
username username
}: }:
let let
stateVersion = "22.05"; stateVersion = "23.05";
homeDirectory = home system username; homeDirectory = home system username;
cfg = { home = { inherit username homeDirectory stateVersion; }; }; cfg = { home = { inherit username homeDirectory stateVersion; }; };
home/home.nix
+1 -1
View File
@@ -37,7 +37,7 @@
" https://pypiev.ivrtechnology.com/simple/" " https://pypiev.ivrtechnology.com/simple/"
]); ]);
home.stateVersion = "22.05"; home.stateVersion = "23.05";
home.packages = with pkgs; [ home.packages = with pkgs; [
bitwarden-cli bitwarden-cli
brew brew
modules-all/default.nix
-1
View File
@@ -51,7 +51,6 @@
gregpy gregpy
findutils findutils
hms # My own home manager switcher hms # My own home manager switcher
home-manager
htop htop
killall killall
nano nano