theme edits
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
with lib;
|
||||
let
|
||||
cfg = config.mjallen.programs.hyprland;
|
||||
drawer = "nwg-drawer -fm nautilus -term kitty -mb 10 -mt 10 -ml 10 -mr 10 -pbuseicontheme -i ${cfg.iconThemeName}";
|
||||
drawer = "nwg-drawer -fm nautilus -term kitty -mb 10 -mt 10 -ml 10 -mr 10 -pbuseicontheme -i ${config.gtk.iconTheme.name}";
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
@@ -80,9 +80,9 @@ in
|
||||
CLUTTER_BACKEND = "wayland";
|
||||
EDITOR = "${cfg.defaultApps.editor.pname}";
|
||||
VISUAL = "${cfg.defaultApps.visual.pname}";
|
||||
ICON_THEME = cfg.iconThemeName;
|
||||
ICON_THEME = config.gtk.iconTheme.name;
|
||||
GTK_CSD = "0";
|
||||
GTK_THEME = cfg.gtkThemeName;
|
||||
GTK_THEME = config.gtk.theme.name;
|
||||
GTK_USE_PORTAL = "1";
|
||||
HYPRCURSOR_THEME = config.home.pointerCursor.name;
|
||||
HYPRCURSOR_SIZE = config.home.pointerCursor.size;
|
||||
@@ -354,30 +354,31 @@ in
|
||||
]
|
||||
++ cfg.keybinds.bindl;
|
||||
|
||||
monitor = cfg.monitor;
|
||||
monitorv2 = map (
|
||||
m:
|
||||
if m.disabled then
|
||||
"${m.name}, disable"
|
||||
else if m.mirrorOf != null then
|
||||
"${m.name}, mirror, ${m.mirrorOf}"
|
||||
else
|
||||
let
|
||||
mode = if m.mode == null then "preferred" else m.mode;
|
||||
position = if m.position == null then "auto" else m.position;
|
||||
scale = if m.scale == null then "1" else (toString m.scale);
|
||||
transform = if m.transform == null then "auto" else m.transform;
|
||||
base = [
|
||||
m.name
|
||||
mode
|
||||
position
|
||||
scale
|
||||
transform
|
||||
];
|
||||
line = builtins.concatStringsSep ", " (base ++ m.extra);
|
||||
in
|
||||
line
|
||||
) cfg.monitorv2;
|
||||
monitor =
|
||||
cfg.monitor
|
||||
++ map (
|
||||
m:
|
||||
if m.disabled then
|
||||
"${m.name}, disable"
|
||||
else if m.mirrorOf != null then
|
||||
"${m.name}, mirror, ${m.mirrorOf}"
|
||||
else
|
||||
let
|
||||
mode = if m.mode == null then "preferred" else m.mode;
|
||||
position = if m.position == null then "0x0" else m.position;
|
||||
scale = if m.scale == null then "1" else (toString m.scale);
|
||||
parts = [
|
||||
m.name
|
||||
mode
|
||||
position
|
||||
scale
|
||||
];
|
||||
# Append transform only when set, as "transform, <value>"
|
||||
transformTokens = if m.transform == null then [ ] else [ "transform" m.transform ];
|
||||
tokens = parts ++ transformTokens ++ m.extra;
|
||||
in
|
||||
builtins.concatStringsSep ", " tokens
|
||||
) cfg.monitorv2;
|
||||
|
||||
render = {
|
||||
cm_fs_passthrough = 1;
|
||||
|
||||
Reference in New Issue
Block a user