chris/dotfiles
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

making waybar changes and adding aidermacs

Browse source
This commit is contained in:
Chris Cochrun 2025-04-24 11:44:32 -05:00
parent 3330bde398
commit 79f2310a26
3 changed files with 68 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
home/home.nix
View file

@ -656,14 +656,14 @@ in {
output = [ "DP-1" "eDP-1" ]; output = [ "DP-1" "eDP-1" ];
position = if laptop then "bottom" else "top"; position = if laptop then "bottom" else "top";
height = 35; height = 35;
width = if laptop then 1300 else 2100; width = if laptop then 1400 else 2100;
# Choose the order of the modules "custom/wintitle", # Choose the order of the modules "custom/wintitle",
modules-left = [ "hyprland/workspaces" "hyprland/window" ]; modules-left = [ "hyprland/workspaces" "hyprland/window" ];
modules-center = [ "clock" ]; modules-center = [ ];
modules-right = 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-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-left = 6;
margin-right = 6; margin-right = 6;
"hyprland/window" = { format = " <span style='italic'>{}</span>"; }; "hyprland/window" = { format = " <span style='italic'>{}</span>"; };
@ -795,14 +795,28 @@ in {
} }
window#waybar > box { window#waybar > box {
padding-top: 5px;
padding-bottom: 3px;
padding-left: 3px;
padding-right: 10px;
color: @base05; color: @base05;
box-shadow: 5px 5px 4px 4px #202020;
margin: 12px 14px 14px 14px; margin: 12px 14px 14px 14px;
background: transparent;
}
.modules-right {
padding-top: 2px;
padding-bottom: 2px;
padding-left: 5px;
padding-right: 5px;
background: @backtransparent; 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 { tooltip {
@ -816,7 +830,6 @@ in {
#workspaces { #workspaces {
border-radius: 20px; border-radius: 20px;
margin-left: 10px;
padding-right: 10px; padding-right: 10px;
background: transparent; background: transparent;
transition: none; transition: none;

70
home/modules/hyprland.nix
View file

@ -209,44 +209,44 @@ in
# example window rules # example window rules
# for windows named/classed as abc and xyz # for windows named/classed as abc and xyz
windowrule = [ windowrule = [
"opaque, class:ff" "opaque,class:ff"
# if !laptop then "workspace 1,mpv" # if !laptop then "workspace 1,mpv"
"float, class:org.kde.dolphin" "float,class:org.kde.dolphin"
"float, class:thunar" "float,class:thunar"
"float, class:title:dadired" "float,class:title:dadired"
"float, class:com.system76.CosmicFiles" "float,class:com.system76.CosmicFiles"
"float, class:org.freedesktop.impl.portal.desktop.kde" "float,class:org.freedesktop.impl.portal.desktop.kde"
"float, class:nm-tray" "float,class:nm-tray"
"size 60% 60%, class:org.kde.dolphin" "size 60% 60%,class:org.kde.dolphin"
"size 60% 60%, class:thunar" "size 60% 60%,class:thunar"
"size 60% 60%, title:dadired" "size 60% 60%,title:dadired"
"size 60% 60%, class:com.system76.CosmicFiles" "size 60% 60%,class:com.system76.CosmicFiles"
"size 60% 60%, class:org.freedesktop.impl.portal.desktop.kde" "size 60% 60%,class:org.freedesktop.impl.portal.desktop.kde"
"float, class:mpv" "float,class:mpv"
"float,title:Picture-in-Picture" "float,title:Picture-in-Picture"
"center,title:Picture-in-Picture" "center,title:Picture-in-Picture"
"size ${if laptop then "90% 76%" else "85% 85%"}, class:mpv" "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,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 "workspace 9,title:Picture-In-Picture"}"
"${if laptop then "workspace 1, class:idk #dummy rule" else "fullscreen, title:Picture-In-Picture"}" "${if laptop then "workspace 1,class:idk #dummy rule" else "fullscreen,title:Picture-In-Picture"}"
"center, class:mpv" "center,class:mpv"
"opaque, class:mpv" "opaque,class:mpv"
"float, class:pulsemixer" "float,class:pulsemixer"
"workspace 2, class:ff" "workspace 2,class:ff"
"workspace 2, class:vivaldi-stable" "workspace 2,class:vivaldi-stable"
"workspace 2, class:org.qutebrowser.qutebrowser" "workspace 2,class:org.qutebrowser.qutebrowser"
"workspace 1, class:emacs" "workspace 1,class:emacs"
"float, class:btop" "float,class:btop"
"size 70% 70%, class:btop" "size 70% 70%,class:btop"
"center, class:btop" "center,class:btop"
"float, class:lumina" "float,class:lumina"
"size 80% 80%, class:lumina" "size 80% 80%,class:lumina"
"center, class:lumina" "center,class:lumina"
"opaque, class:lumina" "opaque,class:lumina"
"float, class:'org.chriscochrun.lumina'" "float,class:'org.chriscochrun.lumina'"
"size 80% 80%, class:'org.chriscochrun.lumina'" "size 80% 80%,class:'org.chriscochrun.lumina'"
"center, class:'org.chriscochrun.lumina'" "center,class:'org.chriscochrun.lumina'"
"opaque, class:'org.chriscochrun.lumina'" "opaque,class:'org.chriscochrun.lumina'"
"workspace ${if laptop then "1" else "3"}, title:presentation-window" "workspace ${if laptop then "1" else "3"}, title:presentation-window"
]; ];

10
modules/emacs.nix
View file

@ -179,7 +179,7 @@
eshell-syntax-highlighting eshell-syntax-highlighting
melpaPackages.org-ai melpaPackages.org-ai
melpaPackages.gptel melpaPackages.gptel
# melpaPackages.aidermacs melpaPackages.aidermacs
pkgs.ispell pkgs.ispell
pkgs.mu pkgs.mu
pkgs.openjdk pkgs.openjdk
@ -190,6 +190,14 @@
pkgs.tree-sitter-grammars.tree-sitter-rust pkgs.tree-sitter-grammars.tree-sitter-rust
pkgs.tree-sitter-grammars.tree-sitter-yaml pkgs.tree-sitter-grammars.tree-sitter-yaml
pkgs.tree-sitter-grammars.tree-sitter-toml 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; defaultEditor = true;
}; };