rouven.seifert/nixos-config
1
1
Fork 0
mirror of https://git.sr.ht/~rouven/nixos-config synced 2025-04-25 16:08:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

nixpkgs deprecated lib.getExe on packages without a mainprogram

Browse source
This commit is contained in:
Rouven Seifert 2023-08-03 13:30:40 +02:00
parent 816f6fc3bd
commit 741ebd293d
Signed by: rouven.seifert
GPG key ID: B95E8FE6B11C4D09
14 changed files with 34 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
users/rouven/modules/foot/default.nix
View file

@ -8,7 +8,7 @@
server.enable = true;
settings = rec {
main = {
shell = lib.getExe pkgs.zsh;
shell = "${pkgs.zsh}/bin/zsh";
dpi-aware = "yes";
font = "monospace:family=Iosevka Nerd Font, size=8";
notify = "${lib.getExe pkgs.libnotify} -a \${app-id} -i \${app-id} \${title} \${body}";

6
users/rouven/modules/git/default.nix
View file

@ -1,12 +1,12 @@
{ pkgs, lib, ... }:
{ pkgs, ... }:
{
programs.git = {
enable = true;
userName = "Rouven Seifert";
userEmail = "rouven@rfive.de";
extraConfig = {
core.pager = lib.getExe pkgs.delta;
interactive.diffFilter = "${lib.getExe pkgs.delta} --color-only";
core.pager = "${pkgs.delta}/bin/delta";
interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only";
delta = {
navigate = true;
light = false;

2
users/rouven/modules/wayland/default.nix
View file

@ -58,7 +58,7 @@
icon-theme=${config.gtk.iconTheme.name}
show-actions=yes
width=80
terminal=${lib.getExe pkgs.foot}
terminal=${pkgs.foot}/bin/foot
[colors]
background=${config.colorScheme.colors.base00}ff

15
users/rouven/modules/wayland/river.nix
View file

@ -1,4 +1,4 @@
{ pkgs, lib, ... }:
{ pkgs, ... }:
{
home.packages = with pkgs; [
river
@ -25,7 +25,7 @@
riverctl input pointer-2-7-SynPS/2_Synaptics_TouchPad drag enabled
riverctl input pointer-2-7-SynPS/2_Synaptics_TouchPad middle-emulation enabled
riverctl spawn "${lib.getExe pkgs.swaybg} -i ${../../../../images/wallpaper.png}"
riverctl spawn "${pkgs.swaybg}/bin/swaybg -i ${../../../../images/wallpaper.png}"
riverctl map normal Super Return spawn footclient
riverctl map normal Super+Shift Return zoom
@ -48,7 +48,7 @@
riverctl map-pointer normal Super BTN_RIGHT resize-view
riverctl map normal Alt Space spawn ${lib.getExe pkgs.fuzzel}
riverctl map normal Alt Space spawn ${pkgs.fuzzel}/bin/fuzzel
riverctl map normal Super Space toggle-float
for i in $(seq 1 9)
@ -68,10 +68,10 @@
riverctl map normal Super+Shift+Control $i toggle-view-tags $tags
done
riverctl map normal None Print spawn "${lib.getExe pkgs.sway-contrib.grimshot} copy area"
riverctl map normal None XF86Launch2 spawn "${lib.getExe pkgs.sway-contrib.grimshot} save area - | ${lib.getExe pkgs.swappy} -f -"
riverctl map normal None XF86MonBrightnessUp spawn "${lib.getExe pkgs.light} -A 10"
riverctl map normal None XF86MonBrightnessDown spawn "${lib.getExe pkgs.light} -U 10"
riverctl map normal None Print spawn "${pkgs.sway-contrib.grimshot}/bin/grimshot copy area"
riverctl map normal None XF86Launch2 spawn "${pkgs.sway-contrib.grimshot}/bin/grimshot save area - | ${pkgs.swappy}/bin/swappy -f -"
riverctl map normal None XF86MonBrightnessUp spawn "${pkgs.light}/bin/light -A 10"
riverctl map normal None XF86MonBrightnessDown spawn "${pkgs.light}/bin/light -U 10"
riverctl map normal None XF86AudioMute spawn "${pkgs.pulseaudio}/bin/pactl set-sink-mute @DEFAULT_SINK@ toggle"
riverctl map normal None XF86AudioMicMute spawn "${pkgs.pulseaudio}/bin/pactl set-source-mute @DEFAULT_SOURCE@ toggle"
riverctl map normal None XF86AudioRaiseVolume spawn "${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ +5%"
@ -79,7 +79,6 @@
riverctl map normal Shift XF86AudioRaiseVolume spawn "${pkgs.pulseaudio}/bin/pactl set-source-volume @DEFAULT_SOURCE@ +5%"
riverctl map normal Shift XF86AudioLowerVolume spawn "${pkgs.pulseaudio}/bin/pactl set-source-volume @DEFAULT_SOURCE@ -5%"
riverctl map normal None XF86Favorites spawn "${pkgs.systemd}/bin/loginctl lock-session"
# riverctl map normal None XF86PowerOff spawn "${lib.getExe pkgs.wlogout}"
riverctl map normal None XF86Messenger spawn "${pkgs.swaynotificationcenter}/bin/swaync-client --toggle-panel"
riverctl map normal None Cancel spawn "${pkgs.swaynotificationcenter}/bin/swaync-client --hide-latest"
riverctl map normal Shift Cancel spawn "${pkgs.swaynotificationcenter}/bin/swaync-client --cloes-all"

10
users/rouven/modules/wayland/sway.nix
View file

@ -35,10 +35,10 @@
keybindings =
lib.mkOptionDefault {
"Mod1+space" = "exec ${menu}";
"Print" = "exec ${lib.getExe pkgs.sway-contrib.grimshot} copy area";
"XF86Launch2" = "exec ${lib.getExe pkgs.sway-contrib.grimshot} save area - | ${lib.getExe pkgs.swappy} -f -";
"XF86MonBrightnessUp" = "exec ${lib.getExe pkgs.light} -A 10";
"XF86MonBrightnessDown" = "exec ${lib.getExe pkgs.light} -U 10";
"Print" = "exec ${pkgs.sway-contrib.grimshot}/bin/grimshot copy area";
"XF86Launch2" = "exec ${pkgs.sway-contrib.grimshot}/bin/grimshot save area - | ${lib.getExe pkgs.swappy} -f -";
"XF86MonBrightnessUp" = "exec ${pkgs.light}/bin/light -A 10";
"XF86MonBrightnessDown" = "exec ${kgs.light}/bin/light -U 10";
"XF86AudioMute" = "exec ${pkgs.pulseaudio}/bin/pactl set-sink-mute @DEFAULT_SINK@ toggle";
"XF86AudioMicMute" = "exec ${pkgs.pulseaudio}/bin/pactl set-source-mute @DEFAULT_SOURCE@ toggle";
"XF86AudioRaiseVolume" = "exec ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ +5%";
@ -47,7 +47,7 @@
"Shift+XF86AudioLowerVolume" = "exec ${pkgs.pulseaudio}/bin/pactl set-source-volume @DEFAULT_SOURCE@ -5%";
"XF86Favorites" = "exec ${pkgs.systemd}/bin/loginctl lock-session";
"XF86PowerOff" = "exec ${lib.getExe pkgs.wlogout}";
"XF86PowerOff" = "exec ${pkgs.wlogout}/bin/wlogout";
"XF86Messenger" = "exec ${pkgs.swaynotificationcenter}/bin/swaync-client --toggle-panel";
"Cancel" = "exec ${pkgs.swaynotificationcenter}/bin/swaync-client --hide-latest";

2
users/rouven/options/shikane.nix
View file

@ -71,7 +71,7 @@ in
PartOf = [ "graphical-session.target" ];
};
Service = { ExecStart = getExe cfg.package; };
Service = { ExecStart = "${cfg.package}/bin/shikane"; };
Install = { WantedBy = [ "graphical-session.target" ]; };
};