From fa6f1ce7dbf68af2308bc271c9896ea97c4ed2c4 Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Wed, 24 May 2023 08:44:46 +0100 Subject: [PATCH] Add update hyprland config to H0615 Remove hyprland config files now that they've moved --- home/H0615/elitherl.nix | 48 ++++++++- home/desktop/config/hypr/common.conf | 97 ------------------- home/desktop/config/hypr/hyprland-H0615.conf | 15 --- .../config/hypr/hyprland-Vanguard.conf | 11 --- home/desktop/config/hypr/hyprpaper-H0615.conf | 7 -- .../config/hypr/hyprpaper-Vanguard.conf | 2 - home/desktop/config/hypr/keybinds.conf | 87 ----------------- home/desktop/config/hypr/window-rules.conf | 31 ------ home/desktop/config/waybar/config-H0615.json | 18 ---- 9 files changed, 45 insertions(+), 271 deletions(-) delete mode 100644 home/desktop/config/hypr/common.conf delete mode 100644 home/desktop/config/hypr/hyprland-H0615.conf delete mode 100644 home/desktop/config/hypr/hyprland-Vanguard.conf delete mode 100644 home/desktop/config/hypr/hyprpaper-H0615.conf delete mode 100644 home/desktop/config/hypr/hyprpaper-Vanguard.conf delete mode 100644 home/desktop/config/hypr/keybinds.conf delete mode 100644 home/desktop/config/hypr/window-rules.conf delete mode 100644 home/desktop/config/waybar/config-H0615.json diff --git a/home/H0615/elitherl.nix b/home/H0615/elitherl.nix index e7bcefd2..210fc505 100644 --- a/home/H0615/elitherl.nix +++ b/home/H0615/elitherl.nix @@ -1,8 +1,50 @@ {...}: { - imports = [../work.nix]; - # Home Manager needs a bit of information about you and the - # paths it should manage. + imports = [../work.nix ../desktop/hyprland.nix]; home.username = "elitherl"; home.homeDirectory = "/home/elitherl"; home.stateVersion = "22.11"; + + xdg.configFile."hypr/hyprpaper.conf".text = '' + preload = /etc/nixos/config/wallpaper/images_dark/1920x1080.png + preload = /etc/nixos/config/wallpaper/images_dark/1920x1200.png + preload = /etc/nixos/config/wallpaper/images_dark/1080x1920.png + + wallpaper = HDMI-A-1,/etc/nixos/config/wallpaper/images_dark/1920x1200.png + wallpaper = DP-1,/etc/nixos/config/wallpaper/images_dark/1080x1920.png + wallpaper = ,/etc/nixos/config/wallpaper/images_dark/1920x1080.png + ''; + wayland.windowManager.hyprland.extraConfig = '' + source=./common.conf + monitor=HDMI-A-1,preferred,auto,auto + monitor=DP-1,preferred,auto,auto,transform,1 + wsbind=1,HDMI-A-1 + wsbind=2,HDMI-A-1 + wsbind=3,HDMI-A-1 + wsbind=4,HDMI-A-1 + exec-once = firefox + exec-once = teams + ''; + programs.waybar = { + style = '' + @import 'common.css'; + ''; + settings = { + main = { + "include" = [ + "~/.config/waybar/modules.json" + "~/.config/waybar/layout.json" + ]; + "output" = "HDMI-A-1"; + "modules-left" = ["custom/launcher" "cpu" "memory" "temperature"]; + "modules-center" = ["wlr/workspaces"]; + "modules-right" = ["pulseaudio" "network" "backlight" "clock" "tray" "custom/power"]; + }; + alt = { + "output" = "DP-1"; + "modules-left" = ["custom/launcher"]; + "modules-center" = ["wlr/workspaces"]; + "modules-right" = ["custom/power"]; + }; + }; + }; } diff --git a/home/desktop/config/hypr/common.conf b/home/desktop/config/hypr/common.conf deleted file mode 100644 index a9261173..00000000 --- a/home/desktop/config/hypr/common.conf +++ /dev/null @@ -1,97 +0,0 @@ -# See https://wiki.hyprland.org/Configuring/Monitors/ -monitor=,preferred,auto,auto - -# See https://wiki.hyprland.org/Configuring/Keywords/ for more - -# Execute your favorite apps at launch -# exec-once = waybar & hyprpaper & firefox -exec-once = dunst -exec-once = eww daemon - -# Source a file (multi-file configs) -source = ./keybinds.conf -source = ./window-rules.conf - -# Some default env vars. -env = XCURSOR_SIZE,24 - -# For all categories, see https://wiki.hyprland.org/Configuring/Variables/ -input { - kb_layout = gb - kb_variant = - kb_model = - kb_options = - kb_rules = - - follow_mouse = 1 - - touchpad { - natural_scroll = no - } - - sensitivity = 0 # -1.0 - 1.0, 0 means no modification. -} - -general { - # See https://wiki.hyprland.org/Configuring/Variables/ for more - - gaps_in = 5 - gaps_out = 20 - border_size = 2 - col.active_border = rgba(b4befeff) rgba(b4befeff) 45deg - col.group_border_active = rgba(b4befeff) rgba(b4befeff) 45deg - col.inactive_border = rgba(595959aa) - col.group_border = rgba(595959aa) - - layout = dwindle -} - -decoration { - # See https://wiki.hyprland.org/Configuring/Variables/ for more - - active_opacity = 1.0 - inactive_opacity = 1.0 - fullscreen_opacity = 1.0 - rounding = 10 - blur = yes - blur_size = 5 - blur_passes = 3 - blur_new_optimizations = on - blur_xray = off - - drop_shadow = yes - shadow_range = 4 - shadow_render_power = 3 - col.shadow = rgba(1a1a1aee) -} - -animations { - enabled = yes - - # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more - - bezier = myBezier, 0.05, 0.9, 0.1, 1.05 - - animation = windows, 1, 7, myBezier - animation = windowsOut, 1, 7, default, popin 80% - animation = border, 1, 10, default - animation = borderangle, 1, 8, default - animation = fade, 1, 7, default - animation = workspaces, 1, 6, default -} - -dwindle { - # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more - pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below - preserve_split = yes # you probably want this -} - -master { - # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more - new_is_master = true -} - -gestures { - # See https://wiki.hyprland.org/Configuring/Variables/ for more - workspace_swipe = off -} diff --git a/home/desktop/config/hypr/hyprland-H0615.conf b/home/desktop/config/hypr/hyprland-H0615.conf deleted file mode 100644 index 9a223a88..00000000 --- a/home/desktop/config/hypr/hyprland-H0615.conf +++ /dev/null @@ -1,15 +0,0 @@ -source=./hyprland.conf - -monitor=HDMI-A-1,preferred,auto,auto -monitor=DP-1,preferred,auto,auto,transform,1 - -exec-once = waybar -c ~/.config/waybar/config-H0615.json -exec-once = hyprpaper -c ~/.config/hypr/hyprpaper-H0615.conf - -wsbind=1,HDMI-A-1 -wsbind=2,HDMI-A-1 -wsbind=3,HDMI-A-1 -wsbind=4,HDMI-A-1 - -exec-once = librewolf -exec-once = teams diff --git a/home/desktop/config/hypr/hyprland-Vanguard.conf b/home/desktop/config/hypr/hyprland-Vanguard.conf deleted file mode 100644 index 955c7ede..00000000 --- a/home/desktop/config/hypr/hyprland-Vanguard.conf +++ /dev/null @@ -1,11 +0,0 @@ -source=./hyprland.conf - -misc { - vrr = 2 -} - -monitor=DP-1,highrr,auto,1 -monitor=HDMI-A-1,highres,auto,2 - -exec-once = waybar -c ~/.config/waybar/config-Vanguard.json -exec-once=hyprpaper -c ~/.config/hypr/hyprpaper-Vanguard.conf diff --git a/home/desktop/config/hypr/hyprpaper-H0615.conf b/home/desktop/config/hypr/hyprpaper-H0615.conf deleted file mode 100644 index a4dbc267..00000000 --- a/home/desktop/config/hypr/hyprpaper-H0615.conf +++ /dev/null @@ -1,7 +0,0 @@ -preload = /etc/nixos/config/wallpaper/images_dark/1920x1080.png -preload = /etc/nixos/config/wallpaper/images_dark/1920x1200.png -preload = /etc/nixos/config/wallpaper/images_dark/1080x1920.png - -wallpaper = HDMI-A-1,/etc/nixos/config/wallpaper/images_dark/1920x1200.png -wallpaper = DP-1,/etc/nixos/config/wallpaper/images_dark/1080x1920.png -wallpaper = ,/etc/nixos/config/wallpaper/images_dark/1920x1080.png diff --git a/home/desktop/config/hypr/hyprpaper-Vanguard.conf b/home/desktop/config/hypr/hyprpaper-Vanguard.conf deleted file mode 100644 index b6bd2c7a..00000000 --- a/home/desktop/config/hypr/hyprpaper-Vanguard.conf +++ /dev/null @@ -1,2 +0,0 @@ -preload = /etc/nixos/config/wallpaper/images_dark/1920x1080.png -wallpaper = ,/etc/nixos/config/wallpaper/images_dark/1920x1080.png diff --git a/home/desktop/config/hypr/keybinds.conf b/home/desktop/config/hypr/keybinds.conf deleted file mode 100644 index 399aebe5..00000000 --- a/home/desktop/config/hypr/keybinds.conf +++ /dev/null @@ -1,87 +0,0 @@ -# See https://wiki.hyprland.org/Configuring/Keywords/ for more -bind = SUPER, Return, exec, wezterm -bind = SUPER SHIFT, Return, exec, [float] wezterm -bind = SUPER, Q, killactive, -bind = SUPER, E, exec, power-profiles -bind = SUPER, P, exec, powermenu -bind = SUPER, V, togglefloating, -bind = SUPER, Space, exec, rofi -show drun -bind = SUPER, S, togglegroup, # dwindle -bind = SUPER SHIFT, S, changegroupactive, # dwindle -bind = SUPER, G, togglesplit, # dwindle -bind = SUPER, F1, exec, swaylock -bind = SUPER, W, exec, librewolf -bind = SUPER, F, exec, thunar -bind = SUPER, M, fullscreen, 1 -bind = SUPER, A, bringactivetotop - -bind = , XF86AudioMute, exec, pamixer -t -bind = , XF86AudioRaiseVolume, exec, pamixer -i 2 -bind = , XF86AudioLowerVolume, exec, pamixer -d 2 - -# Move focus with mainMod + arrow keys -bind = SUPER, left, movefocus, l -bind = SUPER, H, movefocus, l -bind = SUPER, right, movefocus, r -bind = SUPER, L, movefocus, r -bind = SUPER, up, movefocus, u -bind = SUPER, K, movefocus, u -bind = SUPER, down, movefocus, d -bind = SUPER, J, movefocus, d - -bind = SUPER SHIFT, left, movewindow, l -bind = SUPER SHIFT, H, movewindow, l -bind = SUPER SHIFT, right, movewindow, r -bind = SUPER SHIFT, L, movewindow, r -bind = SUPER SHIFT, up, movewindow, u -bind = SUPER SHIFT, K, movewindow, u -bind = SUPER SHIFT, down, movewindow, d -bind = SUPER SHIFT, J, movewindow, d - -# Switch workspaces with mainMod + [0-9] -bind = SUPER, 1, workspace, 1 -bind = SUPER, 2, workspace, 2 -bind = SUPER, 3, workspace, 3 -bind = SUPER, 4, workspace, 4 -bind = SUPER, 5, workspace, 5 -bind = SUPER, 6, workspace, 6 -bind = SUPER, 7, workspace, 7 -bind = SUPER, 8, workspace, 8 -bind = SUPER, 9, workspace, 9 -bind = SUPER, 0, workspace, 10 - -# Move active window to a workspace with mainMod + SHIFT + [0-9] -bind = SUPER SHIFT, 1, movetoworkspace, 1 -bind = SUPER SHIFT, 2, movetoworkspace, 2 -bind = SUPER SHIFT, 3, movetoworkspace, 3 -bind = SUPER SHIFT, 4, movetoworkspace, 4 -bind = SUPER SHIFT, 5, movetoworkspace, 5 -bind = SUPER SHIFT, 6, movetoworkspace, 6 -bind = SUPER SHIFT, 7, movetoworkspace, 7 -bind = SUPER SHIFT, 8, movetoworkspace, 8 -bind = SUPER SHIFT, 9, movetoworkspace, 9 - -bind = SUPER, period, workspace, m+1 -bind = SUPER, comma, workspace, m-1 - -bind = SUPER SHIFT, period, movetoworkspace, m+1 -bind = SUPER SHIFT, comma, movetoworkspace, m-1 - -bind = SUPER, bracketright, focusmonitor, +1 -bind = SUPER, bracketleft, focusmonitor, +1 - -bind = SUPER SHIFT, bracketright, movecurrentworkspacetomonitor, +1 -bind = SUPER SHIFT, bracketleft, movecurrentworkspacetomonitor, +1 - -bind = SUPER, N, workspace, empty -bind = SUPER SHIFT, N, movetoworkspace, empty - -bind = SUPER, C, togglespecialworkspace -bind = SUPER SHIFT, C, movetoworkspace, special - -bind = SUPER, tab, workspace, previous -bind = SUPER SHIFT, tab, movetoworkspace, previous - -# Move/resize windows with mainMod + LMB/RMB and dragging -bindm = SUPER, mouse:272, movewindow -bindm = SUPER, mouse:273, resizewindow diff --git a/home/desktop/config/hypr/window-rules.conf b/home/desktop/config/hypr/window-rules.conf deleted file mode 100644 index 80d0d39c..00000000 --- a/home/desktop/config/hypr/window-rules.conf +++ /dev/null @@ -1,31 +0,0 @@ -# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more -windowrule = float, ^(foot)$ -windowrule = center, ^(foot)$ -windowrule = tile, ^(neovide)$ -windowrule = float, ^(thunar)$ -windowrule = float, ^(pavucontrol)$ -windowrule = center, ^(pavucontrol)$ -windowrule = float, ^(.blueman-manager-wrapped)$ -windowrule = center, ^(.blueman-manager-wrapped)$ -windowrule = float, ^(otpclient)$ -windowrule = move 2% 6%, ^(otpclient)$ -windowrule = float, title:^([Zz]oom)(.*)$ -windowrule = center, title:^([Zz]oom)(.*)$ - -windowrulev2 = tile,class:^(Nxplayer.bin)$,title:^(NoMachine)(.*)$ -windowrulev2 = float,class:^(Nxplayer.bin)$,title:^(NoMachine)$ -windowrulev2 = center,class:^(Nxplayer.bin)$,title:^(NoMachine)$ - -windowrule = workspace 1, ^(neovide)$ -windowrule = monitor 1, ^(neovide)$ -windowrule = workspace 2, ^(firefox|librewolf)$ -windowrule = monitor 1, ^(firefox|librewolf)$ -windowrule = workspace 3, ^(Microsoft Teams - Preview)$ -windowrule = monitor 1, ^(Microsoft Teams - Preview)$ -windowrule = workspace 3, ^(Element|Signal|discord)$ -windowrule = workspace 3, title:^(Zoom)(.*)$ -windowrule = monitor 1, title:^(Zoom)(.*)$ -windowrule = monitor 1, ^(Steam)$ -windowrule = monitor 1, ^(steamwebhelper)$ -windowrule = workspace 4, ^(Nxplayer.bin)$ -windowrule = monitor 1, ^(Nxplayer.bin)$ diff --git a/home/desktop/config/waybar/config-H0615.json b/home/desktop/config/waybar/config-H0615.json deleted file mode 100644 index 970f7492..00000000 --- a/home/desktop/config/waybar/config-H0615.json +++ /dev/null @@ -1,18 +0,0 @@ -[ - { - "include": ["~/.config/waybar/modules.json", "~/.config/waybar/layout.json"], - "output": "HDMI-A-1", - "modules-left": ["custom/launcher", "cpu", "memory", "temperature"], - "modules-center": ["wlr/workspaces"], - "modules-right": ["pulseaudio", "network", "backlight", "clock", "tray", "custom/power"], - }, - { - "include": ["~/.config/waybar/modules.json", "~/.config/waybar/layout.json"], - "output": "DP-1", - "modules-left": ["custom/launcher"], - "modules-center": ["wlr/workspaces"], - "modules-right": ["custom/power"] - } -] - -// vim: ft=json