diff --git a/flake.nix b/flake.nix index f2ef071..e6af884 100644 --- a/flake.nix +++ b/flake.nix @@ -55,7 +55,7 @@ home-manager.useUserPackages = true; home-manager.users.james = import ./home.nix; } - { nixpkgs.overlays = [ nur.overlay ]; } + { nixpkgs.overlays = [ nur.overlay (import ./pkgs) ]; } ]; system = "x86_64-linux"; }; diff --git a/modules/applications/sway/sway.nix b/modules/applications/sway/sway.nix index bbd84fb..86f1ace 100644 --- a/modules/applications/sway/sway.nix +++ b/modules/applications/sway/sway.nix @@ -9,10 +9,6 @@ let sha256 = "sha256-fYMzoY3un4qGOSR4DMqVUAFmGGil+wUze31rLLrjcAc="; }; - brightness-sh = pkgs.callPackage ./scripts/brightness.nix { inherit pkgs; }; - sway-entry = pkgs.callPackage ./scripts/sway-entry.nix { inherit pkgs; }; - volume-sh = pkgs.callPackage ./scripts/volume.nix { inherit pkgs; }; - scripts = [ brightness-sh sway-entry volume-sh ]; in with lib; { options = { this.application.sway.enable = mkOption { @@ -97,12 +93,13 @@ in with lib; { "${modifier}+space" = "exec $(${pkgs.dmenu}/bin/dmenu_path | ${pkgs.dmenu}/bin/dmenu)"; Pause = "exec ${pkgs.playerctl}/bin/playerctl play-pause"; - XF86AudioLowerVolume = "exec ${volume-sh}/bin/volume.sh down"; - XF86AudioMute = "exec ${volume-sh}/bin/volume.sh mute"; - XF86AudioRaiseVolume = "exec ${volume-sh}/bin/volume.sh up"; + XF86AudioLowerVolume = "exec ${pkgs.volume-sh}/bin/volume.sh down"; + XF86AudioMute = "exec ${pkgs.volume-sh}/bin/volume.sh mute"; + XF86AudioRaiseVolume = "exec ${pkgs.volume-sh}/bin/volume.sh up"; XF86MonBrightnessDown = - "exec ${brightness-sh}/bin/brightness.sh down"; - XF86MonBrightnessUp = "exec ${brightness-sh}/bin/brightness.sh up"; + "exec ${pkgs.brightness-sh}/bin/brightness.sh down"; + XF86MonBrightnessUp = + "exec ${pkgs.brightness-sh}/bin/brightness.sh up"; }; # https://github.com/gytis-ivaskevicius/nixfiles/blob/master/home-manager/i3-sway.nix modifier = "Mod4"; @@ -114,19 +111,21 @@ in with lib; { }; }; - home.packages = with pkgs; - [ - autotiling - dmenu - grim - imagemagick - slurp - swayidle - swaylock - playerctl - wl-clipboard - wofi - ] ++ scripts; + home.packages = with pkgs; [ + autotiling + brightness-sh + dmenu + grim + imagemagick + playerctl + slurp + sway-entry + swayidle + swaylock + volume-sh + wl-clipboard + wofi + ]; }; programs.light.enable = true; diff --git a/modules/applications/sway/scripts/brightness.nix b/pkgs/brightness.nix similarity index 100% rename from modules/applications/sway/scripts/brightness.nix rename to pkgs/brightness.nix diff --git a/pkgs/default.nix b/pkgs/default.nix new file mode 100644 index 0000000..56ac11e --- /dev/null +++ b/pkgs/default.nix @@ -0,0 +1,5 @@ +self: super: { + brightness-sh = super.callPackage ./brightness.nix { inherit super; }; + sway-entry = super.callPackage ./sway-entry.nix { inherit super; }; + volume-sh = super.callPackage ./volume.nix { inherit super; }; +} diff --git a/modules/applications/sway/scripts/sway-entry.nix b/pkgs/sway-entry.nix similarity index 100% rename from modules/applications/sway/scripts/sway-entry.nix rename to pkgs/sway-entry.nix diff --git a/modules/applications/sway/scripts/volume.nix b/pkgs/volume.nix similarity index 100% rename from modules/applications/sway/scripts/volume.nix rename to pkgs/volume.nix