Update formatter
This commit is contained in:
parent
4eea2232fb
commit
d8235cb2a9
55 changed files with 1031 additions and 664 deletions
|
@ -1,4 +1,9 @@
|
|||
{ pkgs, lib, config, ... }:
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
let
|
||||
adhereTheSwayTarget = {
|
||||
Install.WantedBy = lib.mkForce [ "sway-session.target" ];
|
||||
|
@ -13,7 +18,8 @@ let
|
|||
${pkgs.bemenu}/bin/bemenu --list 20 --ignorecase --prompt 'Start: ' | \
|
||||
xargs swaymsg exec --
|
||||
'';
|
||||
in rec {
|
||||
in
|
||||
rec {
|
||||
home.packages = with pkgs; [
|
||||
sway-contrib.grimshot
|
||||
wl-clipboard
|
||||
|
@ -30,7 +36,9 @@ in rec {
|
|||
enable = true;
|
||||
systemd.enable = true;
|
||||
xwayland = true;
|
||||
wrapperFeatures = { gtk = true; };
|
||||
wrapperFeatures = {
|
||||
gtk = true;
|
||||
};
|
||||
catppuccin.enable = true;
|
||||
extraSessionCommands = ''
|
||||
#export XDG_CURRENT_DESKTOP=Unity
|
||||
|
@ -49,7 +57,9 @@ in rec {
|
|||
xkb_layout = "ch,de";
|
||||
xkb_options = "eurosign:e";
|
||||
};
|
||||
"*" = { xkb_numlock = "enable"; };
|
||||
"*" = {
|
||||
xkb_numlock = "enable";
|
||||
};
|
||||
};
|
||||
terminal = "${pkgs.kitty}/bin/kitty";
|
||||
menu = "${bemenuLauncher}/bin/bemenuLauncher";
|
||||
|
@ -60,66 +70,66 @@ in rec {
|
|||
|
||||
#TODO: Workspace Programm assignment: Not working properly
|
||||
assigns = {
|
||||
"10" = [{ app_id = "^firefox$"; }];
|
||||
"11" = [{ app_id = "^(claws-mail|thunderbird|evolution)$"; }];
|
||||
"12" = [{
|
||||
class = "^Chromium-browser$";
|
||||
instance = "^web.threema.ch";
|
||||
}];
|
||||
"13" = [{ class = "^Spotify$"; }];
|
||||
"10" = [ { app_id = "^firefox$"; } ];
|
||||
"11" = [ { app_id = "^(claws-mail|thunderbird|evolution)$"; } ];
|
||||
"12" = [
|
||||
{
|
||||
class = "^Chromium-browser$";
|
||||
instance = "^web.threema.ch";
|
||||
}
|
||||
];
|
||||
"13" = [ { class = "^Spotify$"; } ];
|
||||
};
|
||||
|
||||
keybindings = let
|
||||
mod = wayland.windowManager.sway.config.modifier;
|
||||
playerctl = "${pkgs.playerctl}/bin/playerctl";
|
||||
wpctl = "${pkgs.wireplumber}/bin/wpctl";
|
||||
light = "${pkgs.light}/bin/light";
|
||||
in lib.mkOptionDefault {
|
||||
"${mod}+p" = "exec passbemenu";
|
||||
"${mod}+Shift+d" =
|
||||
"exec ${pkgs.rofimoji}/bin/rofimoji --action type --selector fuzzel";
|
||||
"${mod}+x" = "move workspace to output right";
|
||||
"${mod}+y" = "move workspace to output left";
|
||||
keybindings =
|
||||
let
|
||||
mod = wayland.windowManager.sway.config.modifier;
|
||||
playerctl = "${pkgs.playerctl}/bin/playerctl";
|
||||
wpctl = "${pkgs.wireplumber}/bin/wpctl";
|
||||
light = "${pkgs.light}/bin/light";
|
||||
in
|
||||
lib.mkOptionDefault {
|
||||
"${mod}+p" = "exec passbemenu";
|
||||
"${mod}+Shift+d" = "exec ${pkgs.rofimoji}/bin/rofimoji --action type --selector fuzzel";
|
||||
"${mod}+x" = "move workspace to output right";
|
||||
"${mod}+y" = "move workspace to output left";
|
||||
|
||||
"${mod}+section" = "workspace 0";
|
||||
"${mod}+0" = "workspace 10";
|
||||
"${mod}+apostrophe" = "workspace 11";
|
||||
"${mod}+dead_circumflex" = "workspace 12";
|
||||
"${mod}+dead_diaeresis" = "workspace 13";
|
||||
"${mod}+dollar" = "workspace 14";
|
||||
"${mod}+section" = "workspace 0";
|
||||
"${mod}+0" = "workspace 10";
|
||||
"${mod}+apostrophe" = "workspace 11";
|
||||
"${mod}+dead_circumflex" = "workspace 12";
|
||||
"${mod}+dead_diaeresis" = "workspace 13";
|
||||
"${mod}+dollar" = "workspace 14";
|
||||
|
||||
"${mod}+Shift+section" = "move container to workspace 0";
|
||||
"${mod}+Shift+0" = "move container to workspace 10";
|
||||
"${mod}+Shift+apostrophe" = "move container to workspace 11";
|
||||
"${mod}+Shift+dead_circumflex" = "move container to workspace 12";
|
||||
"${mod}+Shift+dead_diaeresis" = "move container to workspace 13";
|
||||
"${mod}+Shift+dollar" = "move container to workspace 14";
|
||||
"${mod}+Shift+section" = "move container to workspace 0";
|
||||
"${mod}+Shift+0" = "move container to workspace 10";
|
||||
"${mod}+Shift+apostrophe" = "move container to workspace 11";
|
||||
"${mod}+Shift+dead_circumflex" = "move container to workspace 12";
|
||||
"${mod}+Shift+dead_diaeresis" = "move container to workspace 13";
|
||||
"${mod}+Shift+dollar" = "move container to workspace 14";
|
||||
|
||||
"Ctrl+mod1+l" = "exec ${pkgs.systemd}/bin/loginctl lock-session";
|
||||
"Ctrl+mod1+Shift+L" = "exec ${pkgs.systemd}/bin/systemctl suspend";
|
||||
"Ctrl+mod1+l" = "exec ${pkgs.systemd}/bin/loginctl lock-session";
|
||||
"Ctrl+mod1+Shift+L" = "exec ${pkgs.systemd}/bin/systemctl suspend";
|
||||
|
||||
# pulse audio volume control
|
||||
XF86AudioLowerVolume =
|
||||
"exec ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 3%-";
|
||||
XF86AudioRaiseVolume =
|
||||
"exec ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 3%+";
|
||||
XF86AudioMute = "exec ${wpctl} set-mute @DEFAULT_AUDIO_SINK@ toggle";
|
||||
XF86AudioMicMute =
|
||||
"exec ${wpctl} set-mute @DEFAULT_AUDIO_SOURCE@ toggle";
|
||||
# pulse audio volume control
|
||||
XF86AudioLowerVolume = "exec ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 3%-";
|
||||
XF86AudioRaiseVolume = "exec ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 3%+";
|
||||
XF86AudioMute = "exec ${wpctl} set-mute @DEFAULT_AUDIO_SINK@ toggle";
|
||||
XF86AudioMicMute = "exec ${wpctl} set-mute @DEFAULT_AUDIO_SOURCE@ toggle";
|
||||
|
||||
# Spotify control
|
||||
XF86AudioPause = "exec ${playerctl} play-pause";
|
||||
XF86AudioPlay = "exec ${playerctl} play-pause";
|
||||
XF86AudioNext = "exec ${playerctl} next";
|
||||
XF86AudioPrev = "exec ${playerctl} previous";
|
||||
# Spotify control
|
||||
XF86AudioPause = "exec ${playerctl} play-pause";
|
||||
XF86AudioPlay = "exec ${playerctl} play-pause";
|
||||
XF86AudioNext = "exec ${playerctl} next";
|
||||
XF86AudioPrev = "exec ${playerctl} previous";
|
||||
|
||||
# screen brightness
|
||||
XF86MonBrightnessUp = "exec ${light} -A 10";
|
||||
XF86MonBrightnessDown = "exec ${light} -U 5";
|
||||
# screen brightness
|
||||
XF86MonBrightnessUp = "exec ${light} -A 10";
|
||||
XF86MonBrightnessDown = "exec ${light} -U 5";
|
||||
|
||||
# screenshot
|
||||
Print = "exec ${pkgs.sway-contrib.grimshot}/bin/grimshot copy area";
|
||||
};
|
||||
# screenshot
|
||||
Print = "exec ${pkgs.sway-contrib.grimshot}/bin/grimshot copy area";
|
||||
};
|
||||
};
|
||||
extraConfig = ''
|
||||
# Disable the laptop screen when the lid is closed.
|
||||
|
@ -137,8 +147,7 @@ in rec {
|
|||
Unit.After = lib.mkForce [ "waybar.service" ];
|
||||
Service = {
|
||||
ExecStartPre = "${pkgs.coreutils}/bin/sleep 3";
|
||||
Environment = lib.mkForce
|
||||
"PATH=${config.home.profileDirectory}/bin XDG_CURRENT_DESKTOP=Unity";
|
||||
Environment = lib.mkForce "PATH=${config.home.profileDirectory}/bin XDG_CURRENT_DESKTOP=Unity";
|
||||
};
|
||||
};
|
||||
systemd.user.services.owncloud-client = adhereTheSwayTarget // {
|
||||
|
@ -146,8 +155,7 @@ in rec {
|
|||
Unit.After = lib.mkForce [ "waybar.service" ];
|
||||
Service = {
|
||||
ExecStartPre = "${pkgs.coreutils}/bin/sleep 3";
|
||||
Environment = lib.mkForce
|
||||
"PATH=${config.home.profileDirectory}/bin XDG_CURRENT_DESKTOP=Unity";
|
||||
Environment = lib.mkForce "PATH=${config.home.profileDirectory}/bin XDG_CURRENT_DESKTOP=Unity";
|
||||
};
|
||||
};
|
||||
systemd.user.services.pasystray = adhereTheSwayTarget;
|
||||
|
@ -163,5 +171,7 @@ in rec {
|
|||
catppuccin.enable = true;
|
||||
};
|
||||
|
||||
dconf.settings = { "org/gnome/desktop/interface".menus-have-icons = true; };
|
||||
dconf.settings = {
|
||||
"org/gnome/desktop/interface".menus-have-icons = true;
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue