refactoring complete
This commit is contained in:
vali
parent
0a7700f434
commit
a2dd7645c6
10 changed files with 164 additions and 161 deletions
|
|
@ -24,7 +24,7 @@ in {
|
|||
xdg.portal = {
|
||||
enable = true;
|
||||
configPackages = [
|
||||
# hyprland # TODO Fix hyprland package
|
||||
cfg.package # TODO Fix hyprland package
|
||||
];
|
||||
extraPortals = [
|
||||
pkgs.xdg-desktop-portal-gtk
|
||||
|
|
@ -35,7 +35,7 @@ in {
|
|||
home-manager.users.${username} = {
|
||||
wayland.windowManager.hyprland = {
|
||||
enable = true;
|
||||
# package = hyprland; TODO Fix hyprland package
|
||||
inherit (cfg) package;
|
||||
# Split-monitor-workspaces provides awesome-like workspace behaviour
|
||||
plugins = [
|
||||
split-monitor-workspaces
|
||||
|
|
@ -54,58 +54,58 @@ in {
|
|||
|
||||
# Monitor config
|
||||
monitor = [
|
||||
"eDP-1,1920x1080,0x0,1"
|
||||
# "DP-2,1920x1080,0x0,1"
|
||||
# "HDMI-A-2,1920x1080,1920x0,1"
|
||||
# "HDMI-A-1,1920x1080,3840x0,1"
|
||||
# "eDP-1,1920x1080,0x0,1"
|
||||
"DP-2,1920x1080,0x0,1"
|
||||
"HDMI-A-2,1920x1080,1920x0,1"
|
||||
"HDMI-A-1,1920x1080,3840x0,1"
|
||||
# Had the shadow monitor bug, so had to disable all unknown monitors.
|
||||
"Unknown-1,disable"
|
||||
];
|
||||
# Workspace config
|
||||
workspace = [
|
||||
"1,monitor:eDP-1, default:true"
|
||||
"2,monitor:eDP-1"
|
||||
"3,monitor:eDP-1"
|
||||
"4,monitor:eDP-1"
|
||||
"5,monitor:eDP-1"
|
||||
"6,monitor:eDP-1"
|
||||
"7,monitor:eDP-1"
|
||||
"8,monitor:eDP-1"
|
||||
"9,monitor:eDP-1"
|
||||
"10,monitor:eDP-1"
|
||||
# "1,monitor:eDP-1, default:true"
|
||||
# "2,monitor:eDP-1"
|
||||
# "3,monitor:eDP-1"
|
||||
# "4,monitor:eDP-1"
|
||||
# "5,monitor:eDP-1"
|
||||
# "6,monitor:eDP-1"
|
||||
# "7,monitor:eDP-1"
|
||||
# "8,monitor:eDP-1"
|
||||
# "9,monitor:eDP-1"
|
||||
# "10,monitor:eDP-1"
|
||||
|
||||
# "1,monitor:HDMI-A-1, default:true"
|
||||
# "2,monitor:HDMI-A-1"
|
||||
# "3,monitor:HDMI-A-1"
|
||||
# "4,monitor:HDMI-A-1"
|
||||
# "5,monitor:HDMI-A-1"
|
||||
# "6,monitor:HDMI-A-1"
|
||||
# "7,monitor:HDMI-A-1"
|
||||
# "8,monitor:HDMI-A-1"
|
||||
# "9,monitor:HDMI-A-1"
|
||||
# "10,monitor:HDMI-A-1"
|
||||
"1,monitor:HDMI-A-1, default:true"
|
||||
"2,monitor:HDMI-A-1"
|
||||
"3,monitor:HDMI-A-1"
|
||||
"4,monitor:HDMI-A-1"
|
||||
"5,monitor:HDMI-A-1"
|
||||
"6,monitor:HDMI-A-1"
|
||||
"7,monitor:HDMI-A-1"
|
||||
"8,monitor:HDMI-A-1"
|
||||
"9,monitor:HDMI-A-1"
|
||||
"10,monitor:HDMI-A-1"
|
||||
|
||||
#"11, monitor:HDMI-A-2, default:true"
|
||||
#"12, monitor:HDMI-A-2"
|
||||
#"13, monitor:HDMI-A-2"
|
||||
#"14, monitor:HDMI-A-2"
|
||||
#"15, monitor:HDMI-A-2"
|
||||
#"16, monitor:HDMI-A-2"
|
||||
#"17, monitor:HDMI-A-2"
|
||||
#"18, monitor:HDMI-A-2"
|
||||
#"19, monitor:HDMI-A-2"
|
||||
#"20, monitor:HDMI-A-2"
|
||||
#
|
||||
#"21, monitor:DP-2, default:true"
|
||||
#"22, monitor:DP-2"
|
||||
#"23, monitor:DP-2"
|
||||
#"24, monitor:DP-2"
|
||||
#"25, monitor:DP-2"
|
||||
#"26, monitor:DP-2"
|
||||
#"27, monitor:DP-2"
|
||||
#"28, monitor:DP-2"
|
||||
#"29, monitor:DP-2"
|
||||
#"30, monitor:DP-2"
|
||||
"11, monitor:HDMI-A-2, default:true"
|
||||
"12, monitor:HDMI-A-2"
|
||||
"13, monitor:HDMI-A-2"
|
||||
"14, monitor:HDMI-A-2"
|
||||
"15, monitor:HDMI-A-2"
|
||||
"16, monitor:HDMI-A-2"
|
||||
"17, monitor:HDMI-A-2"
|
||||
"18, monitor:HDMI-A-2"
|
||||
"19, monitor:HDMI-A-2"
|
||||
"20, monitor:HDMI-A-2"
|
||||
|
||||
"21, monitor:DP-2, default:true"
|
||||
"22, monitor:DP-2"
|
||||
"23, monitor:DP-2"
|
||||
"24, monitor:DP-2"
|
||||
"25, monitor:DP-2"
|
||||
"26, monitor:DP-2"
|
||||
"27, monitor:DP-2"
|
||||
"28, monitor:DP-2"
|
||||
"29, monitor:DP-2"
|
||||
"30, monitor:DP-2"
|
||||
|
||||
# scratchpads
|
||||
"special:btop, decorate:false"
|
||||
|
|
@ -205,59 +205,61 @@ in {
|
|||
"$mainMod, F, fullscreen, 0"
|
||||
"$mainMod, D, exec, ${pkgs.procps}/bin/pkill anyrun || ${anyrun}/bin/anyrun"
|
||||
"$mainMod, SPACE, togglefloating, active"
|
||||
"$mainMod, O, exec, obsidian --ozone-platform=wayland --enable-features=UseOzonePlatform --enable-features=WaylandWindowDecorations --enable-features=WebRTCPipeWireCpaturer --disable-gpu"
|
||||
# workspaces
|
||||
# split-workspace is because of the split-workspace plugin
|
||||
"$mainMod, 1, workspace, 1"
|
||||
"$mainMod, 2, workspace, 2"
|
||||
"$mainMod, 3, workspace, 3"
|
||||
"$mainMod, 4, workspace, 4"
|
||||
"$mainMod, 5, workspace, 5"
|
||||
"$mainMod, 6, workspace, 6"
|
||||
"$mainMod, 7, workspace, 7"
|
||||
"$mainMod, 8, workspace, 8"
|
||||
"$mainMod, 9, workspace, 9"
|
||||
"$mainMod, 0, workspace, 10"
|
||||
"$mainMod SHIFT, 1, movetoworkspacesilent, 1"
|
||||
"$mainMod SHIFT, 2, movetoworkspacesilent, 2"
|
||||
"$mainMod SHIFT, 3, movetoworkspacesilent, 3"
|
||||
"$mainMod SHIFT, 4, movetoworkspacesilent, 4"
|
||||
"$mainMod SHIFT, 5, movetoworkspacesilent, 5"
|
||||
"$mainMod SHIFT, 6, movetoworkspacesilent, 6"
|
||||
"$mainMod SHIFT, 7, movetoworkspacesilent, 7"
|
||||
"$mainMod SHIFT, 8, movetoworkspacesilent, 8"
|
||||
"$mainMod SHIFT, 9, movetoworkspacesilent, 9"
|
||||
"$mainMod SHIFT, 0, movetoworkspacesilent, 10"
|
||||
|
||||
# split-workspace is because of the split-workspace plugin
|
||||
# "$mainMod, 1, split-workspace, 1"
|
||||
# "$mainMod, 2, split-workspace, 2"
|
||||
# "$mainMod, 3, split-workspace, 3"
|
||||
# "$mainMod, 4, split-workspace, 4"
|
||||
# "$mainMod, 5, split-workspace, 5"
|
||||
# "$mainMod, 6, split-workspace, 6"
|
||||
# "$mainMod, 7, split-workspace, 7"
|
||||
# "$mainMod, 8, split-workspace, 8"
|
||||
# "$mainMod, 9, split-workspace, 9"
|
||||
# "$mainMod, 0, split-workspace, 10"
|
||||
# "$mainMod SHIFT, 1, split-movetoworkspacesilent, 1"
|
||||
# "$mainMod SHIFT, 2, split-movetoworkspacesilent, 2"
|
||||
# "$mainMod SHIFT, 3, split-movetoworkspacesilent, 3"
|
||||
# "$mainMod SHIFT, 4, split-movetoworkspacesilent, 4"
|
||||
# "$mainMod SHIFT, 5, split-movetoworkspacesilent, 5"
|
||||
# "$mainMod SHIFT, 6, split-movetoworkspacesilent, 6"
|
||||
# "$mainMod SHIFT, 7, split-movetoworkspacesilent, 7"
|
||||
# "$mainMod SHIFT, 8, split-movetoworkspacesilent, 8"
|
||||
# "$mainMod SHIFT, 9, split-movetoworkspacesilent, 9"
|
||||
# "$mainMod SHIFT, 0, split-movetoworkspacesilent, 10"
|
||||
# "$mainMod, 1, workspace, 1"
|
||||
# "$mainMod, 2, workspace, 2"
|
||||
# "$mainMod, 3, workspace, 3"
|
||||
# "$mainMod, 4, workspace, 4"
|
||||
# "$mainMod, 5, workspace, 5"
|
||||
# "$mainMod, 6, workspace, 6"
|
||||
# "$mainMod, 7, workspace, 7"
|
||||
# "$mainMod, 8, workspace, 8"
|
||||
# "$mainMod, 9, workspace, 9"
|
||||
# "$mainMod, 0, workspace, 10"
|
||||
# "$mainMod SHIFT, 1, movetoworkspacesilent, 1"
|
||||
# "$mainMod SHIFT, 2, movetoworkspacesilent, 2"
|
||||
# "$mainMod SHIFT, 3, movetoworkspacesilent, 3"
|
||||
# "$mainMod SHIFT, 4, movetoworkspacesilent, 4"
|
||||
# "$mainMod SHIFT, 5, movetoworkspacesilent, 5"
|
||||
# "$mainMod SHIFT, 6, movetoworkspacesilent, 6"
|
||||
# "$mainMod SHIFT, 7, movetoworkspacesilent, 7"
|
||||
# "$mainMod SHIFT, 8, movetoworkspacesilent, 8"
|
||||
# "$mainMod SHIFT, 9, movetoworkspacesilent, 9"
|
||||
# "$mainMod SHIFT, 0, movetoworkspacesilent, 10"
|
||||
|
||||
# split-workspace is because of the split-workspace plugin
|
||||
"$mainMod, 1, split-workspace, 1"
|
||||
"$mainMod, 2, split-workspace, 2"
|
||||
"$mainMod, 3, split-workspace, 3"
|
||||
"$mainMod, 4, split-workspace, 4"
|
||||
"$mainMod, 5, split-workspace, 5"
|
||||
"$mainMod, 6, split-workspace, 6"
|
||||
"$mainMod, 7, split-workspace, 7"
|
||||
"$mainMod, 8, split-workspace, 8"
|
||||
"$mainMod, 9, split-workspace, 9"
|
||||
"$mainMod, 0, split-workspace, 10"
|
||||
"$mainMod SHIFT, 1, split-movetoworkspacesilent, 1"
|
||||
"$mainMod SHIFT, 2, split-movetoworkspacesilent, 2"
|
||||
"$mainMod SHIFT, 3, split-movetoworkspacesilent, 3"
|
||||
"$mainMod SHIFT, 4, split-movetoworkspacesilent, 4"
|
||||
"$mainMod SHIFT, 5, split-movetoworkspacesilent, 5"
|
||||
"$mainMod SHIFT, 6, split-movetoworkspacesilent, 6"
|
||||
"$mainMod SHIFT, 7, split-movetoworkspacesilent, 7"
|
||||
"$mainMod SHIFT, 8, split-movetoworkspacesilent, 8"
|
||||
"$mainMod SHIFT, 9, split-movetoworkspacesilent, 9"
|
||||
"$mainMod SHIFT, 0, split-movetoworkspacesilent, 10"
|
||||
|
||||
# Move Windows
|
||||
"$mainMod SHIFT, H, movewindow, l"
|
||||
"$mainMod SHIFT, J, movewindow, d"
|
||||
"$mainMod SHIFT, K, movewindow, u"
|
||||
"$mainMod SHIFT, L, movewindow, r"
|
||||
|
||||
# Screenshotting
|
||||
"$mainMod, S, exec, ${pkgs.grimblast}/bin/grimblast copy area"
|
||||
|
||||
# File manager
|
||||
"$mainMod, E, exec, ${pkgs.gnome.nautilus}/bin/nautilus"
|
||||
# Toggle the four different special workspaces.
|
||||
|
|
@ -267,7 +269,7 @@ in {
|
|||
"$mainMod, X, togglespecialworkspace, keepassxc"
|
||||
|
||||
# Reload hyprland
|
||||
"$mainMod, R, exec, ${hyprland}/bin/hyprctl reload"
|
||||
"$mainMod, R, exec, ${cfg.package}/bin/hyprctl reload"
|
||||
# Restart waybar
|
||||
"$mainMod CONTROL, B, exec, ${pkgs.procps}/bin/pkill waybar || ${pkgs.waybar}/bin/waybar"
|
||||
];
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue