From 3ee4c41e37997602b9e393f1c10e356822dd187b Mon Sep 17 00:00:00 2001 From: Ivan Dimitrov Date: Sun, 21 Apr 2024 15:59:19 +0300 Subject: [PATCH] add swhkd overlay --- flake.lock | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++- flake.nix | 22 +++++++++++++------ 2 files changed, 77 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index d66a18b..f97d149 100644 --- a/flake.lock +++ b/flake.lock @@ -23,6 +23,28 @@ "type": "github" } }, + "fenix": { + "inputs": { + "nixpkgs": [ + "swhkd", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1713680591, + "narHash": "sha256-3pbv7UgAgetwz9YdjzIT/lZ6Rgj6wj6MR4mphBLyDjU=", + "owner": "nix-community", + "repo": "fenix", + "rev": "19aaa94a73cc670a4d87e84f0909966cd8f8cd79", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "flake-compat": { "locked": { "lastModified": 1696426674, @@ -361,7 +383,46 @@ "hosts": "hosts", "ide": "ide", "nid": "nid", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "swhkd": "swhkd" + } + }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1713628977, + "narHash": "sha256-iN5QUlUq527lswmBC+RopfXdu6Xx7mmTaBSH2l59FtM=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "55d9a533b309119c8acd13061581b43ae8840823", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, + "swhkd": { + "inputs": { + "fenix": "fenix", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1713698517, + "narHash": "sha256-2YwCSPvKXasQdcuupt1MlMVoBRXorICEd/4k8593N24=", + "owner": "ivandimitrov8080", + "repo": "swhkd", + "rev": "b1fa0b9a40d7ac90984971125954318f4c3479b8", + "type": "github" + }, + "original": { + "owner": "ivandimitrov8080", + "repo": "swhkd", + "type": "github" } }, "systems": { diff --git a/flake.nix b/flake.nix index f5548e8..c36bcab 100644 --- a/flake.nix +++ b/flake.nix @@ -13,23 +13,31 @@ url = "github:ivandimitrov8080/flake-ide"; inputs.nixpkgs.follows = "nixpkgs"; }; + swhkd = { + url = "github:ivandimitrov8080/swhkd"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nid = { url = "github:nix-community/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { self, nixpkgs, home-manager, hosts, ide, nid, ... }: + outputs = { self, nixpkgs, home-manager, hosts, ide, swhkd, nid, ... }: let system = "x86_64-linux"; - my-overlay = self: super: { - scripts = (super.buildEnv { name = "scripts"; paths = [ ./. ]; }); - }; + overlays = [ + ( + self: super: { + scripts = (super.buildEnv { name = "scripts"; paths = [ ./. ]; }); + swhkd = swhkd.overlays.${system}.default; + } + ) + ]; pkgs = import nixpkgs { - inherit system; - overlays = [ my-overlay ]; + inherit system overlays; }; modules = import ./modules { - inherit system nixpkgs pkgs ide my-overlay; + inherit system nixpkgs pkgs ide; }; home = import ./home { inherit system pkgs modules home-manager nid;