diff options
Diffstat (limited to '')
| -rw-r--r-- | configuration.nix | 1 | ||||
| m--------- | external/nvim/config | 0 | ||||
| -rw-r--r-- | overlays/default.nix | 9 | ||||
| -rw-r--r-- | overlays/neovim.nix (renamed from external/nvim/neovim.nix) | 0 | ||||
| -rw-r--r-- | overlays/pass.nix | 8 | ||||
| -rw-r--r-- | overlays/qutebrowser.nix (renamed from external/qutebrowser/overlay.nix) | 0 | ||||
| -rw-r--r-- | packages.nix | 10 |
7 files changed, 18 insertions, 10 deletions
diff --git a/configuration.nix b/configuration.nix index 1270a75..27759b2 100644 --- a/configuration.nix +++ b/configuration.nix @@ -11,6 +11,7 @@ in { <home-manager/nixos> ./hardware-configuration.nix ./packages.nix + ./overlays/default.nix ./login.nix ]; diff --git a/external/nvim/config b/external/nvim/config deleted file mode 160000 -Subproject 1e0bc1f27c4290a873ec930b14cc22525f2e30e diff --git a/overlays/default.nix b/overlays/default.nix new file mode 100644 index 0000000..b806fa9 --- /dev/null +++ b/overlays/default.nix @@ -0,0 +1,9 @@ +{ pkgs, ... }: +{ + # Overlays + nixpkgs.overlays = [ + (import ./neovim.nix) + (import ./qutebrowser.nix) + (import ./pass.nix) + ]; +} diff --git a/external/nvim/neovim.nix b/overlays/neovim.nix index 172ed0c..172ed0c 100644 --- a/external/nvim/neovim.nix +++ b/overlays/neovim.nix diff --git a/overlays/pass.nix b/overlays/pass.nix new file mode 100644 index 0000000..0d79267 --- /dev/null +++ b/overlays/pass.nix @@ -0,0 +1,8 @@ +self: super: +let + localPkgs = import ../packages/default.nix { pkgs = super.pkgs; }; +in { + pass = super.pass.override { + dmenu = localPkgs.dmenu; + }; +} diff --git a/external/qutebrowser/overlay.nix b/overlays/qutebrowser.nix index 67192f6..67192f6 100644 --- a/external/qutebrowser/overlay.nix +++ b/overlays/qutebrowser.nix diff --git a/packages.nix b/packages.nix index 01da646..bbabcbc 100644 --- a/packages.nix +++ b/packages.nix @@ -79,16 +79,6 @@ let xclip ]; in { - - # Overlays - nixpkgs.overlays = [ - (import ./external/nvim/neovim.nix) - (import ./external/qutebrowser/overlay.nix) - (self: super: { - pass = super.pass.override { dmenu = localPkgs.dmenu; }; - }) - ]; - # Packages environment.systemPackages = devPackages ++ customPackages ++ apps ++ utils; |