diff --git a/homeManagerModules/desktop/cinnamon/default.nix b/homeManagerModules/desktop/cinnamon/default.nix index 24907d41..5fd4a54c 100644 --- a/homeManagerModules/desktop/cinnamon/default.nix +++ b/homeManagerModules/desktop/cinnamon/default.nix @@ -5,54 +5,61 @@ ... }: { config = lib.mkIf config.alyraffauf.desktop.cinnamon.enable { - dconf.enable = true; - dconf.settings = { - "org/cinnamon/desktop/background".picture-uri = "file://${config.alyraffauf.theme.wallpaper}"; - "org/cinnamon/desktop/interface".cursor-size = config.alyraffauf.theme.cursorTheme.size; - "org/cinnamon/desktop/interface".cursor-theme = config.alyraffauf.theme.cursorTheme.name; - "org/cinnamon/desktop/interface".font-name = "${config.alyraffauf.theme.font.name} Regular ${toString config.alyraffauf.theme.font.size}"; - "org/cinnamon/desktop/interface".gtk-theme = config.alyraffauf.theme.gtk.name; - "org/cinnamon/desktop/interface".icon-theme = config.alyraffauf.theme.iconTheme.name; - "org/cinnamon/desktop/wm/preferences".titlebar-font = "${config.alyraffauf.theme.font.name} ${toString config.alyraffauf.theme.font.size}"; - "org/cinnamon/gestures".enabled = true; - "org/cinnamon/muffin".workspace-cycle = true; - "org/cinnamon/muffin".workspaces-only-on-primary = true; - "org/cinnamon/settings-daemon/peripherals/touchscreen".orientation-lock = false; - "org/cinnamon/theme".name = config.alyraffauf.theme.gtk.name; - "org/gnome/desktop/interface".gtk-theme = config.alyraffauf.theme.gtk.name; - "org/gnome/desktop/interface".cursor-size = config.alyraffauf.theme.cursorTheme.size; - "org/gnome/desktop/interface".cursor-theme = config.alyraffauf.theme.cursorTheme.name; - "org/gnome/desktop/interface".icon-theme = config.alyraffauf.theme.iconTheme.name; - "org/gnome/desktop/interface".monospace-font-name = "${config.alyraffauf.theme.terminalFont.name} Regular ${toString config.alyraffauf.theme.terminalFont.size}"; - "org/gnome/desktop/peripherals/touchpad".natural-scroll = true; - "org/gnome/desktop/peripherals/touchpad".tap-to-click = true; - "org/gnome/desktop/wm/preferences".titlebar-font = "${config.alyraffauf.theme.font.name} ${toString config.alyraffauf.theme.font.size}"; - "org/nemo/desktop".font = "${config.alyraffauf.theme.font.name} ${toString config.alyraffauf.theme.font.size}"; - "org/cinnamon/desktop/wm/preferences" = { - focus-mode = "mouse"; - mouse-button-modifier = ""; + alyraffauf = { + apps = { + nemo.enable = lib.mkDefault true; }; - "org/gnome/desktop/wm/preferences" = { - focus-mode = "mouse"; - mouse-button-modifier = ""; - }; - "org/cinnamon/muffin".attach-modal-dialogs = true; - "org/cinnamon/desktop/keybindings/media-keys" = { - www = ["XF86WWW" "b"]; - terminal = ["" "t"]; - }; - "org/cinnamon/desktop/keybindings/wm" = { - # TODO: Declaratively disable conflict with panel applet. - close = ["F4" "c"]; - switch-to-workspace-1 = ["1"]; - switch-to-workspace-2 = ["2"]; - switch-to-workspace-3 = ["3"]; - switch-to-workspace-4 = ["4"]; - switch-to-workspace-5 = ["5"]; - switch-to-workspace-6 = ["6"]; - switch-to-workspace-7 = ["7"]; - switch-to-workspace-8 = ["8"]; - switch-to-workspace-9 = ["9"]; + }; + dconf = { + enable = true; + settings = { + "org/cinnamon/desktop/background".picture-uri = "file://${config.alyraffauf.theme.wallpaper}"; + "org/cinnamon/desktop/interface".cursor-size = config.alyraffauf.theme.cursorTheme.size; + "org/cinnamon/desktop/interface".cursor-theme = config.alyraffauf.theme.cursorTheme.name; + "org/cinnamon/desktop/interface".font-name = "${config.alyraffauf.theme.font.name} Regular ${toString config.alyraffauf.theme.font.size}"; + "org/cinnamon/desktop/interface".gtk-theme = config.alyraffauf.theme.gtk.name; + "org/cinnamon/desktop/interface".icon-theme = config.alyraffauf.theme.iconTheme.name; + "org/cinnamon/desktop/wm/preferences".titlebar-font = "${config.alyraffauf.theme.font.name} ${toString config.alyraffauf.theme.font.size}"; + "org/cinnamon/gestures".enabled = true; + "org/cinnamon/muffin".workspace-cycle = true; + "org/cinnamon/muffin".workspaces-only-on-primary = true; + "org/cinnamon/settings-daemon/peripherals/touchscreen".orientation-lock = false; + "org/cinnamon/theme".name = config.alyraffauf.theme.gtk.name; + "org/gnome/desktop/interface".gtk-theme = config.alyraffauf.theme.gtk.name; + "org/gnome/desktop/interface".cursor-size = config.alyraffauf.theme.cursorTheme.size; + "org/gnome/desktop/interface".cursor-theme = config.alyraffauf.theme.cursorTheme.name; + "org/gnome/desktop/interface".icon-theme = config.alyraffauf.theme.iconTheme.name; + "org/gnome/desktop/interface".monospace-font-name = "${config.alyraffauf.theme.terminalFont.name} Regular ${toString config.alyraffauf.theme.terminalFont.size}"; + "org/gnome/desktop/peripherals/touchpad".natural-scroll = true; + "org/gnome/desktop/peripherals/touchpad".tap-to-click = true; + "org/gnome/desktop/wm/preferences".titlebar-font = "${config.alyraffauf.theme.font.name} ${toString config.alyraffauf.theme.font.size}"; + "org/nemo/desktop".font = "${config.alyraffauf.theme.font.name} ${toString config.alyraffauf.theme.font.size}"; + "org/cinnamon/desktop/wm/preferences" = { + focus-mode = "mouse"; + mouse-button-modifier = ""; + }; + "org/gnome/desktop/wm/preferences" = { + focus-mode = "mouse"; + mouse-button-modifier = ""; + }; + "org/cinnamon/muffin".attach-modal-dialogs = true; + "org/cinnamon/desktop/keybindings/media-keys" = { + www = ["XF86WWW" "b"]; + terminal = ["" "t"]; + }; + "org/cinnamon/desktop/keybindings/wm" = { + # TODO: Declaratively disable conflict with panel applet. + close = ["F4" "c"]; + switch-to-workspace-1 = ["1"]; + switch-to-workspace-2 = ["2"]; + switch-to-workspace-3 = ["3"]; + switch-to-workspace-4 = ["4"]; + switch-to-workspace-5 = ["5"]; + switch-to-workspace-6 = ["6"]; + switch-to-workspace-7 = ["7"]; + switch-to-workspace-8 = ["8"]; + switch-to-workspace-9 = ["9"]; + }; }; }; };