From f4a273e89e6a0c525c080d29ef96c7870bdb860d Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sun, 19 May 2024 00:00:03 -0400 Subject: [PATCH] added missing system --- flake.lock | 78 +++++++++++++++++++++++++++++++----------------- modules/main.nix | 1 + 2 files changed, 52 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 9968679..4258fb2 100644 --- a/flake.lock +++ b/flake.lock @@ -2,14 +2,17 @@ "nodes": { "home-manager": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "modules", + "nixpkgs" + ] }, "locked": { - "lastModified": 1714337029, - "narHash": "sha256-VCy6XjpojlzgmYuHewdxUYExS3olKjY9WNdM5uXUvAw=", + "lastModified": 1715930644, + "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", "owner": "nix-community", "repo": "home-manager", - "rev": "02002a08b489b43e3ac1400609a9bf1b7c08e384", + "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", "type": "github" }, "original": { @@ -18,6 +21,44 @@ "type": "github" } }, + "modules": { + "inputs": { + "home-manager": "home-manager", + "nix-darwin": "nix-darwin", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1, + "narHash": "sha256-Ipzclc1pig7KeyiRl2JegcsXdLoANQAEl1KtZMrWUwM=", + "path": "modules/", + "type": "path" + }, + "original": { + "path": "modules/", + "type": "path" + } + }, + "nix-darwin": { + "inputs": { + "nixpkgs": [ + "modules", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1715901937, + "narHash": "sha256-eMyvWP56ZOdraC2IOvZo0/RTDcrrsqJ0oJWDC76JTak=", + "owner": "LnL7", + "repo": "nix-darwin", + "rev": "ffc01182f90118119930bdfc528c1ee9a39ecef8", + "type": "github" + }, + "original": { + "owner": "LnL7", + "repo": "nix-darwin", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1714201532, @@ -36,41 +77,24 @@ }, "nixpkgs": { "locked": { - "lastModified": 1714253743, - "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", + "lastModified": 1716062047, + "narHash": "sha256-OhysviwHQz4p2HZL4g7XGMLoUbWMjkMr/ogaR3VUYNA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", + "rev": "02923630b89aa1ab36ef8e422501a6f4fd4b2016", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1714253743, - "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "root": { "inputs": { - "home-manager": "home-manager", - "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2" + "modules": "modules", + "nixos-hardware": "nixos-hardware" } } }, diff --git a/modules/main.nix b/modules/main.nix index d2bfd0c..1b5ef3f 100644 --- a/modules/main.nix +++ b/modules/main.nix @@ -1,6 +1,7 @@ { user , systemStateVersion , hostName +, system # Desktop Module , desktop ? { enable = false;