diff --git a/flake.lock b/flake.lock index b5d61eb..ed6a432 100644 --- a/flake.lock +++ b/flake.lock @@ -16,27 +16,9 @@ "type": "gitlab" } }, - "darwin": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1705356404, - "narHash": "sha256-0/WnHU5S9GXOJD2HGe/mFNmGGE+8UGnhwofsyJQVoDA=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "44a6ec1faeff61a6404c25ef1a263fc2d98d081b", - "type": "github" - }, - "original": { - "owner": "lnl7", - "repo": "nix-darwin", - "type": "github" - } - }, "disko": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1705348229, @@ -103,14 +85,14 @@ }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1705347059, - "narHash": "sha256-MSdJZDeyBIjf1SAZ7OvA44b00zUGTrDxkAm9vVR+XRk=", + "lastModified": 1705446327, + "narHash": "sha256-n7FCuAR2BI1SvLjF6eFc8VE6WLZCMlbToyfqU2ihbkU=", "owner": "nix-community", "repo": "home-manager", - "rev": "8c3b2a0cab64a464de9e41a470eecf1318ccff57", + "rev": "16cefa78cc801911ebd4ff1faddc6280ab3c9228", "type": "github" }, "original": { @@ -123,7 +105,7 @@ "inputs": { "blobs": "blobs", "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-22_11": "nixpkgs-22_11", "nixpkgs-23_05": "nixpkgs-23_05", "utils": "utils" @@ -144,7 +126,7 @@ }, "nh": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1705251288, @@ -163,7 +145,7 @@ "nix-custom": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "wallpaper-engine-kde-plugin": "wallpaper-engine-kde-plugin", "yorha-grub-theme": "yorha-grub-theme", "yorha-sound-theme": "yorha-sound-theme" @@ -184,15 +166,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1687274257, - "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=", - "path": "/nix/store/22qgs3skscd9bmrxv9xv4q5d4wwm5ppx-source", - "rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5", - "type": "path" + "lastModified": 1705242415, + "narHash": "sha256-a8DRYrNrzTudvO7XHUPNJD89Wbf1ZZT0VbwCsPnHWaE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ea780f3de2d169f982564128804841500e85e373", + "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-22_11": { @@ -243,27 +228,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1705242415, - "narHash": "sha256-a8DRYrNrzTudvO7XHUPNJD89Wbf1ZZT0VbwCsPnHWaE=", + "lastModified": 1705133751, + "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ea780f3de2d169f982564128804841500e85e373", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1703961334, - "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", + "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", "type": "github" }, "original": { @@ -273,7 +242,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1670751203, "narHash": "sha256-XdoH1v3shKDGlrwjgrNX/EN8s3c+kQV7xY6cLCE8vcI=", @@ -288,7 +257,7 @@ "type": "indirect" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1701263465, "narHash": "sha256-lNXUIlkfyDyp9Ox21hr+wsEf/IBklLvb6bYcyeXbdRc=", @@ -304,7 +273,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1700612854, "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", @@ -320,13 +289,13 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { - "lastModified": 1705133751, - "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", + "lastModified": 1705316053, + "narHash": "sha256-J2Ey5mPFT8gdfL2XC0JTZvKaBw/b2pnyudEXFvl+dQM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", + "rev": "c3e128f3c0ecc1fb04aef9f72b3dcc2f6cecf370", "type": "github" }, "original": { @@ -336,7 +305,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1704842529, "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=", @@ -354,20 +323,19 @@ }, "root": { "inputs": { - "darwin": "darwin", "disko": "disko", "hardware": "hardware", "home-manager": "home-manager", "mailserver": "mailserver", "nh": "nh", "nix-custom": "nix-custom", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "sops-nix": "sops-nix" } }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { diff --git a/flake.nix b/flake.nix index e9c0309..8819526 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,6 @@ description = "Entrypoint of all nix configurations"; inputs = { - darwin.url = "github:lnl7/nix-darwin"; disko.url = "github:nix-community/disko"; hardware.url = "github:nixos/nixos-hardware"; home-manager.url = "github:nix-community/home-manager"; @@ -13,7 +12,7 @@ sops-nix.url = "github:Mic92/sops-nix"; }; - outputs = inputs@{ self, darwin, nixpkgs, nix-custom, ... }: + outputs = inputs@{ self, nixpkgs, nix-custom, ... }: let linuxCfgDir = ./linux; templateDir = ./template;