diff --git a/overlays/default.nix b/overlays/default.nix deleted file mode 100644 index 2c5a6af..0000000 --- a/overlays/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -[ - (import ./pass.nix) -] diff --git a/overlays/pass.nix b/overlays/pass.nix deleted file mode 100644 index 353720f..0000000 --- a/overlays/pass.nix +++ /dev/null @@ -1,5 +0,0 @@ -final: prev: { - pass-minimal = prev.pass.override { - dmenuSupport = false; - }; -} diff --git a/users/jan/default.nix b/users/jan/default.nix index 8ecdc7d..1b53bf1 100644 --- a/users/jan/default.nix +++ b/users/jan/default.nix @@ -1,16 +1,15 @@ { config, pkgs, lib, inputs, extraHomeModule ? null, ... }: { - nixpkgs.overlays = lib.mkMerge [ - (lib.mkBefore (import ../../overlays)) - (lib.mkAfter [ - inputs.wired.overlays.default - inputs.myneovim.overlays.default - inputs.vnetod.overlay - inputs.nil.overlays.default - ]) + nixpkgs.overlays = lib.mkAfter [ + inputs.wired.overlays.default + inputs.myneovim.overlays.default + inputs.vnetod.overlay + inputs.nil.overlays.default ]; + programs.zsh.enable = true; + users.users.jan = { isNormalUser = true; extraGroups = [ diff --git a/users/modules/pass.nix b/users/modules/pass.nix index 4926491..a9c9af7 100644 --- a/users/modules/pass.nix +++ b/users/modules/pass.nix @@ -3,7 +3,7 @@ let passDataDir = "${config.xdg.dataHome}/pass"; - myPassPackage = pkgs.pass-minimal.withExtensions (ext: [ + myPassPackage = pkgs.pass.withExtensions (ext: [ ext.pass-audit ]); in