mirror of
https://github.com/Misterio77/Foundry.git
synced 2026-09-24 15:19:43 -05:00
home/wms: embed required wm packages instead of adding them to environment
This commit is contained in:
Gabriel Fontes
@@ -19,7 +19,11 @@
|
||||
wf-recorder
|
||||
wl-clipboard
|
||||
wl-mirror
|
||||
wl-mirror-pick
|
||||
ydotool
|
||||
primary-xwayland
|
||||
pulseaudio
|
||||
lyrics
|
||||
];
|
||||
|
||||
home.sessionVariables = {
|
||||
|
||||
@@ -1,24 +1,14 @@
|
||||
{ lib, config, pkgs, ... }:
|
||||
{ lib, config, pkgs, mylib, features, ... }:
|
||||
let
|
||||
inherit (lib) optionalString;
|
||||
trusted = mylib.has "trusted" features;
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
../common
|
||||
../common/wayland-wm
|
||||
];
|
||||
|
||||
home.packages = with pkgs; [
|
||||
hyprland
|
||||
mako
|
||||
primary-xwayland
|
||||
sway-contrib.grimshot
|
||||
pulseaudio
|
||||
light
|
||||
swaybg
|
||||
swayidle
|
||||
swaylock-effects
|
||||
lyrics
|
||||
];
|
||||
|
||||
|
||||
wayland.windowManager.hyprland =
|
||||
let
|
||||
inherit (config.colorscheme) colors;
|
||||
@@ -78,11 +68,12 @@
|
||||
}
|
||||
|
||||
# Startup
|
||||
exec-once=swaylock -i ${config.wallpaper}
|
||||
exec-once=${pkgs.swaylock-effects}/bin/swaylock -i ${config.wallpaper}
|
||||
exec-once=waybar
|
||||
exec=swaybg -i ${config.wallpaper} --mode fill
|
||||
exec-once=mako
|
||||
exec-once=swayidle -w
|
||||
exec=${pkgs.swaybg}/bin/swaybg -i ${config.wallpaper} --mode fill
|
||||
exec-once=${pkgs.mako}/bin/mako
|
||||
exec-once=${pkgs.swayidle}/bin/swayidle -w
|
||||
exec-once=${pkgs.primary-xwayland}/bin/primary-xwayland largest
|
||||
|
||||
# Program bindings
|
||||
bind=SUPER,Return,exec,${terminal.cmd}
|
||||
@@ -93,41 +84,41 @@
|
||||
|
||||
bind=SUPER,x,exec,${menu.drun-cmd}
|
||||
bind=SUPER,d,exec,${menu.run-cmd}
|
||||
bind=,Scroll_Lock,exec,${menu.password-cmd} # fn+k
|
||||
bind=,XF86Calculator,exec,${menu.password-cmd} # fn+f12
|
||||
${optionalString trusted "bind=,Scroll_Lock,exec,${menu.password-cmd} # fn+k"}
|
||||
${optionalString trusted "bind=,XF86Calculator,exec,${menu.password-cmd} # fn+f12"}
|
||||
|
||||
# Toggle waybar
|
||||
bind=,XF86Tools,exec,${pkgs.procps}/bin/pkill -USR1 waybar # profile button
|
||||
|
||||
# Lock screen
|
||||
bind=,XF86Launch5,exec,swaylock -S
|
||||
bind=,XF86Launch4,exec,swaylock -S
|
||||
bind=,XF86Launch5,exec,${pkgs.swaylock}/bin/swaylock -S
|
||||
bind=,XF86Launch4,exec,${pkgs.swaylock}/bin/swaylock -S
|
||||
|
||||
# Screenshots
|
||||
bind=,Print,exec,grimshot --notify copy output
|
||||
bind=SHIFT,Print,exec,grimshot --notify copy active
|
||||
bind=CONTROL,Print,exec,grimshot --notify copy screen
|
||||
bind=ALT,Print,exec,grimshot --notify copy area
|
||||
bind=SUPERSHIFT,S,exec,grimshot --notify copy area # fn+print on pleione
|
||||
bind=SUPER,Print,exec,grimshot --notify copy window
|
||||
bind=,Print,exec,${pkgs.sway-contrib.grimshot}/bin/grimshot --notify copy output
|
||||
bind=SHIFT,Print,exec,${pkgs.sway-contrib.grimshot}/bin/grimshot --notify copy active
|
||||
bind=CONTROL,Print,exec,${pkgs.sway-contrib.grimshot}/bin/grimshot --notify copy screen
|
||||
bind=ALT,Print,exec,${pkgs.sway-contrib.grimshot}/bin/grimshot --notify copy area
|
||||
bind=SUPERSHIFT,S,exec,g${pkgs.sway-contrib.grimshot}/bin/rimshot --notify copy area # fn+print on pleione
|
||||
bind=SUPER,Print,exec,${pkgs.sway-contrib.grimshot}/bin/grimshot --notify copy window
|
||||
|
||||
# Keyboard controls (brightness, media, sound, etc)
|
||||
bind=,XF86MonBrightnessUp,exec,light -A 10
|
||||
bind=,XF86MonBrightnessDown,exec,light -U 10
|
||||
bind=,XF86MonBrightnessUp,exec,${pkgs.light}/bin/light -A 10
|
||||
bind=,XF86MonBrightnessDown,exec,${pkgs.light}/bin/light -U 10
|
||||
|
||||
bind=,XF86AudioNext,exec,playerctl next
|
||||
bind=,XF86AudioPrev,exec,playerctl previous
|
||||
bind=,XF86AudioPlay,exec,playerctl play-pause
|
||||
bind=,XF86AudioStop,exec,playerctl stop
|
||||
bind=,XF86AudioNext,exec,${pkgs.playerctl}/bin/playerctl next
|
||||
bind=,XF86AudioPrev,exec,${pkgs.playerctl}/bin/playerctl previous
|
||||
bind=,XF86AudioPlay,exec,${pkgs.playerctl}/bin/playerctl play-pause
|
||||
bind=,XF86AudioStop,exec,${pkgs.playerctl}/bin/playerctl stop
|
||||
bind=ALT,XF86AudioPlay,exec,systemctl --user restart playerctld
|
||||
bind=SUPER,XF86AudioPlay,exec,${terminal.cmd-spawn "lyrics"}
|
||||
bind=SUPER,XF86AudioPlay,exec,${terminal.cmd-spawn "${pkgs.lyrics}/bin/lyrics"}
|
||||
|
||||
bind=,XF86AudioRaiseVolume,exec,pactl set-sink-volume @DEFAULT_SINK@ +5%
|
||||
bind=,XF86AudioLowerVolume,exec,pactl set-sink-volume @DEFAULT_SINK@ -5%
|
||||
bind=,XF86AudioMute,exec,pactl set-sink-mute @DEFAULT_SINK@ toggle
|
||||
bind=,XF86AudioRaiseVolume,exec,${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ +5%
|
||||
bind=,XF86AudioLowerVolume,exec,${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ -5%
|
||||
bind=,XF86AudioMute,exec,${pkgs.pulseaudio}/bin/pactl set-sink-mute @DEFAULT_SINK@ toggle
|
||||
|
||||
bind=SHIFT,XF86AudioMute,exec,pactl set-source-mute @DEFAULT_SOURCE@ toggle
|
||||
bind=,XF86AudioMicMute,exec,pactl set-source-mute @DEFAULT_SOURCE@ toggle
|
||||
bind=SHIFT,XF86AudioMute,exec,${pkgs.pulseaudio}/bin/pactl set-source-mute @DEFAULT_SOURCE@ toggle
|
||||
bind=,XF86AudioMicMute,exec,${pkgs.pulseaudio}/bin/pactl set-source-mute @DEFAULT_SOURCE@ toggle
|
||||
|
||||
|
||||
# Window manager controls
|
||||
|
||||
@@ -10,18 +10,6 @@ in
|
||||
../common/wayland-wm
|
||||
];
|
||||
|
||||
# Required packages (hotkeys, etc)
|
||||
home.packages = with pkgs; [
|
||||
light
|
||||
playerctl
|
||||
primary-xwayland
|
||||
pulseaudio # pactl
|
||||
sway-contrib.grimshot
|
||||
swayidle
|
||||
swaylock-effects
|
||||
wl-mirror-pick
|
||||
];
|
||||
|
||||
wayland.windowManager.sway =
|
||||
let
|
||||
inherit (config.colorscheme) colors;
|
||||
@@ -123,13 +111,13 @@ in
|
||||
};
|
||||
startup = [
|
||||
# Initial lock
|
||||
{ command = "swaylock -i ${config.wallpaper}"; }
|
||||
{ command = "${pkgs.swaylock-effects}/bin/swaylock -i ${config.wallpaper}"; }
|
||||
# Start idle daemon
|
||||
{ command = "swayidle -w"; }
|
||||
{ command = "${pkgs.swayidle}/bin/swayidle -w"; }
|
||||
# Add transparency
|
||||
{ command = "SWAYFADER_CON_INAC=0.85 ${pkgs.swayfader}/bin/swayfader"; }
|
||||
# Set biggest monitor as xwayland primary
|
||||
{ command = "primary-xwayland largest"; }
|
||||
{ command = "${pkgs.primary-xwayland}/bin/primary-xwayland largest"; }
|
||||
# https://github.com/NixOS/nixpkgs/issues/119445
|
||||
{ command = "dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK"; }
|
||||
];
|
||||
@@ -182,31 +170,26 @@ in
|
||||
"Scroll_Lock" = mkIf trusted "exec ${menu.password-cmd}"; # fn+k
|
||||
"XF86Calculator" = mkIf trusted "exec ${menu.password-cmd}"; # fn+f12
|
||||
|
||||
# Unlock gpg
|
||||
"Shift+Scroll_Lock" =
|
||||
let keyring = import ../../trusted/keyring.nix { inherit pkgs; };
|
||||
in lib.mkIf trusted "exec ${keyring.unlock}";
|
||||
|
||||
# Lock screen
|
||||
"XF86Launch5" = "exec swaylock -S"; # lock icon on k70
|
||||
"XF86Launch4" = "exec swaylock -S"; # fn+q
|
||||
|
||||
# Volume
|
||||
"XF86AudioRaiseVolume" = "exec pactl set-sink-volume @DEFAULT_SINK@ +5%";
|
||||
"XF86AudioLowerVolume" = "exec pactl set-sink-volume @DEFAULT_SINK@ -5%";
|
||||
"XF86AudioMute" = "exec pactl set-sink-mute @DEFAULT_SINK@ toggle";
|
||||
"Shift+XF86AudioMute" = "exec pactl set-source-mute @DEFAULT_SOURCE@ toggle";
|
||||
"XF86AudioMicMute" = "exec pactl set-source-mute @DEFAULT_SOURCE@ toggle";
|
||||
"XF86AudioRaiseVolume" = "exec ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ +5%";
|
||||
"XF86AudioLowerVolume" = "exec ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ -5%";
|
||||
"XF86AudioMute" = "exec ${pkgs.pulseaudio}/bin/pactl set-sink-mute @DEFAULT_SINK@ toggle";
|
||||
"Shift+XF86AudioMute" = "exec ${pkgs.pulseaudio}/bin/pactl set-source-mute @DEFAULT_SOURCE@ toggle";
|
||||
"XF86AudioMicMute" = "exec ${pkgs.pulseaudio}/bin/pactl set-source-mute @DEFAULT_SOURCE@ toggle";
|
||||
|
||||
# Brightness
|
||||
"XF86MonBrightnessUp" = "exec light -A 10";
|
||||
"XF86MonBrightnessDown" = "exec light -U 10";
|
||||
"XF86MonBrightnessUp" = "exec ${pkgs.light}/bin/light -A 10";
|
||||
"XF86MonBrightnessDown" = "exec ${pkgs.light}/bin/light -U 10";
|
||||
|
||||
# Media
|
||||
"XF86AudioNext" = "exec playerctl next";
|
||||
"XF86AudioPrev" = "exec playerctl previous";
|
||||
"XF86AudioPlay" = "exec playerctl play-pause";
|
||||
"XF86AudioStop" = "exec playerctl stop";
|
||||
"XF86AudioNext" = "exec ${pkgs.playerctl}/bin/playerctl next";
|
||||
"XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous";
|
||||
"XF86AudioPlay" = "exec ${pkgs.playerctl}/bin/playerctl play-pause";
|
||||
"XF86AudioStop" = "exec ${pkgs.playerctl}/bin/playerctl stop";
|
||||
|
||||
# Notifications
|
||||
"${modifier}+w" = "exec ${notifier.dismiss-cmd}";
|
||||
@@ -217,11 +200,11 @@ in
|
||||
"${modifier}+b" = "exec ${browser.cmd}";
|
||||
|
||||
# Screenshot
|
||||
"Print" = "exec grimshot --notify copy output";
|
||||
"Shift+Print" = "exec grimshot --notify copy active";
|
||||
"Control+Print" = "exec grimshot --notify copy screen";
|
||||
"Mod1+Print" = "exec grimshot --notify copy area";
|
||||
"${modifier}+Print" = "exec grimshot --notify copy window";
|
||||
"Print" = "exec ${pkgs.sway-contrib.grimshot}/bin/grimshot --notify copy output";
|
||||
"Shift+Print" = "exec ${pkgs.sway-contrib.grimshot}/bin/grimshot --notify copy active";
|
||||
"Control+Print" = "exec ${pkgs.sway-contrib.grimshot}/bin/grimshot --notify copy screen";
|
||||
"Mod1+Print" = "exec ${pkgs.sway-contrib.grimshot}/bin/grimshot --notify copy area";
|
||||
"${modifier}+Print" = "exec ${pkgs.sway-contrib.grimshot}/bin/grimshot --notify copy window";
|
||||
|
||||
# Application menu
|
||||
"${modifier}+x" = "exec ${menu.drun-cmd}";
|
||||
|
||||
Reference in New Issue
Block a user