Fix GTK theme
All checks were successful
/ check (push) Successful in 3m49s

This commit is contained in:
Daniel Flanagan 2024-09-12 13:24:57 -05:00
parent 727a70d843
commit b7925c965e
5 changed files with 72 additions and 56 deletions

View file

@ -1205,15 +1205,26 @@
]; ];
gtk.theme = { gtk.theme = {
name = "Catppuccin-Mocha-Compact-Sapphire-Dark"; name = "catppuccin-mocha-blue-compact+default";
package = pkgs.catppuccin-gtk.override { package =
accents = ["sapphire"]; (pkgs.catppuccin-gtk.overrideAttrs {
size = "compact"; src = pkgs.fetchFromGitHub {
tweaks = ["rimless"]; owner = "catppuccin";
variant = "mocha"; repo = "gtk";
}; rev = "v1.0.3";
fetchSubmodules = true;
hash = "sha256-q5/VcFsm3vNEw55zq/vcM11eo456SYE5TQA3g2VQjGc=";
}; };
postUnpack = "";
})
.override
{
accents = ["sapphire"];
variant = "mocha";
size = "compact";
};
};
home.pointerCursor = { home.pointerCursor = {
name = "Bibata-Modern-Classic"; name = "Bibata-Modern-Classic";
package = pkgs.bibata-cursors; package = pkgs.bibata-cursors;

View file

@ -181,13 +181,13 @@
input = { input = {
"type:keyboard" = { "type:keyboard" = {
xkb_options = "ctrl:nocaps"; xkb_options = "ctrl:nocaps";
repeat_delay = "200"; repeat_delay = "180";
repeat_rate = "60"; repeat_rate = "100";
}; };
"type:pointer" = { "type:pointer" = {
accel_profile = "flat"; accel_profile = "flat";
pointer_accel = "0"; pointer_accel = "0.5";
}; };
"type:touchpad" = { "type:touchpad" = {
@ -211,6 +211,7 @@
"${mod}+c" = "kill"; "${mod}+c" = "kill";
"${mod}+shift+c" = "kill # TODO: kill -9?"; "${mod}+shift+c" = "kill # TODO: kill -9?";
"${mod}+alt+space" = "exec wofi --show drun"; "${mod}+alt+space" = "exec wofi --show drun";
"${mod}" = "exec ${menu}";
"${mod}+space" = "exec ${menu}"; "${mod}+space" = "exec ${menu}";
"${mod}+shift+s" = "exec clipshot"; "${mod}+shift+s" = "exec clipshot";
"${mod}+e" = "exec thunar"; "${mod}+e" = "exec thunar";

View file

@ -1,4 +1,8 @@
{style, ...}: { {
pkgs,
style,
...
}: {
programs.waybar = { programs.waybar = {
enable = true; enable = true;
settings = { settings = {
@ -6,36 +10,37 @@
"layer" = "top"; "layer" = "top";
"position" = "bottom"; "position" = "bottom";
"output" = ["eDP-1" "DP-3"]; "output" = ["eDP-1" "DP-3"];
"height" = 32; "height" = 50;
"modules-left" = ["clock" "sway/window"]; "modules-left" = [
"modules-center" = ["sway/workspaces"]; "idle_inhibitor"
"sway/workspaces"
"sway/window"
];
"modules-center" = [];
"modules-right" = [ "modules-right" = [
"mpris" "mpris"
"idle_inhibitor"
"bluetooth"
"wireplumber"
"pulseaudio"
"network" "network"
## "disk"
## TODO: will need a custom module for Disk IO
## "wireplumber" # pulseaudio module is more featureful
"pulseaudio"
"cpu" "cpu"
"memory" "memory"
"temperature" "temperature"
"backlight" "backlight"
"battery" "battery"
"bluetooth"
"tray" "tray"
"clock"
]; ];
"bluetooth" = { "bluetooth" = {
"format" = "<span</span>"; "format" = "<span</span>";
"format-connected" = "<span></span>"; "on-click" = "${pkgs.blueman}/bin/blueman-manager";
"format-connected-battery" = "<span></span>";
# "format-device-preference" = [ "device1", "device2" ]; # preference list deciding the displayed device
"tooltip-format" = "{controller_alias}@{controller_address} ({num_connections} connected)";
"tooltip-format-connected" = "{controller_alias}@{controller_address} ({num_connections} connected)\n{device_enumerate}";
"tooltip-format-enumerate-connected" = "{device_alias}@{device_address}";
"tooltip-format-enumerate-connected-battery" = "{device_alias}@{device_address} (󰁹 {device_battery_percentage}%)";
}; };
"wireplumber" = { "wireplumber" = {
"format" = "{volume}% {icon}"; "format" = "{volume}% {icon}";
"format-muted" = "";
"on-click" = "helvum"; "on-click" = "helvum";
}; };
"sway/workspaces" = { "sway/workspaces" = {
@ -58,15 +63,20 @@
}; };
"clock" = { "clock" = {
"interval" = 1; "interval" = 1;
"format" = "{:%a %b %d %H:%M:%S}"; "format" = "{:%a %b %d\n%H:%M:%S}";
"justify" = "center";
}; };
"cpu" = { "cpu" = {
"format" = "{usage} <span></span>"; "format" = "CPU\n{usage}%";
"tooltip" = true; "tooltip" = true;
"interval" = 3; "interval" = 5;
"justify" = "center";
}; };
"memory" = { "memory" = {
"format" = "{} 󰍛"; "format" = "RAM\n{}%";
"tooltip" = true;
"interval" = 5;
"justify" = "center";
}; };
"temperature" = { "temperature" = {
/* /*
@ -75,8 +85,8 @@
"format-critical" = "{temperatureC}°C {icon}"; "format-critical" = "{temperatureC}°C {icon}";
*/ */
"critical-threshold" = 80; "critical-threshold" = 80;
"format" = "{temperatureC}°C {icon}"; "format" = "{temperatureC}\n°C";
"format-icons" = ["" "" ""]; "justify" = "center";
}; };
"backlight" = { "backlight" = {
# "device" = "acpi_video1"; # "device" = "acpi_video1";
@ -98,14 +108,17 @@
"format-icons" = ["󰂎" "󰁻" "󰁽" "󰁿" "󰂂"]; "format-icons" = ["󰂎" "󰁻" "󰁽" "󰁿" "󰂂"];
}; };
"network" = { "network" = {
"format-wifi" = "{essid} ({signalStrength}%) "; "format-wifi" = "{bandwidthUpBits} up \n{bandwidthDownBits} down";
"format-ethernet" = "{ifname}: {ipaddr}/{cidr} "; "format-ethernet" = "{bandwidthUpBits} up \n{bandwidthDownBits} down";
"format-linked" = "{ifname} (No IP) "; "format-linked" = "{bandwidthUpBits} up \n{bandwidthDownBits} down";
"format-disconnected" = "Disconnected "; "format-disconnected" = "No Network {icon}";
"format-alt" = "{ifname}: {ipaddr}/{cidr}"; "format-alt" = "{bandwidthUpBits} up \n{bandwidthDownBits} down";
"interval" = 5;
"justify" = "right";
}; };
"mpris" = { "mpris" = {
"format" = "{title} by {artist}"; "format" = "{title}\nby {artist}";
"justify" = "center";
}; };
"pulseaudio" = { "pulseaudio" = {
/* /*
@ -115,21 +128,13 @@
"format-bluetooth-muted" = " {icon} {format_source}"; "format-bluetooth-muted" = " {icon} {format_source}";
"format-muted" = " {format_source}"; "format-muted" = " {format_source}";
*/ */
"format" = "{volume} {icon} <span>{format_source}</span>"; "format" = "{volume}%\n{format_source}";
"format-muted" = "󰝟 {format_source}"; "format-muted" = "MUTE\n{format_source}";
"format-source" = ""; "format-source" = "HOT";
"format-source-muted" = ""; "format-source-muted" = "OFF";
"format-icons" = {
"headphones" = "";
"handsfree" = "󱥋";
"headset" = "󰋎";
"phone" = "";
"portable" = "";
"car" = "";
"default" = ["" "" ""];
};
# TODO: toggle mute? # TODO: toggle mute?
"on-click" = "pavucontrol"; "on-click" = "${pkgs.pavucontrol}/bin/pavucontrol";
"justify" = "center";
}; };
}; };
}; };

View file

@ -80,7 +80,6 @@
environment = { environment = {
variables = { variables = {
GTK_THEME = "Catppuccin-Mocha-Compact-Sapphire-Dark";
VISUAL = "hx"; VISUAL = "hx";
PAGER = "less"; PAGER = "less";
MANPAGER = "less"; MANPAGER = "less";
@ -108,6 +107,7 @@
waybar waybar
wl-clipboard wl-clipboard
zathura zathura
/* /*
gimp gimp
inkscape inkscape

View file

@ -40,7 +40,6 @@
environment = { environment = {
variables = { variables = {
GTK_THEME = "Catppuccin-Mocha-Compact-Sapphire-Dark";
VISUAL = "hx"; VISUAL = "hx";
PAGER = "less"; PAGER = "less";
MANPAGER = "less"; MANPAGER = "less";