diff --git a/flake.lock b/flake.lock index ee77dc28..23399c40 100644 --- a/flake.lock +++ b/flake.lock @@ -159,11 +159,11 @@ }, "master": { "locked": { - "lastModified": 1702849480, - "narHash": "sha256-zksC+KERpS5yUlc3zNtrBfdXTJF3/GumTz5hlDyVwm4=", + "lastModified": 1703005342, + "narHash": "sha256-0bnxGLEg/0MLfRJ+CEip23i/nO34+nQddRA7g5EYF+Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8e9d4495c78515277aa43d579610ef3750f59e2c", + "rev": "3b0e747000d10e26eaab44e2958bea2ee28c6de6", "type": "github" }, "original": { @@ -242,11 +242,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702645756, - "narHash": "sha256-qKI6OR3TYJYQB3Q8mAZ+DG4o/BR9ptcv9UnRV2hzljc=", + "lastModified": 1702780907, + "narHash": "sha256-blbrBBXjjZt6OKTcYX1jpe9SRof2P9ZYWPzq22tzXAA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "40c3c94c241286dd2243ea34d3aef8a488f9e4d0", + "rev": "1e2e384c5b7c50dbf8e9c441a9e58d85f408b01f", "type": "github" }, "original": { @@ -402,11 +402,11 @@ }, "unstable": { "locked": { - "lastModified": 1702312524, - "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", + "lastModified": 1702830618, + "narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a9bf124c46ef298113270b1f84a164865987a91c", + "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835", "type": "github" }, "original": { diff --git a/overlays/default.nix b/overlays/default.nix index 0014219a..7c5cbe0d 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -11,30 +11,26 @@ (final: prev: let unstable = import inputs.unstable { - system = prev.system; - #config.allowUnfreePredicate = pkg: builtins.elem (prev.lib.getName pkg) [ - # "1password-cli" - # "1password" - # "slack" - #]; - }; - master = import inputs.master { system = prev.system; config.allowUnfreePredicate = pkg: builtins.elem (prev.lib.getName pkg) [ "slack" ]; }; + master = import inputs.master { + system = prev.system; + }; in { direnv = unstable.direnv; nix-direnv = unstable.nix-direnv; - qMasterPassword-wayland = master.qMasterPassword-wayland; - slack = master.slack; - signal-desktop = master.signal-desktop; + qMasterPassword-wayland = unstable.qMasterPassword-wayland; + slack = unstable.slack; + signal-desktop = unstable.signal-desktop; #vimPlugins = prev.vimPlugins // {inherit (unstable.vimPlugins) nvim-lspconfig;}; }) (import ../pkgs) (import ./blesh.nix) + (import ./element-desktop.nix) (import ./mdbook-multilang.nix inputs) (import ./nix-index.nix) (import ./prr.nix) diff --git a/overlays/element-desktop.nix b/overlays/element-desktop.nix new file mode 100644 index 00000000..c6c39c73 --- /dev/null +++ b/overlays/element-desktop.nix @@ -0,0 +1,3 @@ +final: prev: { + element-desktop = prev.element-desktop.override { electron = prev.electron_28; }; +}