From ef9fa061e6856a774e03fc52c50c7777b59c9393 Mon Sep 17 00:00:00 2001 From: materus Date: Sun, 8 Oct 2023 16:32:38 +0200 Subject: [PATCH] update flake --- flake.lock | 125 +++++++++++++++++++++++++++++++++++++++++++---------- flake.nix | 3 +- 2 files changed, 104 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 864ed01..f345109 100644 --- a/flake.lock +++ b/flake.lock @@ -11,14 +11,18 @@ "nur": "nur_2" }, "locked": { - "lastModified": 1, - "narHash": "sha256-LhzDCcv6HxSKcviWhwJfgrCC8UWs84+G1nZR7BHuqn0=", - "path": "./inputs", - "type": "path" + "lastModified": 1696774666, + "narHash": "sha256-kqSXbAPQdkUadGsQL/bH9FBV/y4+d2g3GJxJHafquS4=", + "ref": "inputs", + "rev": "cae14663b542afa8140c72b8aa42cd42cf7b0151", + "revCount": 5, + "type": "git", + "url": "file:/materus/config/nixos-config" }, "original": { - "path": "./inputs", - "type": "path" + "ref": "inputs", + "type": "git", + "url": "file:/materus/config/nixos-config" } }, "emacs-overlay": { @@ -45,6 +49,31 @@ "type": "github" } }, + "emacs-overlay_2": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "configInputs", + "nixerus", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable_2" + }, + "locked": { + "lastModified": 1696730756, + "narHash": "sha256-u+UbAnVCD3RnMyXgvo5k0fDmyRNAixDh07lrOSdtZgs=", + "owner": "nix-community", + "repo": "emacs-overlay", + "rev": "3f942773192735d987ab517ceaae2a0479d4e601", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "master", + "repo": "emacs-overlay", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -63,6 +92,24 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -104,6 +151,7 @@ }, "nixerus": { "inputs": { + "emacs-overlay": "emacs-overlay_2", "home-manager": [ "configInputs", "home-manager" @@ -115,12 +163,12 @@ "nur": "nur" }, "locked": { - "dirtyRev": "29a0bd613c216d0c657e5a2f38bdba7fbd4f7ab7-dirty", - "dirtyShortRev": "29a0bd6-dirty", "lastModified": 1696757058, - "narHash": "sha256-Cu6C1fMUE5spH53B4ccv8RHOlWkQ2V6SgJF0YoM7f/g=", - "type": "git", - "url": "file:///materus/config/Nixerus" + "narHash": "sha256-9ikKmi8n+ml13hJyVIFpFXRSc12B3kCL+kubc7z5P8Y=", + "owner": "materusPL", + "repo": "Nixerus", + "rev": "29a0bd613c216d0c657e5a2f38bdba7fbd4f7ab7", + "type": "github" }, "original": { "owner": "materusPL", @@ -161,6 +209,22 @@ "type": "github" } }, + "nixpkgs-stable_2": { + "locked": { + "lastModified": 1696374741, + "narHash": "sha256-gt8B3G0ryizT9HSB4cCO8QoxdbsHnrQH+/BdKxOwqF0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8a4c17493e5c39769f79117937c79e1c88de6729", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1696604326, @@ -179,25 +243,27 @@ }, "nur": { "locked": { - "lastModified": 1696758426, - "narHash": "sha256-8ebGev/aEoy9NUhexXLg1gFtcdgT+pmYXoc1rg4U5TM=", + "lastModified": 1696749357, + "narHash": "sha256-DOinkqGrYPGqE0cQ6iQfN8Rwhdj43OGmn4U0402PSKk=", "owner": "nix-community", "repo": "NUR", - "rev": "2a1a76ccc91abc61c09521931253f9fe9e012a85", + "rev": "f77ed4768c0b2763cae81a30a1905145178c105e", "type": "github" }, "original": { - "id": "nur", - "type": "indirect" + "owner": "nix-community", + "ref": "master", + "repo": "NUR", + "type": "github" } }, "nur_2": { "locked": { - "lastModified": 1696758426, - "narHash": "sha256-8ebGev/aEoy9NUhexXLg1gFtcdgT+pmYXoc1rg4U5TM=", + "lastModified": 1696772745, + "narHash": "sha256-9cXNUJwpHLOTPqlpUF33oFJHzrscb9oi/YKS2QiiTtQ=", "owner": "nix-community", "repo": "NUR", - "rev": "2a1a76ccc91abc61c09521931253f9fe9e012a85", + "rev": "09a721cf6869671ec2258da3c377436e3498eead", "type": "github" }, "original": { @@ -209,11 +275,11 @@ }, "nur_3": { "locked": { - "lastModified": 1696758426, - "narHash": "sha256-8ebGev/aEoy9NUhexXLg1gFtcdgT+pmYXoc1rg4U5TM=", + "lastModified": 1696772745, + "narHash": "sha256-9cXNUJwpHLOTPqlpUF33oFJHzrscb9oi/YKS2QiiTtQ=", "owner": "nix-community", "repo": "NUR", - "rev": "2a1a76ccc91abc61c09521931253f9fe9e012a85", + "rev": "09a721cf6869671ec2258da3c377436e3498eead", "type": "github" }, "original": { @@ -260,6 +326,21 @@ "repo": "default", "type": "github" } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 502a59e..346ae3f 100644 --- a/flake.nix +++ b/flake.nix @@ -14,7 +14,7 @@ ref = "mock"; }; configInputs = { - url = "path:./inputs"; + url = "git+file:/materus/config/nixos-config?ref=inputs"; inputs = { nixpkgs.follows = "nixpkgs"; }; @@ -32,7 +32,6 @@ forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f system); in rec { - nixosConfigurations = import ./configurations/host { inherit inputs; materusFlake = self; }; homeConfigurations = import ./configurations/home { inherit inputs; materusFlake = self; }; selfPath = ./.;