diff --git a/components/mainUser.nix b/components/mainUser.nix index f55c1e3..9a51d26 100644 --- a/components/mainUser.nix +++ b/components/mainUser.nix @@ -73,16 +73,20 @@ in uid = cfg.uid; home = "/home/${cfg.userName}"; initialPassword = cfg.userName; - extraGroups = [ - "wheel" - "networkmanager" - "transmission" - "wireshark" - "audio" - "pipewire" - "input" - "dialout" - ] ++ dockerGroup ++ vboxGroup ++ cfg.extraGroups; + extraGroups = + [ + "wheel" + "networkmanager" + "transmission" + "wireshark" + "audio" + "pipewire" + "input" + "dialout" + ] + ++ dockerGroup + ++ vboxGroup + ++ cfg.extraGroups; openssh.authorizedKeys.keyFiles = cfg.authorizedKeyFiles; group = config.users.groups.mainUser.name; }; diff --git a/homes/palo/i3.nix b/homes/palo/i3.nix index 2d35a14..fe0b23a 100644 --- a/homes/palo/i3.nix +++ b/homes/palo/i3.nix @@ -213,9 +213,12 @@ in "XF86MonBrightnessDown" = "exec --no-startup-id ${pkgs.brightnessctl}/bin/brightnessctl set 5%-"; # --- Pulse/Pipewire Audio controls --- # - "XF86AudioRaiseVolume" = "exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ +5%"; - "XF86AudioLowerVolume" = "exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ -5%"; - "XF86AudioMute" = "exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-sink-mute @DEFAULT_SINK@ toggle"; + "XF86AudioRaiseVolume" = + "exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ +5%"; + "XF86AudioLowerVolume" = + "exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ -5%"; + "XF86AudioMute" = + "exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-sink-mute @DEFAULT_SINK@ toggle"; "${modifier}+Return" = "exec ${cfg.config.terminal}"; "${modifier}+Shift+q" = "exit"; @@ -315,7 +318,8 @@ in "${modifier}+space" = "exec ${rofi}/bin/rofi -show drun -display-drun ''"; "${modifier}+Shift+c" = "reload"; "${modifier}+Shift+r" = "restart"; - "${modifier}+Shift+e" = "exec i3-nagbar -t warning -m 'Do you want to exit i3?' -b 'Yes' 'i3-msg exit'"; + "${modifier}+Shift+e" = + "exec i3-nagbar -t warning -m 'Do you want to exit i3?' -b 'Yes' 'i3-msg exit'"; "${modifier}+r" = "mode resize"; diff --git a/machines/usbstick/hardware-configuration/hardware-configuration.nix b/machines/usbstick/hardware-configuration/hardware-configuration.nix index 4ec92a7..66f2d26 100644 --- a/machines/usbstick/hardware-configuration/hardware-configuration.nix +++ b/machines/usbstick/hardware-configuration/hardware-configuration.nix @@ -33,7 +33,8 @@ fsType = "ext4"; }; - boot.initrd.luks.devices."root-enc".device = "/dev/disk/by-uuid/c2a56e0f-f831-4d21-8cf4-7ddf3901ea8a"; + boot.initrd.luks.devices."root-enc".device = + "/dev/disk/by-uuid/c2a56e0f-f831-4d21-8cf4-7ddf3901ea8a"; fileSystems."/boot" = { device = "/dev/disk/by-uuid/EBCE-D756";