summaryrefslogtreecommitdiff
path: root/home
diff options
context:
space:
mode:
Diffstat (limited to 'home')
-rw-r--r--home/default.nix7
-rw-r--r--home/ebisu/fortune/desktop/waybar/default-modules.nix11
-rw-r--r--home/ebisu/fortune/system/fonts/default.nix4
3 files changed, 14 insertions, 8 deletions
diff --git a/home/default.nix b/home/default.nix
index 73b31fc..1cce9e0 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -17,7 +17,12 @@ in
pkgs =
((import ../lib/systems.nix { inherit lib systems; }) (
- system: import inputs.nixpkgs { inherit system; }
+ system:
+ import inputs.nixpkgs {
+ inherit system;
+
+ overlays = import ../lib/overlays.nix;
+ }
))."${builtins.currentSystem}";
in
inputs.home-manager.lib.homeManagerConfiguration {
diff --git a/home/ebisu/fortune/desktop/waybar/default-modules.nix b/home/ebisu/fortune/desktop/waybar/default-modules.nix
index f0bbb49..3d7d10b 100644
--- a/home/ebisu/fortune/desktop/waybar/default-modules.nix
+++ b/home/ebisu/fortune/desktop/waybar/default-modules.nix
@@ -1,7 +1,8 @@
-{ pkgs, secrets, ... }:
-let
- mediaplayer = pkgs.callPackage ../../../../../pkgs/mediaplayer { };
-in
+{
+ pkgs,
+ secrets,
+ ...
+}:
{
layer = "top";
position = "top";
@@ -138,7 +139,7 @@ in
};
escape = true;
- exec = "${mediaplayer}/bin/mediaplayer.py 2> /dev/null";
+ exec = "${pkgs.mediaplayer}/bin/mediaplayer.py 2> /dev/null";
on-click = "${pkgs.playerctl}/bin/playerctl play-pause";
on-scroll-up = "${pkgs.playerctl}/bin/playerctl next";
on-scroll-down = "${pkgs.playerctl}/bin/playerctl previous";
diff --git a/home/ebisu/fortune/system/fonts/default.nix b/home/ebisu/fortune/system/fonts/default.nix
index b75c161..30ab4ac 100644
--- a/home/ebisu/fortune/system/fonts/default.nix
+++ b/home/ebisu/fortune/system/fonts/default.nix
@@ -52,8 +52,8 @@
inter
font-awesome
joypixels
- (pkgs.callPackage ../../../../../pkgs/apple-fonts { })
- (pkgs.callPackage ../../../../../pkgs/hiragino-sans { })
+ pkgs.apple-fonts
+ pkgs.hiragino-sans
weather-icons
material-design-icons
meslo-lgs-nf