From 94acf3aa569a73222dff73b5c9f5eceff2389cdb Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Mon, 30 Jun 2025 09:41:09 -0500 Subject: [PATCH] hey --- .config/eww/eww.scss | 6 +++--- .config/eww/eww.yuck | 9 ++++----- .config/waybar/config | 8 ++++---- .config/waybar/style.css | 4 +++- home/home.nix | 28 ++++++++++++++-------------- home/modules/hyprland.nix | 2 +- modules/desktop.nix | 1 + pkgs/desktop-packages.nix | 2 +- 8 files changed, 31 insertions(+), 29 deletions(-) diff --git a/.config/eww/eww.scss b/.config/eww/eww.scss index 30e0809..265140c 100644 --- a/.config/eww/eww.scss +++ b/.config/eww/eww.scss @@ -115,7 +115,7 @@ tooltip label { .sysmodules { // padding-bottom: 2px; - padding-right: 5px; + padding-right: 0px; } .separ { @@ -243,13 +243,13 @@ button:hover { // margin: 2px 10px 0px 8px; padding-top: 3px; padding-left: 10px; - padding-right: 8px; + padding-right: 9px; } .bat_label { color: $base0E; padding-top: 3px; - padding-right: 20px; + padding-right: 10px; // padding-left: 3px; } diff --git a/.config/eww/eww.yuck b/.config/eww/eww.yuck index 2182361..05f2ef9 100644 --- a/.config/eww/eww.yuck +++ b/.config/eww/eww.yuck @@ -288,17 +288,16 @@ :class "sysmodules" (disk) (cpu) - (gpu) + ;; (gpu) (mem) ;; {right_modules.width > 1 ? null : (bright)} (bright) - (bat) - (volume)) + (volume) + (bat)) (label :class "right_sep" :text "|") - (tray) - (notif_button))) + (tray))) (defwidget bar_layout [] (centerbox diff --git a/.config/waybar/config b/.config/waybar/config index 63002f8..3359997 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -2,12 +2,12 @@ "layer": "top", // Waybar at top layer // "output": "DP-1", "position": "bottom", // Waybar position (top|bottom|left|right) - "height": 35, // Waybar height (to be removed for auto height) + "height": 15, // Waybar height (to be removed for auto height) "width": 1400, // Waybar width // Choose the order of the modules "custom/wintitle", - "modules-left": ["hyprland/workspaces", "hyprland/window"], - "modules-center": ["clock"], - "modules-right": ["pulseaudio", "backlight", "memory", "cpu", "battery", "tray"], + "modules-left": ["hyprland/window"], + "modules-center": ["hyprland/workspaces"], + "modules-right": ["pulseaudio", "battery", "tray", "clock"], "margin-top": -5, "margin-bottom": 8, "margin-left": 6, diff --git a/.config/waybar/style.css b/.config/waybar/style.css index 9dbc1cc..07da48d 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -51,7 +51,7 @@ window#waybar > box { margin-left: 10px; padding-right: 10px; background: transparent; - transition: none; + transition: all 0.1s linear; } #tags { @@ -66,6 +66,7 @@ window#waybar > box { transition: none; color: rgba(217, 216, 216, 0.4); background: transparent; + transition: all 0.1s linear; } #tags button { @@ -84,6 +85,7 @@ window#waybar > box { #workspaces button.active { color: @base0C; + transition: all 0.1s linear; } #tags button.focused { diff --git a/home/home.nix b/home/home.nix index d3983f6..e8e16a5 100644 --- a/home/home.nix +++ b/home/home.nix @@ -85,17 +85,17 @@ in { "audio/opus" = "mpv-slow.desktop"; "audio/x-opus" = "mpv-slow.desktop"; "audio/x-opus+ogg" = "mpv-slow.desktop"; - "x-scheme-handler/http" = "librewolf.desktop"; - "x-scheme-handler/https" = "librewolf.desktop"; - "text/html" = "librewolf.desktop"; + "x-scheme-handler/http" = "org.qutebrowser.qutebrowser.desktop"; + "x-scheme-handler/https" = "org.qutebrowser.qutebrowser.desktop"; + "text/html" = "org.qutebrowser.qutebrowser.desktop"; "text/org" = "emacsclient.desktop"; "text/md" = "emacsclient.desktop"; "text/txt" = "emacsclient.desktop"; "text/rs" = "emacsclient.desktop"; "text/plain" = "emacsclient.desktop"; "application/pdf" = "okular.desktop"; - "x-scheme-handler/about" = "librewolf.desktop"; - "x-scheme-handler/unknown" = "librewolf.desktop"; + "x-scheme-handler/about" = "org.qutebrowser.qutebrowser.desktop"; + "x-scheme-handler/unknown" = "org.qutebrowser.qutebrowser.desktop"; "x-scheme-handler/magnet" = "torrent.desktop"; }; defaultApplications = { @@ -124,17 +124,17 @@ in { "audio/flac" = "mpv-slow.desktop"; "audio/wav" = "mpv-slow.desktop"; "audio/opus" = "mpv-slow.desktop"; - "x-scheme-handler/http" = "librewolf.desktop"; - "x-scheme-handler/https" = "librewolf.desktop"; - "text/html" = "librewolf.desktop"; + "x-scheme-handler/http" = "org.qutebrowser.qutebrowser.desktop"; + "x-scheme-handler/https" = "org.qutebrowser.qutebrowser.desktop"; + "text/html" = "org.qutebrowser.qutebrowser.desktop"; "text/org" = "emacsclient.desktop"; "text/md" = "emacsclient.desktop"; "text/txt" = "emacsclient.desktop"; "text/rs" = "emacsclient.desktop"; "text/plain" = "emacsclient.desktop"; "application/pdf" = "okular.desktop"; - "x-scheme-handler/about" = "librewolf.desktop"; - "x-scheme-handler/unknown" = "librewolf.desktop"; + "x-scheme-handler/about" = "org.qutebrowser.qutebrowser.desktop"; + "x-scheme-handler/unknown" = "org.qutebrowser.qutebrowser.desktop"; "x-scheme-handler/magnet" = "torrent.desktop"; }; }; @@ -663,13 +663,13 @@ in { layer = "top"; output = [ "DP-1" "eDP-1" ]; position = if laptop then "bottom" else "top"; - height = 35; + height = 15; width = if laptop then 1400 else 3000; # Choose the order of the modules "custom/wintitle", - modules-left = [ "hyprland/workspaces" "hyprland/window" ]; - modules-center = [ ]; + modules-left = [ "hyprland/window" ]; + modules-center = [ "hyprland/workspaces" ]; modules-right = - [ "pulseaudio" "backlight" "disk" "memory" "cpu" "battery" "custom/gpu" "tray" "clock" ]; + [ "pulseaudio" "backlight" "battery" "tray" "clock" ]; margin-top = if laptop then -5 else 5; margin-bottom = if laptop then 4 else 0; margin-left = 6; diff --git a/home/modules/hyprland.nix b/home/modules/hyprland.nix index 954fbc5..6f719e4 100644 --- a/home/modules/hyprland.nix +++ b/home/modules/hyprland.nix @@ -277,7 +277,7 @@ in "SUPER,E,exec,/home/chris/bin/emacslof" "SUPER,d,exec,emacsclient -c -F '`(name . \"dadired\")' -e '(dired-jump)'" "SUPER,v,exec,cliphist list | rofi -p '󱃔 ' -dmenu | cliphist decode | wl-copy" - "SUPER,B,exec,/home/chris/bin/fflof" + "SUPER,B,exec,/home/chris/bin/qblof" "SUPER,A,exec,alacritty --class pulsemixer -e pulsemixer" "SUPERCTRL,i,exec,alacritty --class btop -e btop" "SUPERSHIFT,p,exec,${pkgs.hyprshot}/bin/hyprshot -m region" diff --git a/modules/desktop.nix b/modules/desktop.nix index 8c393f7..110c60c 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -146,6 +146,7 @@ in programs.dconf.enable = true; environment.variables = { + SAL_USE_VCLPLUGIN = "kf5"; EDITOR = "emacsclient -t -a"; VISUAL = "emacsclient -c -a"; QT_LOGGING_RULES = "js=true; kwin_*.debug=true"; diff --git a/pkgs/desktop-packages.nix b/pkgs/desktop-packages.nix index 1404a39..169f8be 100644 --- a/pkgs/desktop-packages.nix +++ b/pkgs/desktop-packages.nix @@ -112,7 +112,7 @@ virt-viewer # kdialog inkscape - libreoffice-fresh + libreoffice-qt6-fresh vlc haskellPackages.greenclip pulsemixer