don/NixOS-Configs
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Activity

updates from makefile

Browse source
This commit is contained in:
Don Harper 2024-04-02 21:49:05 -05:00
parent 384f11a5a9
commit 3c279b3432
2 changed files with 17 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

18
flake.lock generated
View file

@ -5,11 +5,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1711588700, "lastModified": 1711934712,
"narHash": "sha256-vBB5HoQVnA6c/UrDOhLXKAahEwSRccw2YXYHxD7qoi4=", "narHash": "sha256-sBDe+QmX/QohlnKeSEzrftcXyZL5FY09OMjZ59Rpyy4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "502241afa3de2a24865ddcbe4c122f4546e32092", "rev": "611c9ea53250f7bb22286b3d26872280a0e608f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -59,11 +59,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1711868868, "lastModified": 1711915616,
"narHash": "sha256-QpZanlbVu6Gb2K96u3vgu0F2BvZD74+fOsIFWcYEXoY=", "narHash": "sha256-co6LoFA+j6BZEeJNSR8nZ4oOort5qYPskjrDHBaJgmo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "30f2ec39519f4f5a8a96af808c439e730c15aeab", "rev": "820be197ccf3adaad9a8856ef255c13b6cc561a6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -148,11 +148,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1711401922, "lastModified": 1711715736,
"narHash": "sha256-QoQqXoj8ClGo0sqD/qWKFWezgEwUL0SUh37/vY2jNhc=", "narHash": "sha256-9slQ609YqT9bT/MNX9+5k5jltL9zgpn36DpFB7TkttM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "07262b18b97000d16a4bdb003418bd2fb067a932", "rev": "807c549feabce7eddbf259dbdcec9e0600a0660d",
"type": "github" "type": "github"
}, },
"original": { "original": {

17
flake.nix
View file

@ -3,11 +3,6 @@
disko.url = "github:nix-community/disko"; disko.url = "github:nix-community/disko";
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; 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 = { home-manager = {
url = "github:nix-community/home-manager/master"; url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -21,7 +16,6 @@
outputs = inputs@{ outputs = inputs@{
self, self,
nixpkgs, nixpkgs,
nixpkgs-2311,
nix, nix,
disko, disko,
nixos-hardware, nixos-hardware,
@ -46,7 +40,6 @@
templates = import ./templates; templates = import ./templates;
overlays = import ./overlays { inherit inputs outputs; }; overlays = import ./overlays { inherit inputs outputs; };
hydraJobs = import ./hydra.nix { inherit inputs outputs; };
# packages = forEachSystem (pkgs: import ./pkgs { inherit pkgs; }); # packages = forEachSystem (pkgs: import ./pkgs { inherit pkgs; });
# devShells = forEachSystem (pkgs: import ./shell.nix { inherit pkgs; }); # devShells = forEachSystem (pkgs: import ./shell.nix { inherit pkgs; });
@ -67,7 +60,10 @@
specialArgs = { inherit inputs outputs; }; specialArgs = { inherit inputs outputs; };
}; };
loki = lib.nixosSystem { loki = lib.nixosSystem {
modules = [ ./hosts/loki ]; modules = [
nixos-hardware.nixosModules.dell-xps-13-9310
./hosts/loki
];
specialArgs = { inherit inputs outputs; }; specialArgs = { inherit inputs outputs; };
}; };
pocket2 = lib.nixosSystem { pocket2 = lib.nixosSystem {
@ -75,7 +71,10 @@
specialArgs = { inherit inputs outputs; }; specialArgs = { inherit inputs outputs; };
}; };
smaug = lib.nixosSystem { smaug = lib.nixosSystem {
modules = [ ./hosts/smaug ]; modules = [
nixos-hardware.nixosModules.lenovo-thinkpad-x260
./hosts/smaug
];
specialArgs = { inherit inputs outputs; }; specialArgs = { inherit inputs outputs; };
}; };
# t2 = lib.nixosSystem { # t2 = lib.nixosSystem {