Compare commits

..

2 commits

Author SHA1 Message Date
Evie Litherland-Smith 105a35c024 Swap GTK theme to Colloid with purple modification
Swap Qt to use gtk2, should pick up from GTK theme then.

Remove additional packages bundled with sway, installed my own
versions.
2024-07-09 13:07:23 +01:00
Evie Litherland-Smith 1f71cdfcd1 Revert "Swap alacritty for foot (terminal)"
This reverts commit 48793f9718.
2024-07-09 11:59:23 +01:00
6 changed files with 40 additions and 29 deletions

View file

@ -7,7 +7,7 @@
}: { }: {
imports = [ imports = [
./sway/default.nix ./sway/default.nix
./foot/default.nix ./alacritty/default.nix
./avizo/default.nix ./avizo/default.nix
./fuzzel/default.nix ./fuzzel/default.nix
./swaylock/default.nix ./swaylock/default.nix
@ -79,31 +79,40 @@
inherit (config) scheme; inherit (config) scheme;
inherit accentColourName; inherit accentColourName;
}; };
toCapital = string:
with lib; let
chars = let
lc = strings.splitString "" string;
in (lists.sublist 1 (lists.length lc - 2) lc);
in (
strings.concatStringsSep "" (
(lists.singleton (strings.toUpper (lists.elemAt chars 0)))
++ (lists.sublist 1 (lists.length chars) chars)
)
);
in { in {
enable = true; enable = true;
gtk3 = {inherit extraCss;}; gtk3 = {inherit extraCss;};
gtk4 = {inherit extraCss;}; gtk4 = {inherit extraCss;};
theme = { theme = let
package = pkgs.adw-gtk3; color = "purple";
name = "adw-gtk3"; in {
package = pkgs.colloid-gtk-theme.override {
themeVariants = [color];
colorVariants = [config.scheme.variant];
};
name = "Colloid-${toCapital color}-${toCapital config.scheme.variant}";
}; };
iconTheme = { iconTheme = let
package = pkgs.papirus-icon-theme.override {color = "violet";}; color = "violet";
name = in {
if config.scheme.variant == "light" package = pkgs.papirus-icon-theme.override {inherit color;};
then "Papirus-Light" name = "Papirus-${toCapital config.scheme.variant}";
else "Papirus-Dark";
}; };
}; };
qt = { qt = {
enable = true; enable = true;
style = { style.name = "gtk2";
package = pkgs.adwaita-qt;
name =
if config.scheme.variant == "light"
then "adwaita"
else "adwaita-dark";
};
}; };
xdg = { xdg = {
mime.enable = true; mime.enable = true;

View file

@ -17,10 +17,10 @@
fuzzy = true; fuzzy = true;
filter-desktop = true; filter-desktop = true;
terminal = with config.programs; "${ terminal = with config.programs; "${
if foot.enable if alacritty.enable
then foot.package then alacritty.package
else pkgs.foot else pkgs.alacritty
}/bin/foot -e"; }/bin/alacritty -e";
lines = 24; lines = 24;
width = 80; width = 80;
tabs = 4; tabs = 4;

View file

@ -9,10 +9,10 @@
enable = true; enable = true;
package = pkgs.rofi-wayland; package = pkgs.rofi-wayland;
terminal = with config.programs; "${ terminal = with config.programs; "${
if foot.enable if alacritty.enable
then foot.package then alacritty.package
else pkgs.foot else pkgs.alacritty
}/bin/foot"; }/bin/alacritty";
font = fonts.monospace.name; font = fonts.monospace.name;
location = "center"; location = "center";
plugins = with pkgs; [rofi-emoji]; plugins = with pkgs; [rofi-emoji];

View file

@ -39,7 +39,7 @@ in {
}; };
}; };
modifier = "Mod4"; modifier = "Mod4";
terminal = "${config.programs.foot.package}/bin/foot"; terminal = "${config.programs.alacritty.package}/bin/alacritty";
menu = "${config.programs.fuzzel.package}/bin/fuzzel"; menu = "${config.programs.fuzzel.package}/bin/fuzzel";
workspaceAutoBackAndForth = true; workspaceAutoBackAndForth = true;
bars = []; bars = [];

View file

@ -63,7 +63,7 @@
"max-length" = 50; "max-length" = 50;
"rewrite" = { "rewrite" = {
"(.*) - GNU Emacs at (.*)" = " $1 [$2]"; "(.*) - GNU Emacs at (.*)" = " $1 [$2]";
"(foot.*)" = " $1"; "(alacritty.*)" = " $1";
"(.*) - mpv" = "󰦟 $1"; "(.*) - mpv" = "󰦟 $1";
"swayimg: (.*)" = "󰋩 $1"; "swayimg: (.*)" = "󰋩 $1";
"(btm)" = " Resource Usage [$1]"; "(btm)" = " Resource Usage [$1]";

View file

@ -64,7 +64,9 @@
package = package =
pkgs.swayfx.overrideAttrs pkgs.swayfx.overrideAttrs
(old: {passthru.providedSessions = ["sway"];}); (old: {passthru.providedSessions = ["sway"];});
extraPackages = [];
wrapperFeatures.gtk = true; wrapperFeatures.gtk = true;
xwayland.enable = true;
}; };
gamescope = { gamescope = {
enable = true; enable = true;
@ -75,8 +77,8 @@
gtk.iconCache.enable = true; gtk.iconCache.enable = true;
qt = { qt = {
enable = true; enable = true;
style = "adwaita"; style = "gtk2";
platformTheme = "gnome"; platformTheme = "gtk2";
}; };
services = { services = {
dbus.packages = with pkgs; [gcr]; dbus.packages = with pkgs; [gcr];