From b1659e6633075dda05bf010511d8ed88fcee2283 Mon Sep 17 00:00:00 2001 From: iiogama Date: Mon, 8 Jan 2024 20:13:13 -0800 Subject: [PATCH] Swapped out dunst for mako. I think dunst was only working because X was still installed, I thought it was wayland compatible. --- home-manager/dots/hypr/hyprland.conf | 80 ++++++++++++++-------------- home-manager/dots/mako/config | 14 +++++ home-manager/gui.nix | 7 --- home-manager/wayland.nix | 15 ++++-- home-manager/xorg.nix | 5 ++ nixos/gui.nix | 1 - nixos/wayland.nix | 1 + nixos/xorg.nix | 1 + 8 files changed, 71 insertions(+), 53 deletions(-) create mode 100644 home-manager/dots/mako/config diff --git a/home-manager/dots/hypr/hyprland.conf b/home-manager/dots/hypr/hyprland.conf index b26e9a9..909cad2 100644 --- a/home-manager/dots/hypr/hyprland.conf +++ b/home-manager/dots/hypr/hyprland.conf @@ -12,7 +12,7 @@ exec-once = nm-applet exec-once = mullvad-gui exec-once = wl-paste --type text --watch cliphist store exec-once = wl-paste --type image --watch cliphist store -exec-once = dunst +exec-once = mako exec-once = swww init exec-once = swww img $HOME/Pictures/wallpapers/bliss-night.png --transition-type simple @@ -30,7 +30,7 @@ workspace=6,monitor:DP-2 workspace=7,monitor:DP-2 workspace=8,monitor:DP-2 workspace=9,monitor:DP-2 -workspace=0,monitor:DP-2 +workspace=10,monitor:DP-2 # Source a file (multi-file configs) # source = ~/.config/hypr/myColors.conf @@ -127,61 +127,61 @@ bind = ALT, TAB, cyclenext bind = ALT Shift, TAB, cyclenext, prev # Move window -bind = $MOD ALT, h, movewindow, l -bind = $MOD ALT, j, movewindow, d -bind = $MOD ALT, k, movewindow, u -bind = $MOD ALT, l, movewindow, r +bind = $MOD CTRL, h, movewindow, l +bind = $MOD CTRL, j, movewindow, d +bind = $MOD CTRL, k, movewindow, u +bind = $MOD CTRL, l, movewindow, r # Swap window -bind = $MOD CTRL, h, swapwindow, l -bind = $MOD CTRL, j, swapwindow, d -bind = $MOD CTRL, k, swapwindow, u -bind = $MOD CTRL, l, swapwindow, r +bind = $MOD SHIFT, h, swapwindow, l +bind = $MOD SHIFT, j, swapwindow, d +bind = $MOD SHIFT, k, swapwindow, u +bind = $MOD SHIFT, l, swapwindow, r # Focus workspace bind = $MOD, 1, workspace, 1 -bind = $MOD, 1, exec, notify-desktop "$(hyprctl activeworkspace)" +bind = $MOD, 1, exec, notify-send "$(hyprctl activeworkspace)" bind = $MOD, 2, workspace, 2 -bind = $MOD, 2, exec, notify-desktop "$(hyprctl activeworkspace)" +bind = $MOD, 2, exec, notify-send "$(hyprctl activeworkspace)" bind = $MOD, 3, workspace, 3 -bind = $MOD, 3, exec, notify-desktop "$(hyprctl activeworkspace)" +bind = $MOD, 3, exec, notify-send "$(hyprctl activeworkspace)" bind = $MOD, 4, workspace, 4 -bind = $MOD, 4, exec, notify-desktop "$(hyprctl activeworkspace)" +bind = $MOD, 4, exec, notify-send "$(hyprctl activeworkspace)" bind = $MOD, 5, workspace, 5 -bind = $MOD, 5, exec, notify-desktop "$(hyprctl activeworkspace)" +bind = $MOD, 5, exec, notify-send "$(hyprctl activeworkspace)" bind = $MOD, 6, workspace, 6 -bind = $MOD, 6, exec, notify-desktop "$(hyprctl activeworkspace)" +bind = $MOD, 6, exec, notify-send "$(hyprctl activeworkspace)" bind = $MOD, 7, workspace, 7 -bind = $MOD, 7, exec, notify-desktop "$(hyprctl activeworkspace)" +bind = $MOD, 7, exec, notify-send "$(hyprctl activeworkspace)" bind = $MOD, 8, workspace, 8 -bind = $MOD, 8, exec, notify-desktop "$(hyprctl activeworkspace)" +bind = $MOD, 8, exec, notify-send "$(hyprctl activeworkspace)" bind = $MOD, 9, workspace, 9 -bind = $MOD, 9, exec, notify-desktop "$(hyprctl activeworkspace)" +bind = $MOD, 9, exec, notify-send "$(hyprctl activeworkspace)" bind = $MOD, 0, workspace, 10 -bind = $MOD, 0, exec, notify-desktop "$(hyprctl activeworkspace)" +bind = $MOD, 0, exec, notify-send "$(hyprctl activeworkspace)" bind = $MOD, TAB, workspace, previous # Move active window to a workspace with mainMod + SHIFT + [0-9] -bind = $MOD CTRL, 1, movetoworkspace, 1 -bind = $MOD CTRL, 1, exec, notify-desktop "$(hyprctl activeworkspace)" -bind = $MOD CTRL, 2, movetoworkspace, 2 -bind = $MOD CTRL, 2, exec, notify-desktop "$(hyprctl activeworkspace)" -bind = $MOD CTRL, 3, movetoworkspace, 3 -bind = $MOD CTRL, 3, exec, notify-desktop "$(hyprctl activeworkspace)" -bind = $MOD CTRL, 4, movetoworkspace, 4 -bind = $MOD CTRL, 4, exec, notify-desktop "$(hyprctl activeworkspace)" -bind = $MOD CTRL, 5, movetoworkspace, 5 -bind = $MOD CTRL, 5, exec, notify-desktop "$(hyprctl activeworkspace)" -bind = $MOD CTRL, 6, movetoworkspace, 6 -bind = $MOD CTRL, 6, exec, notify-desktop "$(hyprctl activeworkspace)" -bind = $MOD CTRL, 7, movetoworkspace, 7 -bind = $MOD CTRL, 7, exec, notify-desktop "$(hyprctl activeworkspace)" -bind = $MOD CTRL, 8, movetoworkspace, 8 -bind = $MOD CTRL, 8, exec, notify-desktop "$(hyprctl activeworkspace)" -bind = $MOD CTRL, 9, movetoworkspace, 9 -bind = $MOD CTRL, 9, exec, notify-desktop "$(hyprctl activeworkspace)" -bind = $MOD CTRL, 0, movetoworkspace, 10 -bind = $MOD CTRL, 0, exec, notify-desktop "$(hyprctl activeworkspace)" +bind = $MOD SHIFT, 1, movetoworkspace, 1 +bind = $MOD SHIFT, 1, exec, notify-send "$(hyprctl activeworkspace)" +bind = $MOD SHIFT, 2, movetoworkspace, 2 +bind = $MOD SHIFT, 2, exec, notify-send "$(hyprctl activeworkspace)" +bind = $MOD SHIFT, 3, movetoworkspace, 3 +bind = $MOD SHIFT, 3, exec, notify-send "$(hyprctl activeworkspace)" +bind = $MOD SHIFT, 4, movetoworkspace, 4 +bind = $MOD SHIFT, 4, exec, notify-send "$(hyprctl activeworkspace)" +bind = $MOD SHIFT, 5, movetoworkspace, 5 +bind = $MOD SHIFT, 5, exec, notify-send "$(hyprctl activeworkspace)" +bind = $MOD SHIFT, 6, movetoworkspace, 6 +bind = $MOD SHIFT, 6, exec, notify-send "$(hyprctl activeworkspace)" +bind = $MOD SHIFT, 7, movetoworkspace, 7 +bind = $MOD SHIFT, 7, exec, notify-send "$(hyprctl activeworkspace)" +bind = $MOD SHIFT, 8, movetoworkspace, 8 +bind = $MOD SHIFT, 8, exec, notify-send "$(hyprctl activeworkspace)" +bind = $MOD SHIFT, 9, movetoworkspace, 9 +bind = $MOD SHIFT, 9, exec, notify-send "$(hyprctl activeworkspace)" +bind = $MOD SHIFT, 0, movetoworkspace, 10 +bind = $MOD SHIFT, 0, exec, notify-send "$(hyprctl activeworkspace)" # Example special workspace (scratchpad) bind = $MOD, Grave, togglespecialworkspace, scratch diff --git a/home-manager/dots/mako/config b/home-manager/dots/mako/config new file mode 100644 index 0000000..c884d74 --- /dev/null +++ b/home-manager/dots/mako/config @@ -0,0 +1,14 @@ +max-history=10 +font=Comic Mono 12 +background-color=#282a36 +text-color=#44475a +border-color=#282a36 + +[urgency=low] +border-color=#282a36 + +[urgency=normal] +border-color=#f1fa8c + +[urgency=high] +border-color=#ff5555 diff --git a/home-manager/gui.nix b/home-manager/gui.nix index f26c8a2..2aeaef0 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -7,13 +7,6 @@ "${config.xdg.dataHome}/flatpak/exports/share" ]; }; - xdg.configFile = { - "dunst" = { - source = ./dots/dunst; - target = "dunst"; - recursive = true; - }; - }; gtk = { enable = true; theme = { diff --git a/home-manager/wayland.nix b/home-manager/wayland.nix index 1fe8190..524ce89 100644 --- a/home-manager/wayland.nix +++ b/home-manager/wayland.nix @@ -5,15 +5,20 @@ ./gui.nix ]; xdg.configFile = { - "hyprland" = { - source = ./dots/hypr; - target = "hypr"; - recursive = true; - }; "foot" = { source = ./dots/foot; target = "foot"; recursive = true; }; + "hyprland" = { + source = ./dots/hypr; + target = "hypr"; + recursive = true; + }; + "mako" = { + source = ./dots/mako; + target = "mako"; + recursive = true; + }; }; } diff --git a/home-manager/xorg.nix b/home-manager/xorg.nix index eb05017..5931c8b 100644 --- a/home-manager/xorg.nix +++ b/home-manager/xorg.nix @@ -65,6 +65,11 @@ }; }; xdg.configFile = { + "dunst" = { + source = ./dots/dunst; + target = "dunst"; + recursive = true; + }; "sxhkd" = { source = ./dots/sxhkd; target = "sxhkd"; diff --git a/nixos/gui.nix b/nixos/gui.nix index fe6b0bd..31253b8 100644 --- a/nixos/gui.nix +++ b/nixos/gui.nix @@ -56,7 +56,6 @@ ytfzf ]; environment.systemPackages = with pkgs; [ - dunst libnotify networkmanagerapplet xdg-utils diff --git a/nixos/wayland.nix b/nixos/wayland.nix index c4eb4bf..393c3d9 100644 --- a/nixos/wayland.nix +++ b/nixos/wayland.nix @@ -47,6 +47,7 @@ foot grimblast hyprpicker + mako swaylock swww tessen diff --git a/nixos/xorg.nix b/nixos/xorg.nix index b11eadb..74caecd 100644 --- a/nixos/xorg.nix +++ b/nixos/xorg.nix @@ -48,6 +48,7 @@ postPatch = "${oldAttrs.postPatch}\n cp ${configFile} config.def.h"; })) clipmenu + dunst hsetroot scrot sxhkd