diff --git a/homeManagerModules/apps/vsCodium/default.nix b/homeManagerModules/apps/vsCodium/default.nix index 2a88203f..97e1671a 100644 --- a/homeManagerModules/apps/vsCodium/default.nix +++ b/homeManagerModules/apps/vsCodium/default.nix @@ -51,7 +51,7 @@ "update.mode" = "none"; "window.menuBarVisibility" = "hidden"; "window.titleBarStyle" = - if config.ar.home.desktop.gnome.enable || config.ar.home.desktop.cinnamon.enable + if config.ar.home.desktop.gnome.enable then "custom" else "native"; "window.zoomPerWindow" = false; diff --git a/homeManagerModules/desktop/cinnamon/default.nix b/homeManagerModules/desktop/cinnamon/default.nix deleted file mode 100644 index 9725468e..00000000 --- a/homeManagerModules/desktop/cinnamon/default.nix +++ /dev/null @@ -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 = ""; - }; - - "org/cinnamon/desktop/keybindings/media-keys" = { - www = ["XF86WWW" "b"]; - terminal = ["" "t"]; - home = ["f" "XF86Explorer"]; - }; - - "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"]; - }; - - "org/cinnamon/desktop/keybindings".custom-list = ["__dummy__" "custom0"]; - - "org/cinnamon/desktop/keybindings/custom-keybindings/custom0" = { - binding = ["e"]; - name = "Open Editor"; - command = "${lib.getExe config.ar.home.defaultApps.editor}"; - }; - }; - }; - }; -} diff --git a/homeManagerModules/desktop/default.nix b/homeManagerModules/desktop/default.nix index 2e392f40..f3c5e045 100644 --- a/homeManagerModules/desktop/default.nix +++ b/homeManagerModules/desktop/default.nix @@ -5,7 +5,6 @@ ... }: { imports = [ - ./cinnamon ./gnome ./hyprland ./sway @@ -14,8 +13,7 @@ config = 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.sway.enable ) { diff --git a/homeManagerModules/options.nix b/homeManagerModules/options.nix index 65212a60..b8f25ba7 100644 --- a/homeManagerModules/options.nix +++ b/homeManagerModules/options.nix @@ -102,12 +102,6 @@ in { }; desktop = { - cinnamon.enable = lib.mkOption { - description = "Cinnamon with sane defaults"; - default = osConfig.ar.desktop.cinnamon.enable; - type = lib.types.bool; - }; - gnome.enable = lib.mkOption { description = "GNOME with sane defaults."; default = osConfig.ar.desktop.gnome.enable; diff --git a/homeManagerModules/theme.nix b/homeManagerModules/theme.nix index bf3f6a3c..216d5865 100644 --- a/homeManagerModules/theme.nix +++ b/homeManagerModules/theme.nix @@ -113,31 +113,6 @@ in { }; 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" = { picture-uri = "file://${cfg.wallpaper}"; picture-uri-dark = "file://${cfg.wallpaper}"; diff --git a/nixosModules/desktop/cinnamon/default.nix b/nixosModules/desktop/cinnamon/default.nix deleted file mode 100644 index b039038f..00000000 --- a/nixosModules/desktop/cinnamon/default.nix +++ /dev/null @@ -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 - ''; - }; - }; - }; - }; - }; -} diff --git a/nixosModules/desktop/default.nix b/nixosModules/desktop/default.nix index 64a0369d..d7146d86 100644 --- a/nixosModules/desktop/default.nix +++ b/nixosModules/desktop/default.nix @@ -5,7 +5,6 @@ ... }: { imports = [ - ./cinnamon ./gnome ./greetd ./hyprland @@ -15,8 +14,7 @@ config = 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.steam.enable || config.ar.desktop.sway.enable diff --git a/nixosModules/options.nix b/nixosModules/options.nix index 37f6a1df..58c8f949 100644 --- a/nixosModules/options.nix +++ b/nixosModules/options.nix @@ -13,7 +13,6 @@ }; desktop = { - cinnamon.enable = lib.mkEnableOption "Cinnamon desktop session."; gnome.enable = lib.mkEnableOption "GNOME desktop session."; greetd = {