From a4c9090d84d449d5b6f54144cf856f6101011e82 Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Tue, 8 Aug 2023 12:21:23 +0100 Subject: [PATCH] Add anyrun plugins, update flake inputs Update hyprland to latest tagged release Move hyprland config inside nix expression so variable substitution can be used Use kanshi to completely control monitor config --- flake.lock | 18 +- home/emacs/default.nix | 12 +- home/hyprland/anyrun/default.nix | 11 +- home/hyprland/default.nix | 326 +++++++++++++++++++++++++++++-- home/hyprland/hyprland.conf | 245 ----------------------- home/hyprland/macchiato.conf | 61 ------ hosts/Ronin/home.nix | 30 ++- 7 files changed, 356 insertions(+), 347 deletions(-) delete mode 100644 home/hyprland/hyprland.conf delete mode 100644 home/hyprland/macchiato.conf diff --git a/flake.lock b/flake.lock index 59bb0492..3dea59b1 100644 --- a/flake.lock +++ b/flake.lock @@ -49,11 +49,11 @@ ] }, "locked": { - "lastModified": 1690303752, - "narHash": "sha256-2YiwFHQERGoaORNORmsdmVlPD8CVVwlwbV2+f77sFhg=", + "lastModified": 1691312444, + "narHash": "sha256-J9e9dGwAPTX+UlAn8jehoyaEq6fwK+L+gunfx0cYT4E=", "owner": "nix-community", "repo": "home-manager", - "rev": "ba2c0737cc848db03470828fdb5e86df75ed42a8", + "rev": "903e06d734bcae48efb79b9afd51b406d2744179", "type": "github" }, "original": { @@ -72,11 +72,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1690453540, - "narHash": "sha256-UDM0gIZcXbooKE+pTL6xAJgHhGIQxSE3XrD8bz8vv3k=", + "lastModified": 1691078410, + "narHash": "sha256-t1Ksv5/xwRgi8oH9jyoIEuMHi9cYIZSg3yEJLYMb78Y=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "2ea7d10d049e26c9829912da1d16f7f35f5b265d", + "rev": "9654749244117f7f150c6f2a2ce4dede6e8cbb25", "type": "github" }, "original": { @@ -108,11 +108,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1690272529, - "narHash": "sha256-MakzcKXEdv/I4qJUtq/k/eG+rVmyOZLnYNC2w1mB59Y=", + "lastModified": 1691368598, + "narHash": "sha256-ia7li22keBBbj02tEdqjVeLtc7ZlSBuhUk+7XTUFr14=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ef99fa5c5ed624460217c31ac4271cfb5cb2502c", + "rev": "5a8e9243812ba528000995b294292d3b5e120947", "type": "github" }, "original": { diff --git a/home/emacs/default.nix b/home/emacs/default.nix index a3d4f8f7..dbb3b4e2 100644 --- a/home/emacs/default.nix +++ b/home/emacs/default.nix @@ -33,17 +33,9 @@ python3Packages.mdformat # LSP servers - rnix-lsp + nil fortls - (python3.withPackages (ps: with ps; [ - python-lsp-server - python-lsp-ruff - python-lsp-black - pyls-isort - pylsp-mypy - pylsp-rope - ])) - # nodePackages.pyright + nodePackages.pyright nodePackages.yaml-language-server nodePackages.bash-language-server nodePackages.vscode-html-languageserver-bin diff --git a/home/hyprland/anyrun/default.nix b/home/hyprland/anyrun/default.nix index a514c539..223b8d2a 100644 --- a/home/hyprland/anyrun/default.nix +++ b/home/hyprland/anyrun/default.nix @@ -2,10 +2,19 @@ let anyrunPackages = anyrun.packages.${pkgs.system}; in { imports = [ anyrun.homeManagerModules.default ]; + home.packages = with pkgs; [ rink ]; programs.anyrun = { enable = true; config = { - plugins = [ anyrunPackages.applications ]; + plugins = with anyrunPackages; [ + applications + dictionary + rink + shell + stdin + symbols + translate + ]; hideIcons = false; ignoreExclusiveZones = false; layer = "overlay"; diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index bfa5992a..cb44fbdc 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, config, hyprland, wallpapers, ... }: +{ pkgs, config, hyprland, anyrun, wallpapers, ... }: let configure-gtk = pkgs.writeTextFile { name = "configure-gtk"; @@ -28,7 +28,7 @@ in { ./gtk.nix ./mako.nix ]; - home.packages = [ configure-gtk ]; + home.packages = with pkgs; [ libsForQt5.polkit-kde-agent configure-gtk ]; programs = { firefox.package = pkgs.firefox-wayland; rofi.package = pkgs.rofi-wayland; @@ -36,10 +36,6 @@ in { services.kanshi = { enable = true; systemdTarget = "hyprland-session.target"; - profiles.default = { - outputs = [{ criteria = "*"; }]; - exec = "${pkgs.swww}/bin/swww img ${wallpapers.outputs.default}"; - }; }; wayland.windowManager.hyprland = { enable = true; @@ -48,11 +44,317 @@ in { enable = true; hidpi = true; }; - extraConfig = builtins.readFile ./hyprland.conf; - }; - xdg.configFile = { - "hypr/macchiato.conf".source = ./macchiato.conf; - "hypr/display.conf".text = lib.mkDefault ""; - "hypr/autostart.conf".text = lib.mkDefault ""; + extraConfig = '' + source = ./macchiato.conf + monitor=,preferred,auto,auto + + env = XDG_CURRENT_DESKTOP=Hyprland + env = XDG_SESSION_TYPE=wayland + env = XDG_SESSION_DESKTOP=Hyprland + env = GDK_BACKEND=wayland,x11 + env = GTK_THEME,Sweet-Dark + env = XCURSOR_THEME,Catppuccin-Macchiato-Dark-Cursors + env = XCURSOR_SIZE,24 + env = QT_AUTO_SCREEN_SCALE_FACTOR=1 + env = QT_QPA_PLATFORM=wayland;xcb + env = QT_WAYLAND_DISABLE_WINDOWDECORATION=1 + env = MOZ_ENABLE_WAYLAND=1 + + input { + kb_layout = gb + follow_mouse = 1 + touchpad { + natural_scroll = yes + } + } + + general { + gaps_in = 5 + gaps_out = 10 + border_size = 3 + col.active_border = $mauve + col.group_border_active = $mauve + col.inactive_border = $surface2 + col.group_border = $surface2 + cursor_inactive_timeout = 5 + layout = dwindle + } + + dwindle { + force_split = 2 + preserve_split = true + } + + decoration { + rounding = 10 + drop_shadow = yes + shadow_range = 4 + shadow_render_power = 3 + blur { + enabled = true + size = 5 + passes = 3 + ignore_opacity = false + new_optimizations = on + xray = false + } + } + + animations { + enabled = yes + 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 + } + + XWayland { + force_zero_scaling = true + } + + # See https://wiki.hyprland.org/Configuring/Keywords/ for more + bind = SUPER, Return, exec, ${pkgs.alacritty}/bin/alacritty + bind = SUPER, F1, exec, ${pkgs.swaylock}/bin/swaylock + bind = SUPER, X, exec, emacsclient -c -a 'emacs' + bind = SUPER, T, exec, ${pkgs.xfce.thunar}/bin/thunar + + # anyrun/rofi binds + bind = SUPER, Space, exec, ${ + anyrun.packages.${pkgs.system}.anyrun + }/bin/anyrun + bind = SUPER SHIFT, Return, exec, pkill rofi || ${pkgs.rofi}/bin/rofi -show ssh + bind = SUPER SHIFT, P, exec, pkill rofi || ${pkgs.rofi}/bin/rofi -show power-menu + + bind = SUPER, B, togglefloating + bind = SUPER SHIFT, Q, killactive, + bind = SUPER, M, fullscreen, 1 + bind = SUPER SHIFT, M, fullscreen, 0 + + # Misc useful binds + bind=,Print,exec,${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp)" + # Sound + bind=,XF86AudioMute,exec,${pkgs.pamixer}/bin/pamixer -t + binde=,XF86AudioRaiseVolume,exec,${pkgs.pamixer}/bin/pamixer -i 5 + binde=,XF86AudioLowerVolume,exec,${pkgs.pamixer}/bin/pamixer -d 5 + # Brightness + binde=,XF86MonBrightnessUp,exec,${pkgs.brightnessctl}/bin/brightnessctl s +5% + binde=,XF86MonBrightnessDown,exec,${pkgs.brightnessctl}/bin/brightnessctl s 5%- + # Playback + binde=,XF86AudioPlay,exec,${pkgs.playerctl}/bin/playerctl play-pause + binde=,XF86AudioStop,exec,${pkgs.playerctl}/bin/playerctl play-pause + binde=,XF86AudioPrev,exec,${pkgs.playerctl}/bin/playerctl previous + binde=,XF86AudioNext,exec,${pkgs.playerctl}/bin/playerctl next + + bind = SUPER, H, movefocus, l + bind = SUPER, L, movefocus, r + bind = SUPER, K, movefocus, u + bind = SUPER, J, movefocus, d + bind = SUPER SHIFT, H, movewindow, l + bind = SUPER SHIFT, L, movewindow, r + bind = SUPER SHIFT, K, movewindow, u + bind = SUPER SHIFT, J, movewindow, d + + # Workspace definitions + # home + bind = SUPER, A, moveworkspacetomonitor, name:home current + bind = SUPER, A, workspace, name:home + bind = SUPER SHIFT, A, movetoworkspace, name:home + + # browser + bind = SUPER, W, moveworkspacetomonitor, name:browser current + bind = SUPER, W, workspace, name:browser + bind = SUPER SHIFT, W, movetoworkspace, name:browser + windowrule = workspace name:browser,(firefox) + windowrulev2 = float,title:(File|Picture-in-Picture),class:(firefox) + windowrulev2 = pin,title:(File|Picture-in-Picture),class:(firefox) + + # email + bind = SUPER, E, moveworkspacetomonitor, name:email current + bind = SUPER, E, workspace, name:email + bind = SUPER SHIFT, E, movetoworkspace, name:email + windowrule = workspace name:email,(thunderbird) + + # files + bind = SUPER, F, moveworkspacetomonitor, name:files current + bind = SUPER, F, workspace, name:files + bind = SUPER SHIFT, F, movetoworkspace, name:files + windowrule = workspace name:files,(org.pwmt.zathura) + windowrule = workspace name:files,^(libreoffice).* + windowrule = workspace name:files,(Zotero) + windowrule = workspace name:files,(thunar) + windowrulev2 = workspace name:files,title:(Open),class:(soffice) + windowrulev2 = float,title:(Open),class:(soffice) + + # chat + bind = SUPER, C, moveworkspacetomonitor, name:chat current + bind = SUPER, C, workspace, name:chat + bind = SUPER SHIFT, C, movetoworkspace, name:chat + windowrule = workspace name:chat,(Signal) + windowrule = workspace name:chat,(fractal) + windowrule = workspace name:chat,(discord) + windowrule = workspace name:chat,(teams-for-linux) + + # call + bind = SUPER, Z, moveworkspacetomonitor, name:call current + bind = SUPER, Z, workspace, name:call + bind = SUPER SHIFT, Z, movetoworkspace, name:call + windowrulev2 = workspace name:call,title:(Zoom|zoom) + windowrulev2 = float,title:(Zoom|zoom) + windowrulev2 = center,title:(Zoom|zoom) + windowrulev2 = maxsize 800 600,title:(Zoom|zoom) + windowrulev2 = nofullscreenrequest,title:(Zoom|zoom) + windowrulev2 = nomaximizerequest,title:(Zoom|zoom) + + # music + bind = SUPER, S, moveworkspacetomonitor, name:music current + bind = SUPER, S, workspace, name:music + bind = SUPER SHIFT, S, movetoworkspace, name:music + windowrulev2 = workspace name:music,title:(ncspot) + + # vault + bind = SUPER, V, moveworkspacetomonitor, name:vault current + bind = SUPER, V, workspace, name:vault + bind = SUPER SHIFT, V, movetoworkspace, name:vault + windowrule = workspace name:vault,(Bitwarden) + + # remote + bind = SUPER, R, moveworkspacetomonitor, name:remote current + bind = SUPER, R, workspace, name:remote + bind = SUPER SHIFT, R, movetoworkspace, name:remote + windowrule = workspace name:remote,(Nxplayer.bin) + windowrule = float,(Nxplayer.bin) + windowrule = center,(Nxplayer.bin) + windowrule = maxsize 1700 900,(Nxplayer.bin) + windowrule = nofullscreenrequest,(Nxplayer.bin) + windowrule = nomaximizerequest,(Nxplayer.bin) + + # Numbered workspaces + bind = SUPER, 1, moveworkspacetomonitor, 1 current + bind = SUPER, 1, workspace, 1 + bind = SUPER SHIFT, 1, movetoworkspace, 1 + bind = SUPER, 2, moveworkspacetomonitor, 2 current + bind = SUPER, 2, workspace, 2 + bind = SUPER SHIFT, 2, movetoworkspace, 2 + bind = SUPER, 3, moveworkspacetomonitor, 3 current + bind = SUPER, 3, workspace, 3 + bind = SUPER SHIFT, 3, movetoworkspace, 3 + bind = SUPER, 4, moveworkspacetomonitor, 4 current + bind = SUPER, 4, workspace, 4 + bind = SUPER SHIFT, 4, movetoworkspace, 4 + bind = SUPER, 5, moveworkspacetomonitor, 5 current + bind = SUPER, 5, workspace, 5 + bind = SUPER SHIFT, 5, movetoworkspace, 5 + bind = SUPER, 6, moveworkspacetomonitor, 6 current + bind = SUPER, 6, workspace, 6 + bind = SUPER SHIFT, 6, movetoworkspace, 6 + bind = SUPER, 7, moveworkspacetomonitor, 7 current + bind = SUPER, 7, workspace, 7 + bind = SUPER SHIFT, 7, movetoworkspace, 7 + bind = SUPER, 8, moveworkspacetomonitor, 8 current + bind = SUPER, 8, workspace, 8 + bind = SUPER SHIFT, 8, movetoworkspace, 8 + bind = SUPER, 9, moveworkspacetomonitor, 9 current + bind = SUPER, 9, workspace, 9 + bind = SUPER SHIFT, 9, movetoworkspace, 9 + + # Special workspaces + bind = SUPER, N, workspace, empty + bind = SUPER SHIFT, N, movetoworkspace, empty + bind = SUPER, minus, togglespecialworkspace + bind = SUPER SHIFT, minus, movetoworkspace, special + bind = SUPER, tab, workspace, previous + bind = SUPER SHIFT, tab, movetoworkspace, previous + bind = SUPER, bracketright, focusmonitor, +1 + bind = SUPER SHIFT, bracketright, movecurrentworkspacetomonitor, +1 + bind = SUPER, bracketleft, focusmonitor, -1 + bind = SUPER SHIFT, bracketleft, movecurrentworkspacetomonitor, -1 + bind = SUPER, U, focusurgentorlast + + # Move/resize windows with mainMod + LMB/RMB and dragging + bindm = SUPER, mouse:272, movewindow + bindm = SUPER, mouse:273, resizewindow + + # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more + + windowrule = float,(pavucontrol) + windowrule = size 800 600,(pavucontrol) + windowrule = move 100%-820 10%,(pavucontrol) + windowrule = float,(.blueman-manager-wrapped) + windowrule = size 800 600,(.blueman-manager-wrapped) + windowrule = move 100%-820 10%,(.blueman-manager-wrapped) + windowrule = float,(nm-connection-editor) + windowrule = size 800 600,(nm-connection-editor) + windowrule = move 100%-820 10%,(nm-connection-editor) + + exec-once = ${pkgs.libsForQt5.polkit-kde-agent}/bin/polkit-kde-authentication-agent-1 + exec-once = ${pkgs.waybar}/bin/waybar + exec-once = ${pkgs.swww}/bin/swww init && ${pkgs.swww}/bin/swww img ${wallpapers.outputs.default} + ''; }; + xdg.configFile."hypr/macchiato.conf".text = '' + $rosewaterAlpha = f4dbd6 + $flamingoAlpha = f0c6c6 + $pinkAlpha = f5bde6 + $mauveAlpha = c6a0f6 + $redAlpha = ed8796 + $maroonAlpha = ee99a0 + $peachAlpha = f5a97f + $yellowAlpha = eed49f + $greenAlpha = a6da95 + $tealAlpha = 8bd5ca + $skyAlpha = 91d7e3 + $sapphireAlpha = 7dc4e4 + $blueAlpha = 8aadf4 + $lavenderAlpha = b7bdf8 + + $textAlpha = cad3f5 + $subtext1Alpha = b8c0e0 + $subtext0Alpha = a5adcb + + $overlay2Alpha = 939ab7 + $overlay1Alpha = 8087a2 + $overlay0Alpha = 6e738d + + $surface2Alpha = 5b6078 + $surface1Alpha = 494d64 + $surface0Alpha = 363a4f + + $baseAlpha = 24273a + $mantleAlpha = 1e2030 + $crustAlpha = 181926 + + $rosewater = 0xfff5e0dc + $flamingo = 0xfff2cdcd + $pink = 0xfff5c2e7 + $mauve = 0xffcba6f7 + $red = 0xfff38ba8 + $maroon = 0xffeba0ac + $peach = 0xfffab387 + $yellow = 0xfff9e2af + $green = 0xffa6e3a1 + $teal = 0xff94e2d5 + $sky = 0xff89dceb + $sapphire = 0xff74c7ec + $blue = 0xff89b4fa + $lavender = 0xffb4befe + + $text = 0xffcdd6f4 + $subtext1 = 0xffbac2de + $subtext0 = 0xffa6adc8 + + $overlay2 = 0xff9399b2 + $overlay1 = 0xff7f849c + $overlay0 = 0xff6c7086 + + $surface2 = 0xff585b70 + $surface1 = 0xff45475a + $surface0 = 0xff313244 + + $base = 0xff1e1e2e + $mantle = 0xff181825 + $crust = 0xff11111b + ''; } diff --git a/home/hyprland/hyprland.conf b/home/hyprland/hyprland.conf deleted file mode 100644 index bd0ee593..00000000 --- a/home/hyprland/hyprland.conf +++ /dev/null @@ -1,245 +0,0 @@ -exec-once = swww init - -source = ./macchiato.conf -source = ./display.conf - -monitor=,preferred,auto,auto - -env = XDG_CURRENT_DESKTOP=Hyprland -env = XDG_SESSION_TYPE=wayland -env = XDG_SESSION_DESKTOP=Hyprland -env = GDK_BACKEND=wayland,x11 -env = GTK_THEME,Sweet-Dark -env = XCURSOR_THEME,Catppuccin-Macchiato-Dark-Cursors -env = XCURSOR_SIZE,24 -env = QT_AUTO_SCREEN_SCALE_FACTOR=1 -env = QT_QPA_PLATFORM=wayland;xcb -env = QT_WAYLAND_DISABLE_WINDOWDECORATION=1 -env = MOZ_ENABLE_WAYLAND=1 - -input { - kb_layout = gb - follow_mouse = 1 - touchpad { - natural_scroll = yes - } -} - -general { - gaps_in = 5 - gaps_out = 10 - border_size = 3 - col.active_border = $mauve - col.group_border_active = $mauve - col.inactive_border = $surface2 - col.group_border = $surface2 - cursor_inactive_timeout = 5 - layout = dwindle -} - -dwindle { - force_split = 2 - preserve_split = true -} - -decoration { - 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 -} - -animations { - enabled = yes - 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 -} - -XWayland { - force_zero_scaling = true -} - -# See https://wiki.hyprland.org/Configuring/Keywords/ for more -bind = SUPER, Return, exec, alacritty -bind = SUPER, F1, exec, swaylock -bind = SUPER, X, exec, emacsclient -c -a 'emacs' -bind = SUPER, T, exec, thunar - -# anyrun/rofi binds -bind = SUPER, Space, exec, anyrun -bind = SUPER SHIFT, Return, exec, pkill rofi || rofi -show ssh -bind = SUPER SHIFT, P, exec, pkill rofi || rofi -show power-menu - -bind = SUPER, B, togglefloating -bind = SUPER SHIFT, Q, killactive, -bind = SUPER, M, fullscreen, 1 -bind = SUPER SHIFT, M, fullscreen, 0 - -# Misc useful binds -bind=,Print,exec,grim -g "$(slurp)" -# Sound -bind=,XF86AudioMute,exec,pamixer -t -binde=,XF86AudioRaiseVolume,exec,pamixer -i 5 -binde=,XF86AudioLowerVolume,exec,pamixer -d 5 -# Brightness -binde=,XF86MonBrightnessUp,exec,brightnessctl s +5% -binde=,XF86MonBrightnessDown,exec,brightnessctl s 5%- -# Playback -binde=,XF86AudioPlay,exec,playerctl play-pause -binde=,XF86AudioStop,exec,playerctl play-pause -binde=,XF86AudioPrev,exec,playerctl previous -binde=,XF86AudioNext,exec,playerctl next - -bind = SUPER, H, movefocus, l -bind = SUPER, L, movefocus, r -bind = SUPER, K, movefocus, u -bind = SUPER, J, movefocus, d -bind = SUPER SHIFT, H, movewindow, l -bind = SUPER SHIFT, L, movewindow, r -bind = SUPER SHIFT, K, movewindow, u -bind = SUPER SHIFT, J, movewindow, d - -# Workspace definitions -# home -bind = SUPER, A, moveworkspacetomonitor, name:home current -bind = SUPER, A, workspace, name:home -bind = SUPER SHIFT, A, movetoworkspace, name:home - -# browser -bind = SUPER, W, moveworkspacetomonitor, name:browser current -bind = SUPER, W, workspace, name:browser -bind = SUPER SHIFT, W, movetoworkspace, name:browser -windowrule = workspace name:browser,(firefox) -windowrulev2 = float,title:(File|Picture-in-Picture),class:(firefox) -windowrulev2 = pin,title:(File|Picture-in-Picture),class:(firefox) - -# email -bind = SUPER, E, moveworkspacetomonitor, name:email current -bind = SUPER, E, workspace, name:email -bind = SUPER SHIFT, E, movetoworkspace, name:email -windowrule = workspace name:email,(thunderbird) - -# files -bind = SUPER, F, moveworkspacetomonitor, name:files current -bind = SUPER, F, workspace, name:files -bind = SUPER SHIFT, F, movetoworkspace, name:files -windowrule = workspace name:files,(org.pwmt.zathura) -windowrule = workspace name:files,^(libreoffice).* -windowrule = workspace name:files,(Zotero) -windowrule = workspace name:files,(thunar) -windowrulev2 = workspace name:files,title:(Open),class:(soffice) -windowrulev2 = float,title:(Open),class:(soffice) - -# chat -bind = SUPER, C, moveworkspacetomonitor, name:chat current -bind = SUPER, C, workspace, name:chat -bind = SUPER SHIFT, C, movetoworkspace, name:chat -windowrule = workspace name:chat,(Signal) -windowrule = workspace name:chat,(fractal) -windowrule = workspace name:chat,(discord) -windowrule = workspace name:chat,(teams-for-linux) - -# call -bind = SUPER, Z, moveworkspacetomonitor, name:call current -bind = SUPER, Z, workspace, name:call -bind = SUPER SHIFT, Z, movetoworkspace, name:call -windowrulev2 = workspace name:call,title:(Zoom|zoom) -windowrulev2 = float,title:(Zoom|zoom) -windowrulev2 = center,title:(Zoom|zoom) -windowrulev2 = maxsize 800 600,title:(Zoom|zoom) -windowrulev2 = nofullscreenrequest,title:(Zoom|zoom) -windowrulev2 = nomaximizerequest,title:(Zoom|zoom) - -# music -bind = SUPER, S, moveworkspacetomonitor, name:music current -bind = SUPER, S, workspace, name:music -bind = SUPER SHIFT, S, movetoworkspace, name:music -windowrulev2 = workspace name:music,title:(ncspot) - -# vault -bind = SUPER, V, moveworkspacetomonitor, name:vault current -bind = SUPER, V, workspace, name:vault -bind = SUPER SHIFT, V, movetoworkspace, name:vault -windowrule = workspace name:vault,(Bitwarden) - -# remote -bind = SUPER, R, moveworkspacetomonitor, name:remote current -bind = SUPER, R, workspace, name:remote -bind = SUPER SHIFT, R, movetoworkspace, name:remote -windowrule = workspace name:remote,(Nxplayer.bin) -windowrule = float,(Nxplayer.bin) -windowrule = center,(Nxplayer.bin) -windowrule = maxsize 1700 900,(Nxplayer.bin) -windowrule = nofullscreenrequest,(Nxplayer.bin) -windowrule = nomaximizerequest,(Nxplayer.bin) - -# Numbered workspaces -bind = SUPER, 1, moveworkspacetomonitor, 1 current -bind = SUPER, 1, workspace, 1 -bind = SUPER SHIFT, 1, movetoworkspace, 1 -bind = SUPER, 2, moveworkspacetomonitor, 2 current -bind = SUPER, 2, workspace, 2 -bind = SUPER SHIFT, 2, movetoworkspace, 2 -bind = SUPER, 3, moveworkspacetomonitor, 3 current -bind = SUPER, 3, workspace, 3 -bind = SUPER SHIFT, 3, movetoworkspace, 3 -bind = SUPER, 4, moveworkspacetomonitor, 4 current -bind = SUPER, 4, workspace, 4 -bind = SUPER SHIFT, 4, movetoworkspace, 4 -bind = SUPER, 5, moveworkspacetomonitor, 5 current -bind = SUPER, 5, workspace, 5 -bind = SUPER SHIFT, 5, movetoworkspace, 5 -bind = SUPER, 6, moveworkspacetomonitor, 6 current -bind = SUPER, 6, workspace, 6 -bind = SUPER SHIFT, 6, movetoworkspace, 6 -bind = SUPER, 7, moveworkspacetomonitor, 7 current -bind = SUPER, 7, workspace, 7 -bind = SUPER SHIFT, 7, movetoworkspace, 7 -bind = SUPER, 8, moveworkspacetomonitor, 8 current -bind = SUPER, 8, workspace, 8 -bind = SUPER SHIFT, 8, movetoworkspace, 8 -bind = SUPER, 9, moveworkspacetomonitor, 9 current -bind = SUPER, 9, workspace, 9 -bind = SUPER SHIFT, 9, movetoworkspace, 9 - -# Special workspaces -bind = SUPER, N, workspace, empty -bind = SUPER SHIFT, N, movetoworkspace, empty -bind = SUPER, minus, togglespecialworkspace -bind = SUPER SHIFT, minus, movetoworkspace, special -bind = SUPER, tab, workspace, previous -bind = SUPER SHIFT, tab, movetoworkspace, previous -bind = SUPER, bracketright, focusmonitor, +1 -bind = SUPER SHIFT, bracketright, movecurrentworkspacetomonitor, +1 -bind = SUPER, bracketleft, focusmonitor, -1 -bind = SUPER SHIFT, bracketleft, movecurrentworkspacetomonitor, -1 -bind = SUPER, U, focusurgentorlast - -# Move/resize windows with mainMod + LMB/RMB and dragging -bindm = SUPER, mouse:272, movewindow -bindm = SUPER, mouse:273, resizewindow - -# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more - -windowrule = float,(pavucontrol) -windowrule = size 800 600,(pavucontrol) -windowrule = move 100%-820 10%,(pavucontrol) -windowrule = float,(.blueman-manager-wrapped) -windowrule = size 800 600,(.blueman-manager-wrapped) -windowrule = move 100%-820 10%,(.blueman-manager-wrapped) -windowrule = float,(nm-connection-editor) -windowrule = size 800 600,(nm-connection-editor) -windowrule = move 100%-820 10%,(nm-connection-editor) - -exec-once = waybar -source = ./autostart.conf diff --git a/home/hyprland/macchiato.conf b/home/hyprland/macchiato.conf deleted file mode 100644 index 91a88a15..00000000 --- a/home/hyprland/macchiato.conf +++ /dev/null @@ -1,61 +0,0 @@ -$rosewaterAlpha = f4dbd6 -$flamingoAlpha = f0c6c6 -$pinkAlpha = f5bde6 -$mauveAlpha = c6a0f6 -$redAlpha = ed8796 -$maroonAlpha = ee99a0 -$peachAlpha = f5a97f -$yellowAlpha = eed49f -$greenAlpha = a6da95 -$tealAlpha = 8bd5ca -$skyAlpha = 91d7e3 -$sapphireAlpha = 7dc4e4 -$blueAlpha = 8aadf4 -$lavenderAlpha = b7bdf8 - -$textAlpha = cad3f5 -$subtext1Alpha = b8c0e0 -$subtext0Alpha = a5adcb - -$overlay2Alpha = 939ab7 -$overlay1Alpha = 8087a2 -$overlay0Alpha = 6e738d - -$surface2Alpha = 5b6078 -$surface1Alpha = 494d64 -$surface0Alpha = 363a4f - -$baseAlpha = 24273a -$mantleAlpha = 1e2030 -$crustAlpha = 181926 - -$rosewater = 0xfff5e0dc -$flamingo = 0xfff2cdcd -$pink = 0xfff5c2e7 -$mauve = 0xffcba6f7 -$red = 0xfff38ba8 -$maroon = 0xffeba0ac -$peach = 0xfffab387 -$yellow = 0xfff9e2af -$green = 0xffa6e3a1 -$teal = 0xff94e2d5 -$sky = 0xff89dceb -$sapphire = 0xff74c7ec -$blue = 0xff89b4fa -$lavender = 0xffb4befe - -$text = 0xffcdd6f4 -$subtext1 = 0xffbac2de -$subtext0 = 0xffa6adc8 - -$overlay2 = 0xff9399b2 -$overlay1 = 0xff7f849c -$overlay0 = 0xff6c7086 - -$surface2 = 0xff585b70 -$surface1 = 0xff45475a -$surface0 = 0xff313244 - -$base = 0xff1e1e2e -$mantle = 0xff181825 -$crust = 0xff11111b diff --git a/hosts/Ronin/home.nix b/hosts/Ronin/home.nix index 8dc032a5..f1a58a34 100644 --- a/hosts/Ronin/home.nix +++ b/hosts/Ronin/home.nix @@ -145,7 +145,10 @@ in { undocked = { outputs = [{ criteria = "eDP-1"; + mode = "1920x1080"; position = "0,0"; + scale = 1.0; + status = "enable"; }]; exec = "${pkgs.swww}/bin/swww img ${wallpapers.outputs.default}"; }; @@ -153,15 +156,24 @@ in { outputs = [ { criteria = "eDP-1"; - position = "0,485"; + mode = "1920x1080"; + position = "0,305"; + scale = 1.0; + status = "enable"; } { criteria = "Iiyama North America PLB2403WS 0574281251316"; - position = "1536,185"; + mode = "1920x1200"; + position = "1920,185"; + scale = 1.0; + status = "enable"; } { criteria = "Dell Inc. DELL U2417H 5K9YD872FY1L"; - position = "1920,0"; + mode = "1920x1080"; + position = "3840,0"; + scale = 1.0; + status = "enable"; } ]; exec = "${pkgs.swww}/bin/swww img ${wallpapers.outputs.default}"; @@ -170,20 +182,20 @@ in { outputs = [ { criteria = "Acer Technologies ED270R TJMEE0043W01"; + mode = "1920x1080@165.00"; position = "0,0"; + scale = 1.0; + status = "enable"; } { criteria = "eDP-1"; + mode = "1920x1080"; position = "1920,0"; + scale = 1.0; + status = "enable"; } ]; exec = "${pkgs.swww}/bin/swww img ${wallpapers.outputs.default}"; }; }; - xdg.configFile."hypr/display.conf".text = '' - monitor=desc:eDP-1,preferred,auto,1.25 - monitor=desc:Iiyama North America PLB2403WS 0574281251316,preferred,0x185,1 - monitor=desc:Dell Inc. DELL U2417H 5K9YD872FY1L,preferred,1920x0,1,transform,1 - monitor=desc:Acer Technologies ED270R TJMEE0043W01,highrr,auto,1 - ''; }