From 79f2310a26bf3b1d7d07767a32283ef198ce81fb Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Thu, 24 Apr 2025 11:44:32 -0500 Subject: [PATCH] making waybar changes and adding aidermacs --- home/home.nix | 35 ++++++++++++++------ home/modules/hyprland.nix | 70 +++++++++++++++++++-------------------- modules/emacs.nix | 10 +++++- 3 files changed, 68 insertions(+), 47 deletions(-) diff --git a/home/home.nix b/home/home.nix index de58e4a..64c0a94 100644 --- a/home/home.nix +++ b/home/home.nix @@ -656,14 +656,14 @@ in { output = [ "DP-1" "eDP-1" ]; position = if laptop then "bottom" else "top"; height = 35; - width = if laptop then 1300 else 2100; + width = if laptop then 1400 else 2100; # Choose the order of the modules "custom/wintitle", modules-left = [ "hyprland/workspaces" "hyprland/window" ]; - modules-center = [ "clock" ]; + modules-center = [ ]; modules-right = - [ "pulseaudio" "backlight" "disk" "memory" "cpu" "battery" "tray" ]; + [ "pulseaudio" "backlight" "disk" "memory" "cpu" "battery" "tray" "clock" ]; margin-top = if laptop then -5 else 5; - margin-bottom = if laptop then 8 else 0; + margin-bottom = if laptop then 4 else 0; margin-left = 6; margin-right = 6; "hyprland/window" = { format = " {}"; }; @@ -795,16 +795,30 @@ in { } window#waybar > box { - padding-top: 5px; - padding-bottom: 3px; - padding-left: 3px; - padding-right: 10px; color: @base05; - box-shadow: 5px 5px 4px 4px #202020; margin: 12px 14px 14px 14px; - background: @backtransparent; + background: transparent; } + .modules-right { + padding-top: 2px; + padding-bottom: 2px; + padding-left: 5px; + padding-right: 5px; + background: @backtransparent; + box-shadow: 5px 5px 4px 4px #202020; + border-radius: 20px; + } + + .modules-left { + padding-top: 2px; + padding-bottom: 2px; + padding-right: 10px; + background: @backtransparent; + box-shadow: 5px 5px 4px 4px #202020; + border-radius: 20px; + } + tooltip { background: @base00; border: 1px solid @base0D; @@ -816,7 +830,6 @@ in { #workspaces { border-radius: 20px; - margin-left: 10px; padding-right: 10px; background: transparent; transition: none; diff --git a/home/modules/hyprland.nix b/home/modules/hyprland.nix index 752ddd4..ca9ca8a 100644 --- a/home/modules/hyprland.nix +++ b/home/modules/hyprland.nix @@ -209,44 +209,44 @@ in # example window rules # for windows named/classed as abc and xyz windowrule = [ - "opaque, class:ff" + "opaque,class:ff" # if !laptop then "workspace 1,mpv" - "float, class:org.kde.dolphin" - "float, class:thunar" - "float, class:title:dadired" - "float, class:com.system76.CosmicFiles" - "float, class:org.freedesktop.impl.portal.desktop.kde" - "float, class:nm-tray" - "size 60% 60%, class:org.kde.dolphin" - "size 60% 60%, class:thunar" - "size 60% 60%, title:dadired" - "size 60% 60%, class:com.system76.CosmicFiles" - "size 60% 60%, class:org.freedesktop.impl.portal.desktop.kde" - "float, class:mpv" + "float,class:org.kde.dolphin" + "float,class:thunar" + "float,class:title:dadired" + "float,class:com.system76.CosmicFiles" + "float,class:org.freedesktop.impl.portal.desktop.kde" + "float,class:nm-tray" + "size 60% 60%,class:org.kde.dolphin" + "size 60% 60%,class:thunar" + "size 60% 60%,title:dadired" + "size 60% 60%,class:com.system76.CosmicFiles" + "size 60% 60%,class:org.freedesktop.impl.portal.desktop.kde" + "float,class:mpv" "float,title:Picture-in-Picture" "center,title:Picture-in-Picture" - "size ${if laptop then "90% 76%" else "85% 85%"}, class:mpv" - "${if laptop then "workspace 1, class:idk #dummy rule" else "workspace 9, class:mpv"}" - "${if laptop then "workspace 1, class:idk #dummy rule" else "workspace 9, title:Picture-In-Picture"}" - "${if laptop then "workspace 1, class:idk #dummy rule" else "fullscreen, title:Picture-In-Picture"}" - "center, class:mpv" - "opaque, class:mpv" - "float, class:pulsemixer" - "workspace 2, class:ff" - "workspace 2, class:vivaldi-stable" - "workspace 2, class:org.qutebrowser.qutebrowser" - "workspace 1, class:emacs" - "float, class:btop" - "size 70% 70%, class:btop" - "center, class:btop" - "float, class:lumina" - "size 80% 80%, class:lumina" - "center, class:lumina" - "opaque, class:lumina" - "float, class:'org.chriscochrun.lumina'" - "size 80% 80%, class:'org.chriscochrun.lumina'" - "center, class:'org.chriscochrun.lumina'" - "opaque, class:'org.chriscochrun.lumina'" + "size ${if laptop then "90% 76%" else "85% 85%"},class:mpv" + "${if laptop then "workspace 1,class:idk #dummy rule" else "workspace 9,class:mpv"}" + "${if laptop then "workspace 1,class:idk #dummy rule" else "workspace 9,title:Picture-In-Picture"}" + "${if laptop then "workspace 1,class:idk #dummy rule" else "fullscreen,title:Picture-In-Picture"}" + "center,class:mpv" + "opaque,class:mpv" + "float,class:pulsemixer" + "workspace 2,class:ff" + "workspace 2,class:vivaldi-stable" + "workspace 2,class:org.qutebrowser.qutebrowser" + "workspace 1,class:emacs" + "float,class:btop" + "size 70% 70%,class:btop" + "center,class:btop" + "float,class:lumina" + "size 80% 80%,class:lumina" + "center,class:lumina" + "opaque,class:lumina" + "float,class:'org.chriscochrun.lumina'" + "size 80% 80%,class:'org.chriscochrun.lumina'" + "center,class:'org.chriscochrun.lumina'" + "opaque,class:'org.chriscochrun.lumina'" "workspace ${if laptop then "1" else "3"}, title:presentation-window" ]; diff --git a/modules/emacs.nix b/modules/emacs.nix index 5e98aa2..f551deb 100644 --- a/modules/emacs.nix +++ b/modules/emacs.nix @@ -179,7 +179,7 @@ eshell-syntax-highlighting melpaPackages.org-ai melpaPackages.gptel - # melpaPackages.aidermacs + melpaPackages.aidermacs pkgs.ispell pkgs.mu pkgs.openjdk @@ -190,6 +190,14 @@ pkgs.tree-sitter-grammars.tree-sitter-rust pkgs.tree-sitter-grammars.tree-sitter-yaml pkgs.tree-sitter-grammars.tree-sitter-toml + pkgs.tree-sitter-grammars.tree-sitter-wgsl + pkgs.tree-sitter-grammars.tree-sitter-nix + pkgs.tree-sitter-grammars.tree-sitter-nu + pkgs.tree-sitter-grammars.tree-sitter-bash + pkgs.tree-sitter-grammars.tree-sitter-fish + pkgs.tree-sitter-grammars.tree-sitter-tera + pkgs.tree-sitter-grammars.tree-sitter-html + pkgs.tree-sitter-grammars.tree-sitter-javascript ])); defaultEditor = true; };