nyancat/flake
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

treewide: use lib.getExe

Browse source
This commit is contained in:
Guanran Wang 2023-12-16 22:48:27 +08:00
parent 5746458b7a
commit b3ed736c15
Signed by: nyancat
SSH key fingerprint: SHA256:8oWGKciPALWut/6WA27oFKofX+6Wtc0gQnsefXLQx/8
5 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/profiles/opt-in/gaming.nix
View file

@ -8,8 +8,8 @@
programs.gamemode = { programs.gamemode = {
enable = true; enable = true;
settings.custom = { settings.custom = {
start = "${pkgs.libnotify}/bin/notify-send 'GameMode Activated' 'GameMode Activated! Enjoy enhanced performance. 🚀'"; start = "${lib.getExe pkgs.libnotify} 'GameMode Activated' 'GameMode Activated! Enjoy enhanced performance. 🚀'";
end = "${pkgs.libnotify}/bin/notify-send 'GameMode Deactivated' 'GameMode Deactivated. Back to normal mode. ⏹️'"; end = "${lib.getExe pkgs.libnotify} 'GameMode Deactivated' 'GameMode Deactivated. Back to normal mode. ⏹️'";
}; };
}; };

8
users/guanranwang/home-manager/applications/rofi/default.nix
View file

@ -1,9 +1,13 @@
{pkgs, ...}: { {
pkgs,
lib,
...
}: {
programs.rofi = { programs.rofi = {
enable = true; enable = true;
package = pkgs.rofi-wayland; package = pkgs.rofi-wayland;
font = "monospace"; font = "monospace";
terminal = "${pkgs.alacritty}/bin/alacritty"; terminal = lib.getExe pkgs.alacritty;
}; };
home.packages = with pkgs; [rofi-power-menu]; home.packages = with pkgs; [rofi-power-menu];

20
users/guanranwang/home-manager/applications/sway/default.nix
View file

@ -47,14 +47,14 @@
systemd.xdgAutostart = true; systemd.xdgAutostart = true;
config = { config = {
### Default Applications ### Default Applications
terminal = "${pkgs.alacritty}/bin/alacritty"; terminal = lib.getExe pkgs.alacritty;
menu = "${pkgs.rofi}/bin/rofi"; menu = lib.getExe config.programs.rofi.package;
### Visuals ### Visuals
#window.titlebar = false; #window.titlebar = false;
bars = [ bars = [
{ {
command = "${pkgs.waybar}/bin/waybar"; command = lib.getExe pkgs.waybar;
} }
#{ #{
# statusCommand = "${lib.getExe pkgs.i3status-rust} $HOME/.config/i3status-rust/config-default.toml"; # statusCommand = "${lib.getExe pkgs.i3status-rust} $HOME/.config/i3status-rust/config-default.toml";
@ -143,7 +143,7 @@
# Rofi # Rofi
"${modifier}+d" = "exec ${menu} -show drun -show-icons -icon-theme ${config.gtk.iconTheme.name}"; "${modifier}+d" = "exec ${menu} -show drun -show-icons -icon-theme ${config.gtk.iconTheme.name}";
"${modifier}+Shift+d" = "exec ${pkgs.cliphist}/bin/cliphist list | ${menu} -dmenu | ${pkgs.cliphist}/bin/cliphist decode | ${pkgs.wl-clipboard}/bin/wl-copy"; "${modifier}+Shift+d" = "exec ${lib.getExe pkgs.cliphist} list | ${menu} -dmenu | ${lib.getExe pkgs.cliphist} decode | ${pkgs.wl-clipboard}/bin/wl-copy";
"${modifier}+Shift+l" = ''exec ${menu} -modi "power-menu:rofi-power-menu --confirm=reboot/shutdown" -show power-menu''; "${modifier}+Shift+l" = ''exec ${menu} -modi "power-menu:rofi-power-menu --confirm=reboot/shutdown" -show power-menu'';
# Screenshot # Screenshot
@ -157,12 +157,12 @@
"XF86AudioRaiseVolume" = "exec ${setVolume} up"; "XF86AudioRaiseVolume" = "exec ${setVolume} up";
"XF86AudioLowerVolume" = "exec ${setVolume} down"; "XF86AudioLowerVolume" = "exec ${setVolume} down";
"XF86AudioMute" = "exec ${setVolume} mute"; "XF86AudioMute" = "exec ${setVolume} mute";
"XF86AudioPlay" = "exec ${pkgs.playerctl}/bin/playerctl play-pause"; "XF86AudioPlay" = "exec ${lib.getExe pkgs.playerctl} play-pause";
"XF86AudioPause" = "exec ${pkgs.playerctl}/bin/playerctl play-pause"; "XF86AudioPause" = "exec ${lib.getExe pkgs.playerctl} play-pause";
"XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous"; "XF86AudioPrev" = "exec ${lib.getExe pkgs.playerctl} previous";
"XF86AudioNext" = "exec ${pkgs.playerctl}/bin/playerctl next"; "XF86AudioNext" = "exec ${lib.getExe pkgs.playerctl} next";
"XF86AudioStop" = "exec ${pkgs.playerctl}/bin/playerctl stop"; "XF86AudioStop" = "exec ${lib.getExe pkgs.playerctl} stop";
"XF86AudioMedia" = "exec ${pkgs.playerctl}/bin/playerctl play-pause"; "XF86AudioMedia" = "exec ${lib.getExe pkgs.playerctl} play-pause";
}; };
}; };
}; };

2
users/guanranwang/home-manager/applications/swayidle/default.nix
View file

@ -17,7 +17,7 @@
timeouts = [ timeouts = [
{ {
timeout = 60 * 9; timeout = 60 * 9;
command = ''${pkgs.libnotify}/bin/notify-send -u critical --expire-time 60000 "60 seconds until lock!"''; command = ''${lib.getExe pkgs.libnotify} -u critical --expire-time 60000 "60 seconds until lock!"'';
} }
{ {
timeout = 60 * 10; timeout = 60 * 10;

3
users/guanranwang/nixos/profiles/opt-in/clash-meta-client.nix
View file

@ -2,6 +2,7 @@
pkgs, pkgs,
config, config,
inputs, inputs,
lib,
... ...
}: { }: {
### sops-nix ### sops-nix
@ -34,7 +35,7 @@
WorkingDirectory = "/etc/clash-meta"; WorkingDirectory = "/etc/clash-meta";
User = [config.users.users."clash-meta".name]; User = [config.users.users."clash-meta".name];
Group = [config.users.groups."clash-meta".name]; Group = [config.users.groups."clash-meta".name];
ExecStart = "${pkgs.clash-meta}/bin/clash-meta -d /etc/clash-meta"; ExecStart = "${lib.getExe pkgs.clash-meta} -d /etc/clash-meta";
Restart = "on-failure"; Restart = "on-failure";
CapabilityBoundingSet = [ CapabilityBoundingSet = [
"CAP_NET_ADMIN" "CAP_NET_ADMIN"