diff --git a/README.org b/README.org index 32e2b71..0bd38f9 100644 --- a/README.org +++ b/README.org @@ -357,6 +357,7 @@ ark ifuse dash brightnessctl +dunst ttyper kget audacity @@ -669,6 +670,10 @@ Notice how I am including all of my software here. It may be a big file, but hav environment.variables = { <> VDPAU_DRIVER = lib.mkIf config.hardware.opengl.enable (lib.mkDefault "va_gl"); + QT_QPA_PLATFORMTHEME = "qt5ct"; + QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; + QT_QPA_PLATFORM = "wayland;xcb"; + QT_AUTO_SCREEN_SCALE_FACTOR = "1"; }; # Define a user account. Don't forget to set a password with ‘passwd’. diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 0e79ead..c0c40d1 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -13,7 +13,7 @@ input { # kb_rules= repeat_rate=140 repeat_delay=180 - natural_scroll=1 + natural_scroll=0 sensitivity=0.85 follow_mouse=0 @@ -46,7 +46,7 @@ gestures { decoration { rounding=18 active_opacity=0.95 - inactive_opacity=0.75 + inactive_opacity=0.85 fullscreen_opacity=1.0 blur=true blur_new_optimizations=true @@ -59,15 +59,17 @@ decoration { shadow_range=30 shadow_render_power=2 dim_inactive=true - dim_strength=0.3 + dim_strength=0.2 } +bezier=snapslide,0.07,0.66,0.04,1.02 + animations { enabled=1 - animation=windows,1,4,default + animation=windows,1,2,snapslide # animation=borders,1,10,default - animation=fadeIn,1,10,default - animation=workspaces,1,6,default + animation=fadeIn,1,2,snapslide + animation=workspaces,1,2,snapslide } dwindle { @@ -88,6 +90,11 @@ master { #windowrule=float,abc #windowrule=pseudo,abc windowrule=opaque,firefox +windowrule=float,dolphin +windowrule=float,mpv +windowrule=size 90% 76%,mpv +windowrule=center,mpv +windowrule=float,pulsemixer # example binds bind=SUPER,RETURN,exec,alacritty @@ -98,6 +105,7 @@ bind=SUPERSHIFT,F,togglefloating, bindr=SUPER,Super_L,exec,/home/chris/bin/launcher.sh bind=SUPER,E,exec,/home/chris/bin/emacslof bind=SUPER,B,exec,/home/chris/bin/fflof +bind=SUPER,A,exec,alacritty --class pulsemixer -e pulsemixer bind=SUPER,P,pseudo, bind=SUPER,M,fullscreen,1 @@ -111,8 +119,8 @@ bind=SUPERSHIFT,h,movewindow,l bind=SUPERSHIFT,l,movewindow,r bind=SUPERSHIFT,k,movewindow,u bind=SUPERSHIFT,j,movewindow,d -bind=SUPERCTRL,l,splitratio,+0.1 -bind=SUPERCTRL,h,splitratio,-0.1 +bind=SUPERCTRL,l,splitratio,+0.05 +bind=SUPERCTRL,h,splitratio,-0.05 bind=SUPER,1,workspace,1 bind=SUPER,2,workspace,2 @@ -141,5 +149,15 @@ bind=ALT,0,movetoworkspace,10 bind=SUPER,O,movetoworkspace,next +binde=, XF86AudioRaiseVolume, exec, pamixer -i 5 +binde=, XF86AudioLowerVolume, exec, pamixer -d 5 +binde=, XF86AudioMute, exec, pamixer -t + +binde=, XF86MonBrightnessUp, exec, brightnessctl s +10% +binde=, XF86MonBrightnessDown, exec, brightnessctl s 10%- + +bindm=SUPER,mouse:272,movewindow +bindm=SUPER,mouse:273,resizewindow + exec-once=/home/chris/bin/startup.sh exec-once=hyprpaper \ No newline at end of file diff --git a/hypr/hyprpaper.conf b/hypr/hyprpaper.conf index 416e934..d354ad8 100644 --- a/hypr/hyprpaper.conf +++ b/hypr/hyprpaper.conf @@ -1,3 +1,4 @@ preload = ~/Pictures/wallpapers/nixorange.jpeg wallpaper = DVI-D-1,~/Pictures/wallpapers/nixorange.jpeg -wallpaper = HDMI-A-1,~/Pictures/wallpapers/nixorange.jpeg \ No newline at end of file +wallpaper = HDMI-A-1,~/Pictures/wallpapers/nixorange.jpeg +wallpaper = eDP-1,~/Pictures/wallpapers/nixorange.jpeg \ No newline at end of file diff --git a/scripts/emacslof b/scripts/emacslof index ad0a49a..bb06deb 100755 --- a/scripts/emacslof +++ b/scripts/emacslof @@ -5,7 +5,7 @@ if [ $(pgrep -c emacsclient) -gt 0 ]; then echo hi if [ "$XDG_SESSION_TYPE" = "x11" ]; then - #X11 + echo X11 emacsrg=$(wmctrl -lx | rg emacs.Emacs | rg -v org-agenda | awk '{print $1}') echo $emacsrg @@ -21,8 +21,8 @@ if [ $(pgrep -c emacsclient) -gt 0 ]; then exec /home/chris/bin/ww -fa Emacs -c emacsclient exit else - # WAYLAND - emacsrg=$(wlrctl window list | rg -v 'Emacs:\sorg-agenda' | rg 'Emacs:') + echo WAYLAND + emacsrg=$(wlrctl window list | rg Emacs) emacswin=$(echo $emacsrg | sed 's/.*\: //') echo $emacswin diff --git a/system/kaladin/configuration.nix b/system/kaladin/configuration.nix index 4de84fe..9217ef4 100644 --- a/system/kaladin/configuration.nix +++ b/system/kaladin/configuration.nix @@ -241,6 +241,7 @@ ifuse dash brightnessctl + dunst ttyper kget audacity diff --git a/system/syl/configuration.nix b/system/syl/configuration.nix index 053974a..246db0e 100644 --- a/system/syl/configuration.nix +++ b/system/syl/configuration.nix @@ -179,6 +179,10 @@ # QT_XCB_GL_INTEGRATION = "xcb_egl"; # QT_QPA_PLATFORM_PLUGIN_PATH = "${pkgs.qt5.qtbase.bin}/lib/qt-${pkgs.qt5.qtbase.qtCompatVersion}/plugins/platforms"; VDPAU_DRIVER = lib.mkIf config.hardware.opengl.enable (lib.mkDefault "va_gl"); + QT_QPA_PLATFORMTHEME = "qt5ct"; + QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; + QT_QPA_PLATFORM = "wayland;xcb"; + QT_AUTO_SCREEN_SCALE_FACTOR = "1"; }; # Define a user account. Don't forget to set a password with ‘passwd’. @@ -257,6 +261,7 @@ ifuse dash brightnessctl + dunst ttyper kget audacity diff --git a/waybar/config b/waybar/config index c78470e..6b0d870 100644 --- a/waybar/config +++ b/waybar/config @@ -4,13 +4,13 @@ "height": 30, // Waybar height (to be removed for auto height) // "width": 1280, // Waybar width // Choose the order of the modules "custom/wintitle", - "modules-left": ["sway/workspaces", "hyprland/window", "river/tags", "sway/mode", "sway/window"], + "modules-left": ["wlr/workspaces", "hyprland/window"], "modules-center": ["clock"], - "modules-right": ["pulseaudio", "network", "memory", "cpu", "battery", "battery#bat2", "tray"], + "modules-right": ["pulseaudio", "backlight", "network", "memory", "cpu", "battery", "battery#bat2", "tray"], "margin-top": 0, "margin-bottom": 10, - "margin-left": 10, - "margin-right": 10, + "margin-left": 17, + "margin-right": 17, // Modules configuration "sway/workspaces": { "disable-scroll": true, @@ -31,7 +31,7 @@ "num-tags": 8 }, "hyprland/window": { - "format": "{}" + "format": " {}" }, "sway/mode": { "format": " {}" @@ -51,7 +51,7 @@ // "timezone": "America/New_York", "tooltip-format": "{:%Y %B}\n{calendar}", "format-alt": "{:%Y-%m-%d}", - "format": "{:%a %b %e, %l:%M %p}" + "format": "{:%a %b%e, %I:%M %p}" }, "cpu": { "format": " {usage}%", @@ -95,12 +95,13 @@ "critical": 15 }, "format": "{icon} {capacity}%", - "format-charging": " {capacity}%", + "format-charging": "{charging-icons} {capacity}%", "format-plugged": " {capacity}%", "format-alt": "{time} {icon}", // "format-good": "", // An empty format will hide the module // "format-full": "", - "format-icons": [" ", " ", " ", " ", " "] + "format-icons": [" ", " ", " ", " ", " "], + "format-charging-icons": [" ", " ", " ", " ", " "] }, "network": { // "interface": "wlp2*", // (Optional) To force the use of this interface @@ -127,7 +128,7 @@ "car": "", "default": ["", "", ""] }, - "on-click": "pavucontrol" + "on-click": "alacritty --class pulsemixer -e pulsemixer" }, "custom/media": { "format": "{icon} {}", diff --git a/waybar/style.css b/waybar/style.css index 0f11e7f..652fb94 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -118,8 +118,8 @@ window#waybar.solo { padding-right: 5px; border-radius: 20px; transition: none; - color: @base01; - background: @base0B; + color: @base08; + background: @backtransparent; } #battery.warning { @@ -148,7 +148,7 @@ window#waybar.solo { padding-right: 5px; border-radius: 20px; transition: none; - color: @base0A; + color: @base0B; background: @backtransparent; } @@ -157,7 +157,7 @@ window#waybar.solo { padding-right: 5px; border-radius: 20px; transition: none; - color: @base0B; + color: @base09; background: @backtransparent; } @@ -179,7 +179,7 @@ window#waybar.solo { padding-right: 5px; border-radius: 20px; transition: none; - color: @base0E; + color: @base0C; background: @backtransparent; }