From 95e43f5aeab67e83a42994b32267d3a0ff2cbb22 Mon Sep 17 00:00:00 2001 From: Artur Manuel Date: Wed, 16 Oct 2024 01:47:33 +0100 Subject: [PATCH] fix: git add . in the root of the repo --- computers/default.nix | 9 ++++++++- flake.lock | 45 ++++++++++++++++++++++++++++++++++++++----- flake.nix | 5 +++++ 3 files changed, 53 insertions(+), 6 deletions(-) diff --git a/computers/default.nix b/computers/default.nix index 1a280f4..20125f0 100644 --- a/computers/default.nix +++ b/computers/default.nix @@ -1,9 +1,16 @@ -{lib, ...}: { +{ + inputs, + lib, + ... +}: { flake = { nixosConfigurations = lib.mkComputers { toothless = { system = "x86_64-linux"; user = "artur"; + extraModules = [ + inputs.disko.nixosModules.disko + ]; }; }; nixosModules.default = ./shared; diff --git a/flake.lock b/flake.lock index 8e7a50a..47b237f 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,23 @@ { "nodes": { + "disko": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1729010169, + "narHash": "sha256-AjgIlXcreagCs6ltT8mzI1UYEiYgfhlwe4Tl3taxQSU=", + "owner": "nix-community", + "repo": "disko", + "rev": "9ab6ae4e632016caac1c7e82e15b12b8c672ed76", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "disko", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -40,7 +58,7 @@ "inputs": { "flake-compat": "flake-compat", "gitignore": "gitignore", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -80,11 +98,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1719082008, - "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", + "lastModified": 1725194671, + "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9693852a2070b398ee123a329e68f0dab5526681", + "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", "type": "github" }, "original": { @@ -111,6 +129,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1719082008, + "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9693852a2070b398ee123a329e68f0dab5526681", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1728888510, "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", @@ -128,9 +162,10 @@ }, "root": { "inputs": { + "disko": "disko", "flake-parts": "flake-parts", "git-hooks-nix": "git-hooks-nix", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" } } }, diff --git a/flake.nix b/flake.nix index 0fb6d14..2960652 100644 --- a/flake.nix +++ b/flake.nix @@ -18,6 +18,11 @@ owner = "cachix"; repo = "git-hooks.nix"; }; + disko = { + type = "github"; + owner = "nix-community"; + repo = "disko"; + }; }; outputs = inputs @ { nixpkgs,