home: code cleanup

This commit is contained in:
Aly Raffauf 2024-07-03 00:40:04 -04:00
parent 8376b85ab4
commit 9398ad6f66
4 changed files with 13 additions and 16 deletions

View file

@ -26,6 +26,7 @@
settings = { settings = {
"org/gtk/gtk4/settings/file-chooser".sort-directories-first = true; "org/gtk/gtk4/settings/file-chooser".sort-directories-first = true;
"org/gtk/settings/file-chooser".sort-directories-first = true; "org/gtk/settings/file-chooser".sort-directories-first = true;
"org/virt-manager/virt-manager/connections" = { "org/virt-manager/virt-manager/connections" = {
autoconnect = ["qemu:///system"]; autoconnect = ["qemu:///system"];
uris = ["qemu:///system"]; uris = ["qemu:///system"];

View file

@ -80,10 +80,8 @@
(lib.getExe pkgs.mako) (lib.getExe pkgs.mako)
"${pkgs.mate.mate-polkit}/libexec/polkit-mate-authentication-agent-1" "${pkgs.mate.mate-polkit}/libexec/polkit-mate-authentication-agent-1"
] ]
++ lib.lists.optionals (config.ar.home.desktop.hyprland.redShift) [ ++ lib.lists.optional (config.ar.home.desktop.hyprland.redShift)
# "${pkgs.geoclue2}/libexec/geoclue-2.0/demos/agent" "${lib.getExe pkgs.gammastep} -l 33.74:-84.38";
"${lib.getExe pkgs.gammastep} -l 33.74:-84.38"
];
screenshot = rec { screenshot = rec {
bin = lib.getExe pkgs.hyprshot; bin = lib.getExe pkgs.hyprshot;
@ -130,7 +128,7 @@
fi fi
elif [ "$1" == "off" ]; then elif [ "$1" == "off" ]; then
${ ${
lib.strings.concatStringsSep "\n" lib.strings.concatLines
( (
lib.attrsets.mapAttrsToList (name: monitor: ''${hyprctl} keyword monitor "${monitor}"'') lib.attrsets.mapAttrsToList (name: monitor: ''${hyprctl} keyword monitor "${monitor}"'')
laptopMonitors laptopMonitors
@ -192,7 +190,7 @@
''; '';
in '' in ''
${ ${
lib.strings.concatStringsSep "\n" lib.strings.concatLines
( (
lib.attrsets.mapAttrsToList (name: value: "monitor = ${value}") lib.attrsets.mapAttrsToList (name: value: "monitor = ${value}")
(laptopMonitors // externalMonitors) (laptopMonitors // externalMonitors)
@ -368,7 +366,7 @@
# Move window with mainMod SHIFT + keys ++ # Move window with mainMod SHIFT + keys ++
# Move workspace to another output with mainMod CONTROL SHIFT + keys. # Move workspace to another output with mainMod CONTROL SHIFT + keys.
${ ${
lib.strings.concatStringsSep "\n" lib.strings.concatLines
( (
lib.attrsets.mapAttrsToList (key: direction: '' lib.attrsets.mapAttrsToList (key: direction: ''
bind = ${modifier}, ${key}, movefocus, ${direction} bind = ${modifier}, ${key}, movefocus, ${direction}
@ -450,7 +448,7 @@
# Move window with keys ++ # Move window with keys ++
# Move workspaces across monitors with CONTROL + keys. # Move workspaces across monitors with CONTROL + keys.
${ ${
lib.strings.concatStringsSep "\n" lib.strings.concatLines
( (
lib.attrsets.mapAttrsToList (key: direction: '' lib.attrsets.mapAttrsToList (key: direction: ''
bind = , ${key}, movewindow, ${direction} bind = , ${key}, movewindow, ${direction}

View file

@ -16,9 +16,7 @@
dconf = { dconf = {
enable = true; enable = true;
settings = { settings = {
"org/gnome/desktop/wm/preferences" = { "org/gnome/desktop/wm/preferences" = {button-layout = "";};
button-layout = "";
};
"org/gnome/nm-applet".disable-connected-notifications = true; "org/gnome/nm-applet".disable-connected-notifications = true;
}; };
}; };
@ -32,9 +30,9 @@
xdg.portal = { xdg.portal = {
enable = true; enable = true;
configPackages = configPackages =
lib.optionals (config.ar.home.desktop.hyprland.enable) [pkgs.xdg-desktop-portal-hyprland]; lib.optional (config.ar.home.desktop.hyprland.enable) pkgs.xdg-desktop-portal-hyprland;
extraPortals = extraPortals =
lib.optionals (config.ar.home.desktop.hyprland.enable) [pkgs.xdg-desktop-portal-hyprland]; lib.optional (config.ar.home.desktop.hyprland.enable) pkgs.xdg-desktop-portal-hyprland;
}; };
}; };
} }

View file

@ -67,8 +67,9 @@
@define-color accent_color @accent_bg_color; @define-color accent_color @accent_bg_color;
${ ${
if config.ar.home.theme.gtk.hideTitleBar lib.strings.optionalString
then '' config.ar.home.theme.gtk.hideTitleBar
''
/* No (default) title bar on wayland */ /* No (default) title bar on wayland */
headerbar.default-decoration { headerbar.default-decoration {
/* You may need to tweak these values depending on your GTK theme */ /* You may need to tweak these values depending on your GTK theme */
@ -89,7 +90,6 @@
box-shadow: none; box-shadow: none;
} }
'' ''
else "/* */"
} }
''; '';