From b7925c965e7c7d69e7d71266e5504c39d3e8b910 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Thu, 12 Sep 2024 13:24:57 -0500 Subject: [PATCH] Fix GTK theme --- modules/home-manager/default.nix | 27 +++++++--- modules/home-manager/sway.nix | 9 ++-- modules/home-manager/waybar.nix | 89 +++++++++++++++++--------------- modules/nixos/default.nix | 2 +- modules/nixos/gnome.nix | 1 - 5 files changed, 72 insertions(+), 56 deletions(-) diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index f2d9f81..26e0af2 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -1205,15 +1205,26 @@ ]; gtk.theme = { - name = "Catppuccin-Mocha-Compact-Sapphire-Dark"; - package = pkgs.catppuccin-gtk.override { - accents = ["sapphire"]; - size = "compact"; - tweaks = ["rimless"]; - variant = "mocha"; - }; - }; + name = "catppuccin-mocha-blue-compact+default"; + package = + (pkgs.catppuccin-gtk.overrideAttrs { + src = pkgs.fetchFromGitHub { + owner = "catppuccin"; + repo = "gtk"; + rev = "v1.0.3"; + fetchSubmodules = true; + hash = "sha256-q5/VcFsm3vNEw55zq/vcM11eo456SYE5TQA3g2VQjGc="; + }; + postUnpack = ""; + }) + .override + { + accents = ["sapphire"]; + variant = "mocha"; + size = "compact"; + }; + }; home.pointerCursor = { name = "Bibata-Modern-Classic"; package = pkgs.bibata-cursors; diff --git a/modules/home-manager/sway.nix b/modules/home-manager/sway.nix index f6de700..152600b 100644 --- a/modules/home-manager/sway.nix +++ b/modules/home-manager/sway.nix @@ -51,7 +51,7 @@ wayland.windowManager.sway = { /* - TODO: + TODO: + Super+r should rotate the selected group of windows. + Super+Control+{1-9} should control the size of the preselect space. + Super+Shift+b should balance the size of all selected nodes. @@ -181,13 +181,13 @@ input = { "type:keyboard" = { xkb_options = "ctrl:nocaps"; - repeat_delay = "200"; - repeat_rate = "60"; + repeat_delay = "180"; + repeat_rate = "100"; }; "type:pointer" = { accel_profile = "flat"; - pointer_accel = "0"; + pointer_accel = "0.5"; }; "type:touchpad" = { @@ -211,6 +211,7 @@ "${mod}+c" = "kill"; "${mod}+shift+c" = "kill # TODO: kill -9?"; "${mod}+alt+space" = "exec wofi --show drun"; + "${mod}" = "exec ${menu}"; "${mod}+space" = "exec ${menu}"; "${mod}+shift+s" = "exec clipshot"; "${mod}+e" = "exec thunar"; diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix index d57e76c..4b36e67 100644 --- a/modules/home-manager/waybar.nix +++ b/modules/home-manager/waybar.nix @@ -1,4 +1,8 @@ -{style, ...}: { +{ + pkgs, + style, + ... +}: { programs.waybar = { enable = true; settings = { @@ -6,36 +10,37 @@ "layer" = "top"; "position" = "bottom"; "output" = ["eDP-1" "DP-3"]; - "height" = 32; - "modules-left" = ["clock" "sway/window"]; - "modules-center" = ["sway/workspaces"]; + "height" = 50; + "modules-left" = [ + "idle_inhibitor" + "sway/workspaces" + "sway/window" + ]; + "modules-center" = []; "modules-right" = [ "mpris" - "idle_inhibitor" - "bluetooth" - "wireplumber" - "pulseaudio" "network" + ## "disk" + ## TODO: will need a custom module for Disk IO + + ## "wireplumber" # pulseaudio module is more featureful + "pulseaudio" "cpu" "memory" "temperature" "backlight" "battery" + + "bluetooth" "tray" + "clock" ]; "bluetooth" = { "format" = ""; - "format-connected" = ""; - "format-connected-battery" = ""; - # "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}%)"; + "on-click" = "${pkgs.blueman}/bin/blueman-manager"; }; "wireplumber" = { "format" = "{volume}% {icon}"; - "format-muted" = ""; "on-click" = "helvum"; }; "sway/workspaces" = { @@ -58,15 +63,20 @@ }; "clock" = { "interval" = 1; - "format" = "{:%a %b %d %H:%M:%S}"; + "format" = "{:%a %b %d\n%H:%M:%S}"; + "justify" = "center"; }; "cpu" = { - "format" = "{usage} "; + "format" = "CPU\n{usage}%"; "tooltip" = true; - "interval" = 3; + "interval" = 5; + "justify" = "center"; }; "memory" = { - "format" = "{} 󰍛"; + "format" = "RAM\n{}%"; + "tooltip" = true; + "interval" = 5; + "justify" = "center"; }; "temperature" = { /* @@ -75,8 +85,8 @@ "format-critical" = "{temperatureC}°C {icon}"; */ "critical-threshold" = 80; - "format" = "{temperatureC}°C {icon}"; - "format-icons" = ["" "" ""]; + "format" = "{temperatureC}\n°C"; + "justify" = "center"; }; "backlight" = { # "device" = "acpi_video1"; @@ -98,14 +108,17 @@ "format-icons" = ["󰂎" "󰁻" "󰁽" "󰁿" "󰂂"]; }; "network" = { - "format-wifi" = "{essid} ({signalStrength}%) "; - "format-ethernet" = "{ifname}: {ipaddr}/{cidr} "; - "format-linked" = "{ifname} (No IP) "; - "format-disconnected" = "Disconnected ⚠"; - "format-alt" = "{ifname}: {ipaddr}/{cidr}"; + "format-wifi" = "{bandwidthUpBits} up \n{bandwidthDownBits} down"; + "format-ethernet" = "{bandwidthUpBits} up \n{bandwidthDownBits} down"; + "format-linked" = "{bandwidthUpBits} up \n{bandwidthDownBits} down"; + "format-disconnected" = "No Network {icon}"; + "format-alt" = "{bandwidthUpBits} up \n{bandwidthDownBits} down"; + "interval" = 5; + "justify" = "right"; }; "mpris" = { - "format" = "{title} by {artist}"; + "format" = "{title}\nby {artist}"; + "justify" = "center"; }; "pulseaudio" = { /* @@ -115,21 +128,13 @@ "format-bluetooth-muted" = " {icon} {format_source}"; "format-muted" = " {format_source}"; */ - "format" = "{volume} {icon} {format_source}"; - "format-muted" = "󰝟 {format_source}"; - "format-source" = ""; - "format-source-muted" = ""; - "format-icons" = { - "headphones" = ""; - "handsfree" = "󱥋"; - "headset" = "󰋎"; - "phone" = ""; - "portable" = ""; - "car" = ""; - "default" = ["" "" ""]; - }; + "format" = "{volume}%\n{format_source}"; + "format-muted" = "MUTE\n{format_source}"; + "format-source" = "HOT"; + "format-source-muted" = "OFF"; # TODO: toggle mute? - "on-click" = "pavucontrol"; + "on-click" = "${pkgs.pavucontrol}/bin/pavucontrol"; + "justify" = "center"; }; }; }; diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 5fd0453..01296af 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -80,7 +80,6 @@ environment = { variables = { - GTK_THEME = "Catppuccin-Mocha-Compact-Sapphire-Dark"; VISUAL = "hx"; PAGER = "less"; MANPAGER = "less"; @@ -108,6 +107,7 @@ waybar wl-clipboard zathura + /* gimp inkscape diff --git a/modules/nixos/gnome.nix b/modules/nixos/gnome.nix index 79eb1b0..83a1514 100644 --- a/modules/nixos/gnome.nix +++ b/modules/nixos/gnome.nix @@ -40,7 +40,6 @@ environment = { variables = { - GTK_THEME = "Catppuccin-Mocha-Compact-Sapphire-Dark"; VISUAL = "hx"; PAGER = "less"; MANPAGER = "less";