From 402053e3f9f21cc2cae617f43e299b30ee8ef166 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sat, 17 Jun 2023 10:27:47 -0600 Subject: [PATCH] [NixOS] Remove duplication of dependencies --- nixos/flake.lock | 1532 ++++------------------------------------------ nixos/flake.nix | 105 +++- 2 files changed, 212 insertions(+), 1425 deletions(-) diff --git a/nixos/flake.lock b/nixos/flake.lock index 27c64db2..6148f4bf 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -2,7 +2,9 @@ "nodes": { "flake-utils": { "inputs": { - "systems": "systems" + "systems": [ + "systems" + ] }, "locked": { "lastModified": 1685518550, @@ -18,279 +20,11 @@ "type": "github" } }, - "flake-utils_10": { - "inputs": { - "systems": "systems_10" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_11": { - "inputs": { - "systems": "systems_11" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_12": { - "inputs": { - "systems": "systems_12" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_13": { - "inputs": { - "systems": "systems_13" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_14": { - "inputs": { - "systems": "systems_14" - }, - "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_15": { - "inputs": { - "systems": "systems_15" - }, - "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_16": { - "inputs": { - "systems": "systems_16" - }, - "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_5": { - "inputs": { - "systems": "systems_5" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_6": { - "inputs": { - "systems": "systems_6" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_7": { - "inputs": { - "systems": "systems_7" - }, - "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_8": { - "inputs": { - "systems": "systems_8" - }, - "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_9": { - "inputs": { - "systems": "systems_9" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "git-ignore-nix": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1660459072, @@ -302,283 +36,24 @@ }, "original": { "owner": "hercules-ci", - "ref": "master", - "repo": "gitignore.nix", - "type": "github" - } - }, - "git-ignore-nix_10": { - "inputs": { - "nixpkgs": "nixpkgs_19" - }, - "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "ref": "master", - "repo": "gitignore.nix", - "type": "github" - } - }, - "git-ignore-nix_11": { - "inputs": { - "nixpkgs": "nixpkgs_21" - }, - "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "ref": "master", - "repo": "gitignore.nix", - "type": "github" - } - }, - "git-ignore-nix_12": { - "inputs": { - "nixpkgs": "nixpkgs_23" - }, - "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "ref": "master", - "repo": "gitignore.nix", - "type": "github" - } - }, - "git-ignore-nix_13": { - "inputs": { - "nixpkgs": "nixpkgs_25" - }, - "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "ref": "master", - "repo": "gitignore.nix", - "type": "github" - } - }, - "git-ignore-nix_14": { - "inputs": { - "nixpkgs": "nixpkgs_26" - }, - "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "ref": "master", - "repo": "gitignore.nix", - "type": "github" - } - }, - "git-ignore-nix_15": { - "inputs": { - "nixpkgs": "nixpkgs_27" - }, - "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "ref": "master", - "repo": "gitignore.nix", - "type": "github" - } - }, - "git-ignore-nix_2": { - "inputs": { - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "ref": "master", - "repo": "gitignore.nix", - "type": "github" - } - }, - "git-ignore-nix_3": { - "inputs": { - "nixpkgs": "nixpkgs_4" - }, - "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "ref": "master", - "repo": "gitignore.nix", - "type": "github" - } - }, - "git-ignore-nix_4": { - "inputs": { - "nixpkgs": "nixpkgs_6" - }, - "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "ref": "master", - "repo": "gitignore.nix", - "type": "github" - } - }, - "git-ignore-nix_5": { - "inputs": { - "nixpkgs": "nixpkgs_9" - }, - "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "ref": "master", - "repo": "gitignore.nix", - "type": "github" - } - }, - "git-ignore-nix_6": { - "inputs": { - "nixpkgs": "nixpkgs_11" - }, - "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "ref": "master", - "repo": "gitignore.nix", - "type": "github" - } - }, - "git-ignore-nix_7": { - "inputs": { - "nixpkgs": "nixpkgs_14" - }, - "locked": { - "lastModified": 1635165013, - "narHash": "sha256-o/BdVjNwcB6jOmzZjOH703BesSkkS5O7ej3xhyO8hAY=", - "owner": "IvanMalison", - "repo": "gitignore.nix", - "rev": "5b9e0ff9d3b551234b4f3eb3983744fa354b17f1", - "type": "github" - }, - "original": { - "owner": "IvanMalison", - "ref": "master", - "repo": "gitignore.nix", - "type": "github" - } - }, - "git-ignore-nix_8": { - "inputs": { - "nixpkgs": "nixpkgs_16" - }, - "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "ref": "master", - "repo": "gitignore.nix", - "type": "github" - } - }, - "git-ignore-nix_9": { - "inputs": { - "nixpkgs": "nixpkgs_17" - }, - "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "ref": "master", "repo": "gitignore.nix", "type": "github" } }, "gtk-sni-tray": { "inputs": { - "flake-utils": "flake-utils_3", - "git-ignore-nix": "git-ignore-nix_2", - "nixpkgs": "nixpkgs_3", - "status-notifier-item": "status-notifier-item" + "flake-utils": [ + "flake-utils" + ], + "git-ignore-nix": [ + "git-ignore-nix" + ], + "nixpkgs": [ + "nixpkgs" + ], + "status-notifier-item": [ + "status-notifier-item" + ] }, "locked": { "lastModified": 1663379298, @@ -590,38 +65,21 @@ }, "original": { "owner": "taffybar", - "ref": "master", - "repo": "gtk-sni-tray", - "type": "github" - } - }, - "gtk-sni-tray_2": { - "inputs": { - "flake-utils": "flake-utils_10", - "git-ignore-nix": "git-ignore-nix_9", - "nixpkgs": "nixpkgs_18", - "status-notifier-item": "status-notifier-item_2" - }, - "locked": { - "lastModified": 1663379298, - "narHash": "sha256-m18+G7V1N+g/pPeKJG9hkblGA5c8QTnUYnsU5t14sOw=", - "owner": "taffybar", - "repo": "gtk-sni-tray", - "rev": "1927d86308d34b5d21a709cf8ff5332ec5d37de4", - "type": "github" - }, - "original": { - "owner": "taffybar", - "ref": "master", "repo": "gtk-sni-tray", "type": "github" } }, "gtk-strut": { "inputs": { - "flake-utils": "flake-utils_5", - "git-ignore-nix": "git-ignore-nix_4", - "nixpkgs": "nixpkgs_7" + "flake-utils": [ + "flake-utils" + ], + "git-ignore-nix": [ + "git-ignore-nix" + ], + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1663377859, @@ -633,28 +91,6 @@ }, "original": { "owner": "taffybar", - "ref": "master", - "repo": "gtk-strut", - "type": "github" - } - }, - "gtk-strut_2": { - "inputs": { - "flake-utils": "flake-utils_12", - "git-ignore-nix": "git-ignore-nix_11", - "nixpkgs": "nixpkgs_22" - }, - "locked": { - "lastModified": 1663377859, - "narHash": "sha256-UrBd+R3NaJIDC2lt5gMafS3KBeLs83emm2YorX2cFCo=", - "owner": "taffybar", - "repo": "gtk-strut", - "rev": "d946eb230cdccf5afc063642b3215723e555990b", - "type": "github" - }, - "original": { - "owner": "taffybar", - "ref": "master", "repo": "gtk-strut", "type": "github" } @@ -666,28 +102,33 @@ ] }, "locked": { - "lastModified": 1686693747, - "narHash": "sha256-pf0rcQeKejsBfv6NPZCXAo1gN2XtRYm2jzRwHswYeEc=", + "lastModified": 1686715156, + "narHash": "sha256-91S5sWEDREACTu7411J9dhHVGgK9eSeGz4bGCuu/kLo=", "owner": "nix-community", "repo": "home-manager", - "rev": "62f111ef1e50e518dbb3f0782a31dcd244a0a2d7", + "rev": "5db22bce05c776057fdb289da17f6c12049c4624", "type": "github" }, "original": { "owner": "nix-community", - "ref": "master", "repo": "home-manager", "type": "github" } }, "imalison-taffybar": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": [ + "flake-utils" + ], "nixpkgs": [ "nixpkgs" ], - "taffybar": "taffybar", - "xmonad": "xmonad_2" + "taffybar": [ + "taffybar" + ], + "xmonad": [ + "xmonad" + ] }, "locked": { "lastModified": 1, @@ -734,7 +175,6 @@ }, "original": { "owner": "IvanMalison", - "ref": "master", "repo": "nix", "type": "github" } @@ -756,16 +196,14 @@ }, "nixpkgs": { "locked": { - "lastModified": 1632846328, - "narHash": "sha256-sFi6YtlGK30TBB9o6CW7LG9mYHkgtKeWbSLAjjrNTX0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2b71ddd869ad592510553d09fe89c9709fa26b2b", - "type": "github" + "lastModified": 1, + "narHash": "sha256-VtJelv4j1DRHjyxHOqUpfcbpxjQfVxWkKsNS9tr1jl4=", + "path": "./nixpkgs", + "type": "path" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "path": "./nixpkgs", + "type": "path" } }, "nixpkgs-regression": { @@ -784,372 +222,32 @@ "type": "github" } }, - "nixpkgs_10": { + "nixpkgs-regression_2": { "locked": { - "lastModified": 1685025607, - "narHash": "sha256-k3O28/2Juyz31h0eJmWu3LwqoA4nRj8ewgtFXvQRMDU=", - "path": "/nix/store/gfb5f8bvm088a6p1gzhv9nbw1dnif2cs-source", - "rev": "898ce554c01995efe38d2c4cc3cb2ad3312aeabf", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_11": { - "locked": { - "lastModified": 1632846328, - "narHash": "sha256-sFi6YtlGK30TBB9o6CW7LG9mYHkgtKeWbSLAjjrNTX0=", + "lastModified": 1686730349, + "narHash": "sha256-1rRYJnnU+Qb/HDgh5rD9HYEsPHoDeURNTcwLZ86eaCw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2b71ddd869ad592510553d09fe89c9709fa26b2b", + "rev": "c5c01f0b6105c26573847e436ef43d3e69a557dc", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_12": { - "locked": { - "lastModified": 1, - "narHash": "sha256-VtJelv4j1DRHjyxHOqUpfcbpxjQfVxWkKsNS9tr1jl4=", - "path": "./nixpkgs", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_13": { - "locked": { - "lastModified": 1, - "narHash": "sha256-VtJelv4j1DRHjyxHOqUpfcbpxjQfVxWkKsNS9tr1jl4=", - "path": "./nixpkgs", - "type": "path" - }, - "original": { - "path": "./nixpkgs", - "type": "path" - } - }, - "nixpkgs_14": { - "locked": { - "lastModified": 1632846328, - "narHash": "sha256-sFi6YtlGK30TBB9o6CW7LG9mYHkgtKeWbSLAjjrNTX0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2b71ddd869ad592510553d09fe89c9709fa26b2b", "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_15": { - "locked": { - "lastModified": 1, - "narHash": "sha256-VtJelv4j1DRHjyxHOqUpfcbpxjQfVxWkKsNS9tr1jl4=", - "path": "./nixpkgs", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_16": { - "locked": { - "lastModified": 1632846328, - "narHash": "sha256-sFi6YtlGK30TBB9o6CW7LG9mYHkgtKeWbSLAjjrNTX0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2b71ddd869ad592510553d09fe89c9709fa26b2b", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_17": { - "locked": { - "lastModified": 1632846328, - "narHash": "sha256-sFi6YtlGK30TBB9o6CW7LG9mYHkgtKeWbSLAjjrNTX0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2b71ddd869ad592510553d09fe89c9709fa26b2b", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_18": { - "locked": { - "lastModified": 1685025607, - "narHash": "sha256-k3O28/2Juyz31h0eJmWu3LwqoA4nRj8ewgtFXvQRMDU=", - "path": "/nix/store/gfb5f8bvm088a6p1gzhv9nbw1dnif2cs-source", - "rev": "898ce554c01995efe38d2c4cc3cb2ad3312aeabf", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_19": { - "locked": { - "lastModified": 1632846328, - "narHash": "sha256-sFi6YtlGK30TBB9o6CW7LG9mYHkgtKeWbSLAjjrNTX0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2b71ddd869ad592510553d09fe89c9709fa26b2b", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1632846328, - "narHash": "sha256-sFi6YtlGK30TBB9o6CW7LG9mYHkgtKeWbSLAjjrNTX0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2b71ddd869ad592510553d09fe89c9709fa26b2b", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_20": { - "locked": { - "lastModified": 1685025607, - "narHash": "sha256-k3O28/2Juyz31h0eJmWu3LwqoA4nRj8ewgtFXvQRMDU=", - "path": "/nix/store/gfb5f8bvm088a6p1gzhv9nbw1dnif2cs-source", - "rev": "898ce554c01995efe38d2c4cc3cb2ad3312aeabf", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_21": { - "locked": { - "lastModified": 1632846328, - "narHash": "sha256-sFi6YtlGK30TBB9o6CW7LG9mYHkgtKeWbSLAjjrNTX0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2b71ddd869ad592510553d09fe89c9709fa26b2b", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_22": { - "locked": { - "lastModified": 1685025607, - "narHash": "sha256-k3O28/2Juyz31h0eJmWu3LwqoA4nRj8ewgtFXvQRMDU=", - "path": "/nix/store/gfb5f8bvm088a6p1gzhv9nbw1dnif2cs-source", - "rev": "898ce554c01995efe38d2c4cc3cb2ad3312aeabf", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_23": { - "locked": { - "lastModified": 1632846328, - "narHash": "sha256-sFi6YtlGK30TBB9o6CW7LG9mYHkgtKeWbSLAjjrNTX0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2b71ddd869ad592510553d09fe89c9709fa26b2b", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_24": { - "locked": { - "lastModified": 1685025607, - "narHash": "sha256-k3O28/2Juyz31h0eJmWu3LwqoA4nRj8ewgtFXvQRMDU=", - "path": "/nix/store/gfb5f8bvm088a6p1gzhv9nbw1dnif2cs-source", - "rev": "898ce554c01995efe38d2c4cc3cb2ad3312aeabf", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_25": { - "locked": { - "lastModified": 1632846328, - "narHash": "sha256-sFi6YtlGK30TBB9o6CW7LG9mYHkgtKeWbSLAjjrNTX0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2b71ddd869ad592510553d09fe89c9709fa26b2b", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_26": { - "locked": { - "lastModified": 1632846328, - "narHash": "sha256-sFi6YtlGK30TBB9o6CW7LG9mYHkgtKeWbSLAjjrNTX0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2b71ddd869ad592510553d09fe89c9709fa26b2b", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_27": { - "locked": { - "lastModified": 1632846328, - "narHash": "sha256-sFi6YtlGK30TBB9o6CW7LG9mYHkgtKeWbSLAjjrNTX0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2b71ddd869ad592510553d09fe89c9709fa26b2b", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_28": { - "locked": { - "lastModified": 1, - "narHash": "sha256-VtJelv4j1DRHjyxHOqUpfcbpxjQfVxWkKsNS9tr1jl4=", - "path": "./nixpkgs", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1685025607, - "narHash": "sha256-k3O28/2Juyz31h0eJmWu3LwqoA4nRj8ewgtFXvQRMDU=", - "path": "/nix/store/gfb5f8bvm088a6p1gzhv9nbw1dnif2cs-source", - "rev": "898ce554c01995efe38d2c4cc3cb2ad3312aeabf", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1632846328, - "narHash": "sha256-sFi6YtlGK30TBB9o6CW7LG9mYHkgtKeWbSLAjjrNTX0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2b71ddd869ad592510553d09fe89c9709fa26b2b", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1685025607, - "narHash": "sha256-k3O28/2Juyz31h0eJmWu3LwqoA4nRj8ewgtFXvQRMDU=", - "path": "/nix/store/gfb5f8bvm088a6p1gzhv9nbw1dnif2cs-source", - "rev": "898ce554c01995efe38d2c4cc3cb2ad3312aeabf", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1632846328, - "narHash": "sha256-sFi6YtlGK30TBB9o6CW7LG9mYHkgtKeWbSLAjjrNTX0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2b71ddd869ad592510553d09fe89c9709fa26b2b", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1685025607, - "narHash": "sha256-k3O28/2Juyz31h0eJmWu3LwqoA4nRj8ewgtFXvQRMDU=", - "path": "/nix/store/gfb5f8bvm088a6p1gzhv9nbw1dnif2cs-source", - "rev": "898ce554c01995efe38d2c4cc3cb2ad3312aeabf", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_8": { - "locked": { - "lastModified": 1685025607, - "narHash": "sha256-k3O28/2Juyz31h0eJmWu3LwqoA4nRj8ewgtFXvQRMDU=", - "path": "/nix/store/gfb5f8bvm088a6p1gzhv9nbw1dnif2cs-source", - "rev": "898ce554c01995efe38d2c4cc3cb2ad3312aeabf", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_9": { - "locked": { - "lastModified": 1632846328, - "narHash": "sha256-sFi6YtlGK30TBB9o6CW7LG9mYHkgtKeWbSLAjjrNTX0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2b71ddd869ad592510553d09fe89c9709fa26b2b", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" } }, "notifications-tray-icon": { "inputs": { - "flake-utils": "flake-utils_8", - "git-ignore-nix": "git-ignore-nix_7", - "nixpkgs": "nixpkgs_15" + "flake-utils": [ + "flake-utils" + ], + "git-ignore-nix": [ + "git-ignore-nix" + ], + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1627789093, @@ -1161,29 +259,41 @@ }, "original": { "owner": "IvanMalison", - "ref": "master", "repo": "notifications-tray-icon", "type": "github" } }, "root": { "inputs": { + "flake-utils": "flake-utils", + "git-ignore-nix": "git-ignore-nix", + "gtk-sni-tray": "gtk-sni-tray", + "gtk-strut": "gtk-strut", "home-manager": "home-manager", "imalison-taffybar": "imalison-taffybar", "nix": "nix", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_13", + "nixpkgs": "nixpkgs", + "nixpkgs-regression": "nixpkgs-regression_2", "notifications-tray-icon": "notifications-tray-icon", - "taffybar": "taffybar_2", - "xmonad": "xmonad_4", + "status-notifier-item": "status-notifier-item", + "systems": "systems", + "taffybar": "taffybar", + "xmonad": "xmonad", "xmonad-contrib": "xmonad-contrib" } }, "status-notifier-item": { "inputs": { - "flake-utils": "flake-utils_4", - "git-ignore-nix": "git-ignore-nix_3", - "nixpkgs": "nixpkgs_5" + "flake-utils": [ + "flake-utils" + ], + "git-ignore-nix": [ + "git-ignore-nix" + ], + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1641783528, @@ -1195,28 +305,6 @@ }, "original": { "owner": "taffybar", - "ref": "master", - "repo": "status-notifier-item", - "type": "github" - } - }, - "status-notifier-item_2": { - "inputs": { - "flake-utils": "flake-utils_11", - "git-ignore-nix": "git-ignore-nix_10", - "nixpkgs": "nixpkgs_20" - }, - "locked": { - "lastModified": 1641783528, - "narHash": "sha256-wJymJfYPFj4/r1e4kT/wt9FEsyCXo5JkkcOoozpuhag=", - "owner": "taffybar", - "repo": "status-notifier-item", - "rev": "f4f9c66ab57fc42eeed0de8cfac9f5f9d30d9dc7", - "type": "github" - }, - "original": { - "owner": "taffybar", - "ref": "master", "repo": "status-notifier-item", "type": "github" } @@ -1236,261 +324,26 @@ "type": "github" } }, - "systems_10": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_11": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_12": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_13": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_14": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_15": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_16": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "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" - } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_8": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_9": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "taffybar": { "inputs": { - "flake-utils": "flake-utils_2", - "git-ignore-nix": "git-ignore-nix", - "gtk-sni-tray": "gtk-sni-tray", - "gtk-strut": "gtk-strut", - "nixpkgs": "nixpkgs_8", - "xmonad": "xmonad" - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-JvoCkRmKzdJwoHL+m29W845eJmp4bRdlYiqUabHvzhY=", - "path": "./taffybar", - "type": "path" - }, - "original": { - "path": "./taffybar", - "type": "path" - } - }, - "taffybar_2": { - "inputs": { - "flake-utils": "flake-utils_9", - "git-ignore-nix": "git-ignore-nix_8", - "gtk-sni-tray": "gtk-sni-tray_2", - "gtk-strut": "gtk-strut_2", + "flake-utils": [ + "flake-utils" + ], + "git-ignore-nix": [ + "git-ignore-nix" + ], + "gtk-sni-tray": [ + "gtk-sni-tray" + ], + "gtk-strut": [ + "gtk-strut" + ], "nixpkgs": [ "nixpkgs" ], - "xmonad": "xmonad_3" + "xmonad": [ + "xmonad" + ] }, "locked": { "lastModified": 1, @@ -1504,70 +357,6 @@ } }, "unstable": { - "locked": { - "lastModified": 1685383865, - "narHash": "sha256-3uQytfnotO6QJv3r04ajSXbEFMII0dUtw0uqYlZ4dbk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5e871d8aa6f57cc8e0dc087d1c5013f6e212b4ce", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "unstable_2": { - "locked": { - "lastModified": 1686501370, - "narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "75a5ebf473cd60148ba9aec0d219f72e5cf52519", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "unstable_3": { - "locked": { - "lastModified": 1685383865, - "narHash": "sha256-3uQytfnotO6QJv3r04ajSXbEFMII0dUtw0uqYlZ4dbk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5e871d8aa6f57cc8e0dc087d1c5013f6e212b4ce", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "unstable_4": { - "locked": { - "lastModified": 1686501370, - "narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "75a5ebf473cd60148ba9aec0d219f72e5cf52519", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "unstable_5": { "locked": { "lastModified": 1686501370, "narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=", @@ -1585,103 +374,17 @@ }, "xmonad": { "inputs": { - "flake-utils": "flake-utils_6", - "git-ignore-nix": "git-ignore-nix_5", - "nixpkgs": "nixpkgs_10", + "flake-utils": [ + "flake-utils" + ], + "git-ignore-nix": [ + "git-ignore-nix" + ], + "nixpkgs": [ + "nixpkgs" + ], "unstable": "unstable" }, - "locked": { - "lastModified": 1685361967, - "narHash": "sha256-uF34C2uNieDM6C6NCMgdVydgy95w6OnVnmVaHZpIMsw=", - "owner": "xmonad", - "repo": "xmonad", - "rev": "b7a76a5e8cbd4dc08f054128afefc538adecffaa", - "type": "github" - }, - "original": { - "owner": "xmonad", - "ref": "master", - "repo": "xmonad", - "type": "github" - } - }, - "xmonad-contrib": { - "inputs": { - "flake-utils": "flake-utils_15", - "git-ignore-nix": "git-ignore-nix_14", - "nixpkgs": [ - "nixpkgs" - ], - "xmonad": "xmonad_5" - }, - "locked": { - "lastModified": 1665185073, - "narHash": "sha256-3/ey+wa4/oyIkChyZ20NWjjpXMMGWJbCnNj6AD3uJeU=", - "owner": "IvanMalison", - "repo": "xmonad-contrib", - "rev": "1a9330add34728cdaa16d00fb6c3bb8004634add", - "type": "github" - }, - "original": { - "owner": "IvanMalison", - "ref": "withMyChanges", - "repo": "xmonad-contrib", - "type": "github" - } - }, - "xmonad_2": { - "inputs": { - "flake-utils": "flake-utils_7", - "git-ignore-nix": "git-ignore-nix_6", - "nixpkgs": "nixpkgs_12", - "unstable": "unstable_2" - }, - "locked": { - "lastModified": 1685361967, - "narHash": "sha256-uF34C2uNieDM6C6NCMgdVydgy95w6OnVnmVaHZpIMsw=", - "owner": "xmonad", - "repo": "xmonad", - "rev": "b7a76a5e8cbd4dc08f054128afefc538adecffaa", - "type": "github" - }, - "original": { - "owner": "xmonad", - "ref": "master", - "repo": "xmonad", - "type": "github" - } - }, - "xmonad_3": { - "inputs": { - "flake-utils": "flake-utils_13", - "git-ignore-nix": "git-ignore-nix_12", - "nixpkgs": "nixpkgs_24", - "unstable": "unstable_3" - }, - "locked": { - "lastModified": 1685361967, - "narHash": "sha256-uF34C2uNieDM6C6NCMgdVydgy95w6OnVnmVaHZpIMsw=", - "owner": "xmonad", - "repo": "xmonad", - "rev": "b7a76a5e8cbd4dc08f054128afefc538adecffaa", - "type": "github" - }, - "original": { - "owner": "xmonad", - "ref": "master", - "repo": "xmonad", - "type": "github" - } - }, - "xmonad_4": { - "inputs": { - "flake-utils": "flake-utils_14", - "git-ignore-nix": "git-ignore-nix_13", - "nixpkgs": [ - "nixpkgs" - ], - "unstable": "unstable_4" - }, "locked": { "lastModified": 1, "narHash": "sha256-gyIoxSygmW/d29P45kq/V1LlLlJ8jkT2D7O0OtdPcSc=", @@ -1693,24 +396,33 @@ "type": "path" } }, - "xmonad_5": { + "xmonad-contrib": { "inputs": { - "flake-utils": "flake-utils_16", - "git-ignore-nix": "git-ignore-nix_15", - "nixpkgs": "nixpkgs_28", - "unstable": "unstable_5" + "flake-utils": [ + "flake-utils" + ], + "git-ignore-nix": [ + "git-ignore-nix" + ], + "nixpkgs": [ + "nixpkgs" + ], + "xmonad": [ + "xmonad" + ] }, "locked": { - "lastModified": 1685361967, - "narHash": "sha256-uF34C2uNieDM6C6NCMgdVydgy95w6OnVnmVaHZpIMsw=", - "owner": "xmonad", - "repo": "xmonad", - "rev": "b7a76a5e8cbd4dc08f054128afefc538adecffaa", + "lastModified": 1686731483, + "narHash": "sha256-gARNKrY2Eud5BlW8CyJVJ29owfNLZRF3Ov/QMGjCItc=", + "owner": "IvanMalison", + "repo": "xmonad-contrib", + "rev": "ac9bc49022ca7d1076d00ab87e7ecc45216117b8", "type": "github" }, "original": { - "owner": "xmonad", - "repo": "xmonad", + "owner": "IvanMalison", + "ref": "withMyChanges", + "repo": "xmonad-contrib", "type": "github" } } diff --git a/nixos/flake.nix b/nixos/flake.nix index f17b6179..fcd7c9fb 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -1,41 +1,116 @@ { inputs = { - nixos-hardware.url = github:NixOS/nixos-hardware; - nixpkgs = { - # url = github:IvanMalison/nixpkgs/my-unstable; - url = path:./nixpkgs; - }; + nixos-hardware = { url = github:NixOS/nixos-hardware; }; + + nixpkgs = { url = path:./nixpkgs; }; + home-manager = { - url = github:nix-community/home-manager/master; + url = github:nix-community/home-manager; inputs.nixpkgs.follows = "nixpkgs"; }; + xmonad-contrib = { url = github:IvanMalison/xmonad-contrib/withMyChanges; - inputs.nixpkgs.follows = "nixpkgs"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "flake-utils"; + git-ignore-nix.follows = "git-ignore-nix"; + xmonad.follows = "xmonad"; + }; }; + xmonad = { url = path:../dotfiles/config/xmonad/xmonad; - inputs.nixpkgs.follows = "nixpkgs"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "flake-utils"; + git-ignore-nix.follows = "git-ignore-nix"; + }; }; + taffybar = { url = path:../dotfiles/config/taffybar/taffybar; - inputs.nixpkgs.follows = "nixpkgs"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "flake-utils"; + git-ignore-nix.follows = "git-ignore-nix"; + xmonad.follows = "xmonad"; + gtk-sni-tray.follows = "gtk-sni-tray"; + gtk-strut.follows = "gtk-strut"; + }; }; + imalison-taffybar = { url = path:../dotfiles/config/taffybar; - inputs.nixpkgs.follows = "nixpkgs"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "flake-utils"; + git-ignore-nix.follows = "git-ignore-nix"; + xmonad.follows = "xmonad"; + gtk-sni-tray.follows = "gtk-sni-tray"; + gtk-strut.follows = "gtk-strut"; + taffybar.follows = "taffybar"; + }; }; + notifications-tray-icon = { - url = github:IvanMalison/notifications-tray-icon/master; - }; - nix = { - url = github:IvanMalison/nix/master; + url = github:IvanMalison/notifications-tray-icon; + inputs.flake-utils.follows = "flake-utils"; + inputs.git-ignore-nix.follows = "git-ignore-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; + + nix = { + url = github:IvanMalison/nix; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + flake-utils = { + url = github:numtide/flake-utils; + inputs.systems.follows = "systems"; + }; + + systems = { url = github:nix-systems/default; }; + + git-ignore-nix = { + url = github:hercules-ci/gitignore.nix; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + gtk-sni-tray = { + url = github:taffybar/gtk-sni-tray; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "flake-utils"; + git-ignore-nix.follows = "git-ignore-nix"; + status-notifier-item.follows = "status-notifier-item"; + }; + }; + + status-notifier-item = { + url = github:taffybar/status-notifier-item; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "flake-utils"; + git-ignore-nix.follows = "git-ignore-nix"; + }; + }; + + gtk-strut = { + url = github:taffybar/gtk-strut; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "flake-utils"; + git-ignore-nix.follows = "git-ignore-nix"; + }; + }; + + nixpkgs-regression = { url = github:NixOS/nixpkgs; }; }; + outputs = inputs@{ self, nixpkgs, nixos-hardware, home-manager, taffybar, xmonad, - xmonad-contrib, notifications-tray-icon, nix, imalison-taffybar, + xmonad-contrib, notifications-tray-icon, nix, imalison-taffybar, ... }: let mkConfig =