updates from makefile

This commit is contained in:
Don Harper 2024-03-07 19:44:58 -06:00
parent 72efc3f752
commit 8be29c8168
3 changed files with 70 additions and 16 deletions

69
flake.lock generated
View file

@ -5,11 +5,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1709439398,
"narHash": "sha256-MW0zp3ta7SvdpjvhVCbtP20ewRwQZX2vRFn14gTc4Kg=",
"lastModified": 1709773529,
"narHash": "sha256-CNz9ybeR88j8QQxy7YNFa8RlNq3pWnXLvocWIt2n5Mg=",
"owner": "nix-community",
"repo": "disko",
"rev": "1f76b318aa11170c8ca8c225a9b4c458a5fcbb57",
"rev": "a2009bc2b4e1d3ff5360048292deb0d610aa064b",
"type": "github"
},
"original": {
@ -59,11 +59,11 @@
]
},
"locked": {
"lastModified": 1709485962,
"narHash": "sha256-rmFB4uE10+LJbcVE4ePgiuHOBlUIjQOeZt4VQVJTU8M=",
"lastModified": 1709764752,
"narHash": "sha256-+lM4J4JoJeiN8V+3WSWndPHj1pJ9Jc1UMikGbXLqCTk=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "d579633ff9915a8f4058d5c439281097e92380a8",
"rev": "cf111d1a849ddfc38e9155be029519b0e2329615",
"type": "github"
},
"original": {
@ -73,6 +73,27 @@
"type": "github"
}
},
"home-manager-2311": {
"inputs": {
"nixpkgs": [
"nixpkgs-2311"
]
},
"locked": {
"lastModified": 1706981411,
"narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "652fda4ca6dafeb090943422c34ae9145787af37",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-23.11",
"repo": "home-manager",
"type": "github"
}
},
"libgit2": {
"flake": false,
"locked": {
@ -97,11 +118,11 @@
"nixpkgs-regression": "nixpkgs-regression"
},
"locked": {
"lastModified": 1709555398,
"narHash": "sha256-iNlldOzWIOljfN5mPXWtk8jhR1QM3/nI0jJyGrMpc+0=",
"lastModified": 1709830117,
"narHash": "sha256-dxTsArQn2YSxDktFckpBVSnadEBvksP8nrlXGP9EWzs=",
"owner": "NixOS",
"repo": "nix",
"rev": "438855952b7c0fcbcbe8e19b142c094a4abd0dea",
"rev": "b3b312827c750b92f725c5ea4ff91e04f45ab903",
"type": "github"
},
"original": {
@ -127,11 +148,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1708815994,
"narHash": "sha256-hL7N/ut2Xu0NaDxDMsw2HagAjgDskToGiyZOWriiLYM=",
"lastModified": 1709675310,
"narHash": "sha256-w61tqFEmuJ+/1rAwU7nkYZ+dN6sLwyobfLwX2Yn42FE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9a9dae8f6319600fa9aebde37f340975cab4b8c0",
"rev": "43d259f8d726113fac056e8bb17d5ac2dea3e0a8",
"type": "github"
},
"original": {
@ -141,6 +162,22 @@
"type": "github"
}
},
"nixpkgs-2311": {
"locked": {
"lastModified": 1701282334,
"narHash": "sha256-MxCVrXY6v4QmfTwIysjjaX0XUhqBbxTWWB4HXtDYsdk=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "057f9aecfb71c4437d2b27d3323df7f93c010b7e",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-lib": {
"locked": {
"dir": "lib",
@ -193,11 +230,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1709237383,
"narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
"lastModified": 1709703039,
"narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
"rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d",
"type": "github"
},
"original": {
@ -227,9 +264,11 @@
"inputs": {
"disko": "disko",
"home-manager": "home-manager",
"home-manager-2311": "home-manager-2311",
"nix": "nix",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_3",
"nixpkgs-2311": "nixpkgs-2311",
"wayland-pipewire-idle-inhibit": "wayland-pipewire-idle-inhibit"
}
},

View file

@ -3,6 +3,11 @@
disko.url = "github:nix-community/disko";
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-2311.url = "github:nixos/nixpkgs/23.11";
home-manager-2311 = {
url = "github:nix-community/home-manager/release-23.11";
inputs.nixpkgs.follows = "nixpkgs-2311";
};
home-manager = {
url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows = "nixpkgs";
@ -16,6 +21,7 @@
outputs = inputs@{
self,
nixpkgs,
nixpkgs-2311,
nix,
nixos-hardware,
home-manager,
@ -43,6 +49,7 @@
};
in {
fred = inputs.nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs;};
modules = server.modules ++ [
{
networking.hostName = "fred";
@ -51,6 +58,7 @@
];
};
www2 = inputs.nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs;};
modules = server.modules ++ [
{
networking.hostName = "www2";
@ -59,6 +67,7 @@
];
};
loki = inputs.nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs;};
modules = workstation.modules ++ [
{
networking.hostName = "loki";
@ -68,6 +77,7 @@
];
};
smaug = inputs.nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs;};
modules = workstation.modules ++ [
{
networking.hostName = "smaug";
@ -78,6 +88,7 @@
];
};
pocket2 = inputs.nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs;};
modules = workstation.modules ++ [
{
networking.hostName = "pocket2";
@ -90,6 +101,7 @@
];
};
dragon = inputs.nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs;};
modules = workstation.modules ++ [
{
networking.hostName = "dragon";
@ -102,6 +114,7 @@
];
};
eve = inputs.nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs;};
modules = workstation.modules ++ [
{
networking.hostName = "eve";
@ -111,6 +124,7 @@
];
};
vm2 = inputs.nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs;};
modules = workstation.modules ++ [
{
services.getty.autologinUser = "don";

View file

@ -1,6 +1,7 @@
{ config, pkgs, ... }:
{ config, pkgs, inputs, ... }:
{
home.packages = with pkgs; [
#inputs.nixpkgs-2311.opencv
opencv
citrix_workspace
];