Compare commits
No commits in common. "105a35c02492e21bc8851401d231893100f8fe3e" and "6595543ac0f0f42d92dbe6836ea2459a02cc13c0" have entirely different histories.
105a35c024
...
6595543ac0
|
@ -7,7 +7,7 @@
|
||||||
}: {
|
}: {
|
||||||
imports = [
|
imports = [
|
||||||
./sway/default.nix
|
./sway/default.nix
|
||||||
./alacritty/default.nix
|
./foot/default.nix
|
||||||
./avizo/default.nix
|
./avizo/default.nix
|
||||||
./fuzzel/default.nix
|
./fuzzel/default.nix
|
||||||
./swaylock/default.nix
|
./swaylock/default.nix
|
||||||
|
@ -79,40 +79,31 @@
|
||||||
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 = let
|
theme = {
|
||||||
color = "purple";
|
package = pkgs.adw-gtk3;
|
||||||
in {
|
name = "adw-gtk3";
|
||||||
package = pkgs.colloid-gtk-theme.override {
|
|
||||||
themeVariants = [color];
|
|
||||||
colorVariants = [config.scheme.variant];
|
|
||||||
};
|
};
|
||||||
name = "Colloid-${toCapital color}-${toCapital config.scheme.variant}";
|
iconTheme = {
|
||||||
};
|
package = pkgs.papirus-icon-theme.override {color = "violet";};
|
||||||
iconTheme = let
|
name =
|
||||||
color = "violet";
|
if config.scheme.variant == "light"
|
||||||
in {
|
then "Papirus-Light"
|
||||||
package = pkgs.papirus-icon-theme.override {inherit color;};
|
else "Papirus-Dark";
|
||||||
name = "Papirus-${toCapital config.scheme.variant}";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
qt = {
|
qt = {
|
||||||
enable = true;
|
enable = true;
|
||||||
style.name = "gtk2";
|
style = {
|
||||||
|
package = pkgs.adwaita-qt;
|
||||||
|
name =
|
||||||
|
if config.scheme.variant == "light"
|
||||||
|
then "adwaita"
|
||||||
|
else "adwaita-dark";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
xdg = {
|
xdg = {
|
||||||
mime.enable = true;
|
mime.enable = true;
|
||||||
|
|
|
@ -17,10 +17,10 @@
|
||||||
fuzzy = true;
|
fuzzy = true;
|
||||||
filter-desktop = true;
|
filter-desktop = true;
|
||||||
terminal = with config.programs; "${
|
terminal = with config.programs; "${
|
||||||
if alacritty.enable
|
if foot.enable
|
||||||
then alacritty.package
|
then foot.package
|
||||||
else pkgs.alacritty
|
else pkgs.foot
|
||||||
}/bin/alacritty -e";
|
}/bin/foot -e";
|
||||||
lines = 24;
|
lines = 24;
|
||||||
width = 80;
|
width = 80;
|
||||||
tabs = 4;
|
tabs = 4;
|
||||||
|
|
|
@ -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 alacritty.enable
|
if foot.enable
|
||||||
then alacritty.package
|
then foot.package
|
||||||
else pkgs.alacritty
|
else pkgs.foot
|
||||||
}/bin/alacritty";
|
}/bin/foot";
|
||||||
font = fonts.monospace.name;
|
font = fonts.monospace.name;
|
||||||
location = "center";
|
location = "center";
|
||||||
plugins = with pkgs; [rofi-emoji];
|
plugins = with pkgs; [rofi-emoji];
|
||||||
|
|
|
@ -39,7 +39,7 @@ in {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
modifier = "Mod4";
|
modifier = "Mod4";
|
||||||
terminal = "${config.programs.alacritty.package}/bin/alacritty";
|
terminal = "${config.programs.foot.package}/bin/foot";
|
||||||
menu = "${config.programs.fuzzel.package}/bin/fuzzel";
|
menu = "${config.programs.fuzzel.package}/bin/fuzzel";
|
||||||
workspaceAutoBackAndForth = true;
|
workspaceAutoBackAndForth = true;
|
||||||
bars = [];
|
bars = [];
|
||||||
|
|
|
@ -63,7 +63,7 @@
|
||||||
"max-length" = 50;
|
"max-length" = 50;
|
||||||
"rewrite" = {
|
"rewrite" = {
|
||||||
"(.*) - GNU Emacs at (.*)" = " $1 [$2]";
|
"(.*) - GNU Emacs at (.*)" = " $1 [$2]";
|
||||||
"(alacritty.*)" = " $1";
|
"(foot.*)" = " $1";
|
||||||
"(.*) - mpv" = " $1";
|
"(.*) - mpv" = " $1";
|
||||||
"swayimg: (.*)" = " $1";
|
"swayimg: (.*)" = " $1";
|
||||||
"(btm)" = " Resource Usage [$1]";
|
"(btm)" = " Resource Usage [$1]";
|
||||||
|
|
|
@ -64,9 +64,7 @@
|
||||||
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;
|
||||||
|
@ -77,8 +75,8 @@
|
||||||
gtk.iconCache.enable = true;
|
gtk.iconCache.enable = true;
|
||||||
qt = {
|
qt = {
|
||||||
enable = true;
|
enable = true;
|
||||||
style = "gtk2";
|
style = "adwaita";
|
||||||
platformTheme = "gtk2";
|
platformTheme = "gnome";
|
||||||
};
|
};
|
||||||
services = {
|
services = {
|
||||||
dbus.packages = with pkgs; [gcr];
|
dbus.packages = with pkgs; [gcr];
|
||||||
|
|
Loading…
Reference in a new issue