From b2a940dbe9bafdad1540f7ff263f78d9df431cd4 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Fri, 16 Dec 2022 10:00:03 -0600 Subject: [PATCH] trying to fix kde on greetd --- README.org | 3 +- dunst/dunstrc | 2 +- eww/eww.yuck | 49 ++++++++++++++++++++++++++++++++ eww/scripts/notifications | 4 +-- hypr/hyprland.conf | 19 ++++++++----- scripts/window.sh | 2 +- system/kaladin/configuration.nix | 3 +- system/syl/configuration.nix | 3 +- 8 files changed, 71 insertions(+), 14 deletions(-) diff --git a/README.org b/README.org index 7b6faad..ed134bf 100644 --- a/README.org +++ b/README.org @@ -213,7 +213,7 @@ services.greetd = { }; default_session = initial_session; hyprland_session = { - command = "dbus-launch systemctl --user restart plasma-run-with-systemd.service"; + command = "${pkgs.plasma-workspace}/libexec/plasma-dbus-run-session-if-needed ${pkgs.plasma-workspace}/bin/startplasma-wayland"; user = "chris"; }; }; @@ -703,6 +703,7 @@ services.emacs = { esh-autosuggest pkgs.mu ])); + defaultEditor = true; }; #+end_src diff --git a/dunst/dunstrc b/dunst/dunstrc index d515dcb..01db5b2 100644 --- a/dunst/dunstrc +++ b/dunst/dunstrc @@ -85,7 +85,7 @@ # Defines width in pixels of frame around the notification window. # Set to 0 to disable. - frame_width = 1 + frame_width = 0 # Defines color of the frame around the notification window. frame_color = "#aaaaaa" diff --git a/eww/eww.yuck b/eww/eww.yuck index 5a98f5e..689b0b3 100644 --- a/eww/eww.yuck +++ b/eww/eww.yuck @@ -176,6 +176,12 @@ :tooltip "using ${EWW_RAM.used_mem_perc}% ram" " ")))) +(defwidget kdeconnect [] + (box + :class "kdeconnect_module" + :vexpand "false" + :hexpand "false")) + (defwidget clock_module [] (eventbox :onhover "${EWW_CMD} update time_rev=true" @@ -434,6 +440,49 @@ :text "____________________________________" :class "sys_sep" :halign "center") + (box + :class "sys_mem_box" + :orientation "h" + :space-evenly "false" + :halign "start" + (circular-progress + :value {EWW_CPU.avg} + :class "sys_mem" + :thickness 9 + (label + :text "" + :class "sys_icon_mem" + :limit-width 2 + :wrap false + :angle 0.0)) + (box + :orientation "v" + :space-evenly "false" + :spacing 0 + :hexpand "false" + :vexpand "false" + (label + :text "processor" + :halign "start" + :class "sys_text_mem" + :limit-width 9 + :wrap false) + (label + :text "${EWW_CPU.avg} | ${round((EWW_RAM.total_mem / 1024), 0)}mb " + :halign "start" + :class "sys_text_mem_sub" + :limit-width 22 + :wrap false) + (label :text "3.4 GHZ" + :halign "start" + :class "sys_text_mem_sub" + :limit-width 22 + :wrap false) + )) + (label + :text "____________________________________" + :class "sys_sep" + :halign "center") (box :class "sys_mem_box" :orientation "h" diff --git a/eww/scripts/notifications b/eww/scripts/notifications index 1478a6c..8c41d05 100755 --- a/eww/scripts/notifications +++ b/eww/scripts/notifications @@ -17,7 +17,7 @@ for id in "${ids[@]}"; do (box \ :class \"notification\" \ :orientation \"h\" \ - :width 300 \ + :width 350 \ :space-evenly \"false\" \ (image \ :class \"notification-icon\" \ @@ -28,7 +28,7 @@ for id in "${ids[@]}"; do :orientation \"v\" \ :space-evenly \"false\" \ :valign \"left\" \ - :width 300 \ + :width 350 \ :spacing 10 \ (label \ :xalign 0 \ diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index b3a5d6c..5d40170 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -18,8 +18,9 @@ input { repeat_delay=180 natural_scroll=0 sensitivity=0.85 + accel_profile=adaptive - follow_mouse=0 + follow_mouse=2 touchpad { natural_scroll=1 @@ -60,7 +61,8 @@ decoration { # the more passes, the more you can up the blur_size without noticing artifacts. drop_shadow=true shadow_range=30 - shadow_render_power=2 + shadow_offset=5 5 + shadow_render_power=1 dim_inactive=true dim_strength=0.2 } @@ -86,7 +88,7 @@ master { new_on_top=false } -misc:disable_autoreload = true +# misc:disable_autoreload = true # example window rules # for windows named/classed as abc and xyz @@ -99,7 +101,8 @@ windowrule=float,pulsemixer windowrule=workspace 1,firefox windowrule=workspace 2,emacs windowrule=float,btop -windowrule=size 60% 60%,btop +windowrule=size 70% 70%,btop +windowrule=center,btop # example binds bind=SUPER,RETURN,exec,alacritty @@ -114,7 +117,7 @@ bind=SUPER,E,exec,/home/chris/bin/emacslof bind=SUPER,d,exec,emacsclient -c -e '(dired-jump)' bind=SUPER,B,exec,/home/chris/bin/fflof bind=SUPER,A,exec,alacritty --class pulsemixer -e pulsemixer -bind=SUPERCTRL,/,exec,alacritty --class btop -e btop +bind=SUPERCTRL,i,exec,alacritty --class btop -e btop bind=SUPER,P,exec,/home/chris/bin/rbw.sh bind=SUPER,M,fullscreen,1 @@ -177,9 +180,11 @@ bindm=SUPER,mouse:272,movewindow bindm=SUPER,mouse:273,resizewindow # Blur waybar -blurls=waybar +# blurls=gtk-layer-shell +# blurls=notifications exec-once=/home/chris/bin/startup.sh exec-once=hyprpaper exec-once=dunst -exec-once=hyprctl dispatch --batch "splitratio 1; splitration -0.35" \ No newline at end of file +exec-once=hyprctl dispatch --batch "splitratio 1; splitration -0.35" +exec-once=dbus-update-activation-environment --systemd --all \ No newline at end of file diff --git a/scripts/window.sh b/scripts/window.sh index f465423..e76674c 100755 --- a/scripts/window.sh +++ b/scripts/window.sh @@ -4,6 +4,6 @@ list_windows() ( wlrctl window list ) -window=$(list_windows | rofi -i -sync -dmenu -p " " -theme ~/.config/rofi/launchers-git/laptop-rbw.rasi | awk '{print $1}' | sed 's/://') +window=$(wlrctl window list | rofi -i -sync -dmenu -p " " -theme ~/.config/rofi/launchers-git/laptop-rbw-wayland.rasi | awk '{print $1}' | sed 's/://') wlrctl window focus $window diff --git a/system/kaladin/configuration.nix b/system/kaladin/configuration.nix index e867bb4..e3aae7b 100644 --- a/system/kaladin/configuration.nix +++ b/system/kaladin/configuration.nix @@ -125,7 +125,7 @@ }; default_session = initial_session; hyprland_session = { - command = "dbus-launch systemctl --user restart plasma-run-with-systemd.service"; + command = "${pkgs.plasma-workspace}/libexec/plasma-dbus-run-session-if-needed ${pkgs.plasma-workspace}/bin/startplasma-wayland"; user = "chris"; }; }; @@ -560,6 +560,7 @@ esh-autosuggest pkgs.mu ])); + defaultEditor = true; }; services.samba-wsdd.enable = true; services.samba = { diff --git a/system/syl/configuration.nix b/system/syl/configuration.nix index 56efe1e..cd563fd 100644 --- a/system/syl/configuration.nix +++ b/system/syl/configuration.nix @@ -118,7 +118,7 @@ }; default_session = initial_session; hyprland_session = { - command = "dbus-launch systemctl --user restart plasma-run-with-systemd.service"; + command = "${pkgs.plasma-workspace}/libexec/plasma-dbus-run-session-if-needed ${pkgs.plasma-workspace}/bin/startplasma-wayland"; user = "chris"; }; }; @@ -546,6 +546,7 @@ esh-autosuggest pkgs.mu ])); + defaultEditor = true; }; services.samba-wsdd.enable = true; services.samba = {