From a231968592b37bbd9fe5d5da4a7c3e47f059e97e Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Fri, 3 Jan 2025 23:06:20 +0100 Subject: [PATCH 1/2] nixos/cosmic: update config defaults --- .../com.system76.CosmicComp/v1/focus_follows_cursor_delay | 2 +- .../com.system76.CosmicPanel.Panel/v1/plugins_wings | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/focus_follows_cursor_delay b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/focus_follows_cursor_delay index 8a32cf7..e373ee6 100644 --- a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/focus_follows_cursor_delay +++ b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicComp/v1/focus_follows_cursor_delay @@ -1 +1 @@ -250 \ No newline at end of file +50 diff --git a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/plugins_wings b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/plugins_wings index 3d44247..88477bc 100644 --- a/nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/plugins_wings +++ b/nix-os/desktopManagers/cosmic-config/com.system76.CosmicPanel.Panel/v1/plugins_wings @@ -2,8 +2,8 @@ Some(([ "com.system76.CosmicPanelAppButton", "com.system76.CosmicAppletWorkspaces", ], [ - "com.system76.CosmicAppletInputSources", "com.system76.CosmicAppletStatusArea", + "com.system76.CosmicAppletInputSources", "com.system76.CosmicAppletTiling", "com.system76.CosmicAppletAudio", "com.system76.CosmicAppletNetwork", @@ -11,4 +11,4 @@ Some(([ "com.system76.CosmicAppletNotifications", "com.system76.CosmicAppletBluetooth", "com.system76.CosmicAppletPower", -])) \ No newline at end of file +])) From 5f061310763769fdebf6e3b1e9949a9fa033cfb7 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Fri, 3 Jan 2025 23:06:44 +0100 Subject: [PATCH 2/2] nixos/cosmic: set default cursor theme --- nix-os/desktopManagers/cosmic.nix | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/nix-os/desktopManagers/cosmic.nix b/nix-os/desktopManagers/cosmic.nix index bdd784d..1dfb638 100644 --- a/nix-os/desktopManagers/cosmic.nix +++ b/nix-os/desktopManagers/cosmic.nix @@ -1,4 +1,10 @@ -{ inputs, lib, pkgs, ... }: +{ + inputs, + lib, + pkgs, + self, + ... +}: let cosmic-configuration = pkgs.substituteAllFiles { @@ -20,6 +26,7 @@ in { imports = [ "${inputs.cosmic-modules}/nixos/cosmic/module.nix" + "${self}/nix-os/generic/dconf.nix" ]; config = { services.desktopManager.cosmic.enable = true; @@ -29,7 +36,26 @@ in ]; environment.systemPackages = with pkgs; [ (lib.hiPrio cosmic-configuration.share) + google-cursor ]; services.gnome.gnome-keyring.enable = true; + + proot.dconf = { + rules."org/gnome/desktop/interface".cursor-theme = "GoogleDot-White"; + profiles.user.rulesToApply = [ + "org/gnome/desktop/interface" + ]; + }; + + environment.sessionVariables = { + XCURSOR_SIZE = "16"; + XCURSOR_THEME = "GoogleDot-White"; + }; + + environment.etc."xdg/gtk-3.0/settings.ini".text = '' + [Settings] + gtk-cursor-theme-name=GoogleDot-White + gtk-application-prefer-dark-theme=true + ''; }; }