diff --git a/flake.lock b/flake.lock index 2cbbbfed..ee77dc28 100644 --- a/flake.lock +++ b/flake.lock @@ -136,22 +136,6 @@ "type": "github" } }, - "fork": { - "locked": { - "lastModified": 1702682961, - "narHash": "sha256-7kMYxggXgGgGcAY2Nqb0Ydk3hXXfgEqPwI7OezuxdnU=", - "owner": "teutat3s", - "repo": "nixpkgs", - "rev": "8347def627f8a5a7405adf9f477f7092c62ac356", - "type": "github" - }, - "original": { - "owner": "teutat3s", - "ref": "signal-desktop-6.42", - "repo": "nixpkgs", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -159,11 +143,11 @@ ] }, "locked": { - "lastModified": 1702676849, - "narHash": "sha256-XqcREaTS38/QOsN8fk8PP325/UXHyF9enbP5ZPw5aiA=", + "lastModified": 1702814678, + "narHash": "sha256-zDtO0jV2QLoddUJinLlTQrQqCUW3dPiIWOSYgg98T7E=", "owner": "nix-community", "repo": "home-manager", - "rev": "aa99c2f4e9847cbb7e46fac0844ea1eb164b3b3a", + "rev": "1488651d02c1a7a15e284210f0d380a62d8d8cef", "type": "github" }, "original": { @@ -175,11 +159,11 @@ }, "master": { "locked": { - "lastModified": 1702681572, - "narHash": "sha256-DYgw0mBT34Ko51U1FfHpS4yDFuWeGoz+rarAKNnsH8A=", + "lastModified": 1702849480, + "narHash": "sha256-zksC+KERpS5yUlc3zNtrBfdXTJF3/GumTz5hlDyVwm4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "386647bebf6b1430c783790a513a51769f478252", + "rev": "8e9d4495c78515277aa43d579610ef3750f59e2c", "type": "github" }, "original": { @@ -258,11 +242,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702346276, - "narHash": "sha256-eAQgwIWApFQ40ipeOjVSoK4TEHVd6nbSd9fApiHIw5A=", + "lastModified": 1702645756, + "narHash": "sha256-qKI6OR3TYJYQB3Q8mAZ+DG4o/BR9ptcv9UnRV2hzljc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7", + "rev": "40c3c94c241286dd2243ea34d3aef8a488f9e4d0", "type": "github" }, "original": { @@ -312,7 +296,6 @@ "deploy-rs": "deploy-rs", "flake-compat": "flake-compat", "flake-parts": "flake-parts", - "fork": "fork", "home-manager": "home-manager", "master": "master", "nix-darwin": "nix-darwin", diff --git a/flake.nix b/flake.nix index 62356068..4fccb045 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,7 @@ unstable.url = "github:nixos/nixpkgs/nixos-unstable"; master.url = "github:nixos/nixpkgs/master"; - fork.url = "github:teutat3s/nixpkgs/signal-desktop-6.42"; + #fork.url = "github:teutat3s/nixpkgs/signal-desktop-6.42"; flake-compat.url = "github:edolstra/flake-compat"; flake-compat.flake = false; diff --git a/overlays/default.nix b/overlays/default.nix index e1fc4536..0014219a 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -24,16 +24,13 @@ "slack" ]; }; - fork = import inputs.fork { - system = prev.system; - }; in { direnv = unstable.direnv; nix-direnv = unstable.nix-direnv; qMasterPassword-wayland = master.qMasterPassword-wayland; slack = master.slack; - signal-desktop = fork.signal-desktop; + signal-desktop = master.signal-desktop; #vimPlugins = prev.vimPlugins // {inherit (unstable.vimPlugins) nvim-lspconfig;}; }) (import ../pkgs)