Revert hyprland workspaces to numbers instead of names

This commit is contained in:
Evie Litherland-Smith 2023-07-19 09:13:40 +01:00
parent 1c3dcd05a1
commit e4a9c6d820
3 changed files with 78 additions and 69 deletions

View file

@ -1,4 +1,4 @@
.PHONY: test switch build debug lock update hyprland waybar home .PHONY: test switch build debug lock update hyprland waybar home full
test: test:
sudo nixos-rebuild test --flake . sudo nixos-rebuild test --flake .
@ -29,3 +29,7 @@ home:
nix run nixpkgs#home-manager -- switch --flake . nix run nixpkgs#home-manager -- switch --flake .
make hyprland make hyprland
make waybar make waybar
full:
make switch
make home

View file

@ -107,33 +107,68 @@ bind = SUPER SHIFT, L, movewindow, r
bind = SUPER SHIFT, K, movewindow, u bind = SUPER SHIFT, K, movewindow, u
bind = SUPER SHIFT, J, movewindow, d bind = SUPER SHIFT, J, movewindow, d
bind = SUPER, A, moveworkspacetomonitor, name:home current # 1: home
bind = SUPER, A, workspace, name:home bind = SUPER, A, moveworkspacetomonitor, name:1 current
bind = SUPER SHIFT, A, movetoworkspace, name:home bind = SUPER, A, workspace, name:1
bind = SUPER, D, moveworkspacetomonitor, name:dev current bind = SUPER SHIFT, A, movetoworkspace, name:1
bind = SUPER, D, workspace, name:dev
bind = SUPER SHIFT, D, movetoworkspace, name:dev # 2: dev
bind = SUPER, W, moveworkspacetomonitor, name:browser current bind = SUPER, D, moveworkspacetomonitor, name:2 current
bind = SUPER, W, workspace, name:browser bind = SUPER, D, workspace, name:2
bind = SUPER SHIFT, W, movetoworkspace, name:browser bind = SUPER SHIFT, D, movetoworkspace, name:2
bind = SUPER, F, moveworkspacetomonitor, name:files current windowrule = workspace name:2,(neovide)
bind = SUPER, F, workspace, name:files
bind = SUPER SHIFT, F, movetoworkspace, name:files # 3: browser
bind = SUPER, C, moveworkspacetomonitor, name:chat current bind = SUPER, W, moveworkspacetomonitor, name:3 current
bind = SUPER, C, workspace, name:chat bind = SUPER, W, workspace, name:3
bind = SUPER SHIFT, C, movetoworkspace, name:chat bind = SUPER SHIFT, W, movetoworkspace, name:3
bind = SUPER, Z, moveworkspacetomonitor, name:mail current windowrule = workspace name:3,(firefox)
bind = SUPER, Z, workspace, name:mail windowrulev2 = float,title:(File|Picture-in-Picture),class:(firefox)
bind = SUPER SHIFT, Z, movetoworkspace, name:mail windowrulev2 = pin,title:(File|Picture-in-Picture),class:(firefox)
bind = SUPER, R, moveworkspacetomonitor, name:remote current
bind = SUPER, R, workspace, name:remote # 4: files
bind = SUPER SHIFT, R, movetoworkspace, name:remote bind = SUPER, F, moveworkspacetomonitor, name:4 current
bind = SUPER, S, moveworkspacetomonitor, name:steam current bind = SUPER, F, workspace, name:4
bind = SUPER, S, workspace, name:steam bind = SUPER SHIFT, F, movetoworkspace, name:4
bind = SUPER SHIFT, S, movetoworkspace, name:steam windowrule = workspace name:4,^(libreoffice).*
bind = SUPER, X, moveworkspacetomonitor, name:misc current windowrule = workspace name:4,(Zotero)
bind = SUPER, X, workspace, name:misc
bind = SUPER SHIFT, X, movetoworkspace, name:misc # 5: chat
bind = SUPER, C, moveworkspacetomonitor, name:5 current
bind = SUPER, C, workspace, name:5
bind = SUPER SHIFT, C, movetoworkspace, name:5
windowrule = workspace name:5,(Signal)
windowrule = workspace name:5,(fractal)
windowrule = workspace name:5,(discord)
windowrule = workspace name:5,(teams-for-linux)
windowrulev2 = workspace 5,title:^(Zoom|zoom).*
windowrulev2 = float,title:^(Zoom|zoom).*
# 6: mail
bind = SUPER, Z, moveworkspacetomonitor, name:6 current
bind = SUPER, Z, workspace, name:6
bind = SUPER SHIFT, Z, movetoworkspace, name:6
windowrule = workspace name:6,(thunderbird)
# 7: remote
bind = SUPER, R, moveworkspacetomonitor, name:7 current
bind = SUPER, R, workspace, name:7
bind = SUPER SHIFT, R, movetoworkspace, name:7
windowrule = workspace name:7,(Nxplayer.bin)
windowrule = float,(Nxplayer.bin)
windowrule = center,(Nxplayer.bin)
# 8: steam
bind = SUPER, S, moveworkspacetomonitor, name:8 current
bind = SUPER, S, workspace, name:8
bind = SUPER SHIFT, S, movetoworkspace, name:8
windowrule = workspace name:8,^(steam).*
windowrule = workspace name:8,(.gamescope-wrapped)
# 9: misc
bind = SUPER, X, moveworkspacetomonitor, name:9 current
bind = SUPER, X, workspace, name:9
bind = SUPER SHIFT, X, movetoworkspace, name:9
bind = SUPER, period, workspace, m+1 bind = SUPER, period, workspace, m+1
bind = SUPER SHIFT, period, movetoworkspace, r+1 bind = SUPER SHIFT, period, movetoworkspace, r+1
@ -156,18 +191,6 @@ bindm = SUPER, mouse:272, movewindow
bindm = SUPER, mouse:273, resizewindow bindm = SUPER, mouse:273, resizewindow
# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
windowrule = workspace name:dev,(neovide)
windowrule = workspace name:browser,(firefox)
windowrule = workspace name:files,^(libreoffice).*
windowrule = workspace name:files,(Zotero)
windowrule = workspace name:chat,(Signal)
windowrule = workspace name:chat,(fractal)
windowrule = workspace name:chat,(discord)
windowrule = workspace name:chat,(teams-for-linux)
windowrule = workspace name:mail,(thunderbird)
windowrule = workspace name:remote,(Nxplayer.bin)
windowrule = workspace name:steam,^(steam).*
windowrule = workspace name:steam,(.gamescope-wrapped)
windowrule = float,(foot) windowrule = float,(foot)
windowrule = center,(foot) windowrule = center,(foot)
@ -182,12 +205,3 @@ windowrule = size 800 600,(nm-connection-editor)
windowrule = move 100%-820 10%,(nm-connection-editor) windowrule = move 100%-820 10%,(nm-connection-editor)
windowrule = float,(otpclient) windowrule = float,(otpclient)
windowrule = move 10% 10%,(otpclient) windowrule = move 10% 10%,(otpclient)
windowrule = float,(thunar)
windowrule = center,(thunar)
windowrule = float,(Nxplayer.bin)
windowrule = center,(Nxplayer.bin)
windowrulev2 = float,title:^(Zoom|zoom).*
windowrulev2 = workspace 5,title:^(Zoom|zoom).*
windowrulev2 = float,title:(File|Picture-in-Picture),class:(firefox)
windowrulev2 = pin,title:(File|Picture-in-Picture),class:(firefox)

View file

@ -2,27 +2,18 @@
on-click = "activate"; on-click = "activate";
disable-scroll = true; disable-scroll = true;
all-outputs = false; all-outputs = false;
format = "{icon}"; format = "{name}:{icon}";
format-icons = { format-icons = {
"home" = "󰟀"; "1" = "󰟀";
"dev" = "󰅴"; "2" = "󰅴";
"browser" = "󰈹"; "3" = "󰈹";
"files" = "󰝰"; "4" = "󰝰";
"chat" = "󰭹"; "5" = "󰭹";
"mail" = "󰇮"; "6" = "󰇮";
"remote" = "󰢹"; "7" = "󰢹";
"steam" = "󰓓"; "8" = "󰓓";
"misc" = "󰣙"; "9" = "󰣙";
"1" = "󰎤";
"2" = "󰎧";
"3" = "󰎪";
"4" = "󰎭";
"5" = "󰎱";
"6" = "󰎳";
"7" = "󰎶";
"8" = "󰎹";
"9" = "󰎼";
urgent = "󱈸"; urgent = "󱈸";
}; };
sort-by-name = true; sort-by-number = true;
} }