drop cinnamon (#56)
Some checks are pending
flakehub / flakehub-publish (push) Waiting to run
git-mirror / gitlab-sync (push) Waiting to run
nix-build / default-build (push) Waiting to run
nix-build / fallarbor-build (push) Waiting to run
nix-build / lavaridge-build (push) Waiting to run
nix-build / mauville-build (push) Waiting to run
nix-build / petalburg-build (push) Waiting to run
nix-build / rustboro-build (push) Waiting to run
nix-check / fmt-check (push) Waiting to run
nix-check / eval-check (push) Waiting to run

* cinnamon: drop modules

* home/theme: remove cinnamon theming

* cinnamon: remove module references
This commit is contained in:
Aly Raffauf 2024-07-21 12:25:59 -04:00 committed by GitHub
parent 5dc510ef93
commit 56427dd1aa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 3 additions and 158 deletions

View file

@ -51,7 +51,7 @@
"update.mode" = "none"; "update.mode" = "none";
"window.menuBarVisibility" = "hidden"; "window.menuBarVisibility" = "hidden";
"window.titleBarStyle" = "window.titleBarStyle" =
if config.ar.home.desktop.gnome.enable || config.ar.home.desktop.cinnamon.enable if config.ar.home.desktop.gnome.enable
then "custom" then "custom"
else "native"; else "native";
"window.zoomPerWindow" = false; "window.zoomPerWindow" = false;

View file

@ -1,65 +0,0 @@
{
lib,
config,
...
}: {
config = lib.mkIf config.ar.home.desktop.cinnamon.enable {
dconf = {
enable = true;
settings = {
"org/cinnamon/desktop/peripherals/touchpad".click-method = "fingers";
"org/cinnamon/gestures".enabled = true;
"org/cinnamon/muffin" = {
attach-modal-dialogs = true;
workspace-cycle = true;
workspaces-only-on-primary = true;
};
"org/cinnamon/desktop/interface".clock-use-24h = false;
"org/gnome/desktop/interface".clock-format = "12h";
"org/cinnamon/settings-daemon/peripherals/touchscreen".orientation-lock = false;
"org/gnome/desktop/peripherals/touchpad" = {
natural-scroll = true;
tap-to-click = true;
};
"org/gnome/desktop/wm/preferences" = {
focus-mode = "mouse";
mouse-button-modifier = "<Super>";
};
"org/cinnamon/desktop/keybindings/media-keys" = {
www = ["XF86WWW" "<Super>b"];
terminal = ["<Primary><Alt>" "<Super>t"];
home = ["<Super>f" "XF86Explorer"];
};
"org/cinnamon/desktop/keybindings/wm" = {
# TODO: Declaratively disable conflict with panel applet.
close = ["<Alt>F4" "<Super>c"];
switch-to-workspace-1 = ["<Super>1"];
switch-to-workspace-2 = ["<Super>2"];
switch-to-workspace-3 = ["<Super>3"];
switch-to-workspace-4 = ["<Super>4"];
switch-to-workspace-5 = ["<Super>5"];
switch-to-workspace-6 = ["<Super>6"];
switch-to-workspace-7 = ["<Super>7"];
switch-to-workspace-8 = ["<Super>8"];
switch-to-workspace-9 = ["<Super>9"];
};
"org/cinnamon/desktop/keybindings".custom-list = ["__dummy__" "custom0"];
"org/cinnamon/desktop/keybindings/custom-keybindings/custom0" = {
binding = ["<Super>e"];
name = "Open Editor";
command = "${lib.getExe config.ar.home.defaultApps.editor}";
};
};
};
};
}

View file

@ -5,7 +5,6 @@
... ...
}: { }: {
imports = [ imports = [
./cinnamon
./gnome ./gnome
./hyprland ./hyprland
./sway ./sway
@ -14,8 +13,7 @@
config = config =
lib.mkIf ( lib.mkIf (
config.ar.home.desktop.cinnamon.enable config.ar.home.desktop.gnome.enable
|| config.ar.home.desktop.gnome.enable
|| config.ar.home.desktop.hyprland.enable || config.ar.home.desktop.hyprland.enable
|| config.ar.home.desktop.sway.enable || config.ar.home.desktop.sway.enable
) { ) {

View file

@ -102,12 +102,6 @@ in {
}; };
desktop = { desktop = {
cinnamon.enable = lib.mkOption {
description = "Cinnamon with sane defaults";
default = osConfig.ar.desktop.cinnamon.enable;
type = lib.types.bool;
};
gnome.enable = lib.mkOption { gnome.enable = lib.mkOption {
description = "GNOME with sane defaults."; description = "GNOME with sane defaults.";
default = osConfig.ar.desktop.gnome.enable; default = osConfig.ar.desktop.gnome.enable;

View file

@ -113,31 +113,6 @@ in {
}; };
dconf.settings = { dconf.settings = {
"org/cinnamon/desktop/background".picture-uri = "file://${cfg.wallpaper}";
"org/cinnamon/desktop/interface" = {
cursor-size = config.home.pointerCursor.size;
cursor-theme = config.home.pointerCursor.name;
font-name = "${config.gtk.font.name} ${toString config.gtk.font.size}";
gtk-theme =
if cfg.darkMode
then "adw-gtk3-dark"
else "adw-gtk3";
icon-theme =
if cfg.darkMode
then "Papirus-Dark"
else "Papirus";
};
"org/cinnamon/theme".name =
if cfg.darkMode
then "adw-gtk3-dark"
else "adw-gtk3";
"org/cinnamon/desktop/wm/preferences".titlebar-font = "${config.gtk.font.name} ${toString config.gtk.font.size}";
"org/gnome/desktop/background" = { "org/gnome/desktop/background" = {
picture-uri = "file://${cfg.wallpaper}"; picture-uri = "file://${cfg.wallpaper}";
picture-uri-dark = "file://${cfg.wallpaper}"; picture-uri-dark = "file://${cfg.wallpaper}";

View file

@ -1,54 +0,0 @@
{
config,
lib,
pkgs,
...
}: {
config = lib.mkIf config.ar.desktop.cinnamon.enable {
security.pam.services.lightdm = {
enableGnomeKeyring = true;
gnupg.enable = true;
kwallet.enable = true;
};
services = {
xserver = {
enable = true;
desktopManager.cinnamon.enable = true;
displayManager.lightdm = {
enable = true;
greeters.slick = {
enable = true;
cursorTheme = {
name = "Bibata-Modern-Classic";
package = pkgs.bibata-cursors;
size = 20;
};
font = {
name = "NotoSans Nerd Font";
package = pkgs.nerdfonts.override {fonts = ["Noto"];};
};
iconTheme = {
name = "Papirus-Dark";
package = pkgs.papirus-icon-theme;
};
theme = {
name = "adw-gtk3-dark";
package = pkgs.adw-gtk3;
};
extraConfig = ''
background=#242424
enable-hidpi=on
'';
};
};
};
};
};
}

View file

@ -5,7 +5,6 @@
... ...
}: { }: {
imports = [ imports = [
./cinnamon
./gnome ./gnome
./greetd ./greetd
./hyprland ./hyprland
@ -15,8 +14,7 @@
config = config =
lib.mkIf ( lib.mkIf (
config.ar.desktop.cinnamon.enable config.ar.desktop.gnome.enable
|| config.ar.desktop.gnome.enable
|| config.ar.desktop.hyprland.enable || config.ar.desktop.hyprland.enable
|| config.ar.desktop.steam.enable || config.ar.desktop.steam.enable
|| config.ar.desktop.sway.enable || config.ar.desktop.sway.enable

View file

@ -13,7 +13,6 @@
}; };
desktop = { desktop = {
cinnamon.enable = lib.mkEnableOption "Cinnamon desktop session.";
gnome.enable = lib.mkEnableOption "GNOME desktop session."; gnome.enable = lib.mkEnableOption "GNOME desktop session.";
greetd = { greetd = {