From 94bf2f98479d824b8f78c11810f08f3084614875 Mon Sep 17 00:00:00 2001 From: 514fpv Date: Mon, 29 Jul 2024 19:56:16 +0800 Subject: [PATCH] fix(gnome): disable theme --- home/gnome/impl/dconf.nix | 53 ++++++++++++++++++++++++++++++--------- home/gnome/impl/home.nix | 7 +++--- home/gnome/impl/nixos.nix | 13 +++++++--- 3 files changed, 55 insertions(+), 18 deletions(-) diff --git a/home/gnome/impl/dconf.nix b/home/gnome/impl/dconf.nix index b729c39c..4edf9c72 100644 --- a/home/gnome/impl/dconf.nix +++ b/home/gnome/impl/dconf.nix @@ -3,7 +3,7 @@ , config , ... }: with lib; let cfg = config.passthrough.gnome; - bg = ../../catppuccin/flake.png; + bg = ../../../share/54345906_p0.jpg; in mkIf cfg.enable { dconf.settings = let p = "org/gnome"; @@ -35,11 +35,11 @@ in mkIf cfg.enable { "${pd}/interface" = { color-scheme = "prefer-dark"; - cursor-theme = "catppuccin-mocha-dark-cursors"; + #cursor-theme = "catppuccin-mocha-dark-cursors"; font-antialiasing = "grayscale"; font-hinting = "slight"; - gtk-theme = "catppuccin-mocha-pink-compact"; - icon-theme = "Papirus-Dark"; + #gtk-theme = "catppuccin-mocha-pink-compact"; + #icon-theme = "Papirus-Dark"; }; "${pd}/screensaver" = { @@ -54,12 +54,12 @@ in mkIf cfg.enable { "${pd}/wm/preferences" = { action-double-click-titlebar = "toggle-maximize"; action-middle-click-titlebar = "minimize"; - button-layout = "close,minimize,maximize:appmenu"; + button-layout = "close:appmenu"; resize-with-right-button = true; }; "${ptlp}" = { - default = "95894cfd-82f7-430d-af6e-84d168bc34f5"; + #default = "95894cfd-82f7-430d-af6e-84d168bc34f5"; list = [ "de8a9081-8352-4ce4-9519-5de655ad9361" "71a9971e-e829-43a9-9b2f-4565c855d664" @@ -153,18 +153,19 @@ in mkIf cfg.enable { "windowsNavigator@gnome-shell-extensions.gcampax.github.com" "window-list@gnome-shell-extensions.gcampax.github.com" "workspace-indicator@gnome-shell-extensions.gcampax.github.com" - "dash-to-panel@jderose9.github.com" + "dash-to-dock@micxgx.gmail.com" ]; enabled-extensions = [ "user-theme@gnome-shell-extensions.gcampax.github.com" "apps-menu@gnome-shell-extensions.gcampax.github.com" "drive-menu@gnome-shell-extensions.gcampax.github.com" - "dash-to-dock@micxgx.gmail.com" + "appindicatorsupport@rgcjonas.gmail.com" + "dash-to-panel@jderose9.github.com" ]; welcome-dialog-last-shown-version = "45.3"; }; - "${pse}/user-theme".name = "catppuccin-mocha-pink-compact"; + #"${pse}/user-theme".name = "catppuccin-mocha-pink-compact"; "${pse}/dash-to-dock" = { background-opacity = 0.80000000000000004; @@ -172,22 +173,50 @@ in mkIf cfg.enable { dock-position = "BOTTOM"; height-fraction = 0.90000000000000002; multi-monitor = true; + running-indicator-style = "DOTS"; + custom-theme-shrink = true; }; "${pse}/dash-to-panel" = { - animate-appicon-hover-animation-extent = ''{'RIPPLE': 4, 'PLANK': 4, 'SIMPLE': 1}''; + animate-appicon-hover = false; + animate-appicon-hover-animation-type = "SIMPLE"; appicon-margin = 0; appicon-padding = 4; + appicon-style= "NORMAL"; available-monitors = [ 0 ]; dot-position = "BOTTOM"; + dot-style-focused = "METRO"; + dot-style-unfocused = "DOTS"; + group-apps = true; + hide-overview-on-startup = true; hotkeys-overlay-combo = "TEMPORARILY"; + isolate-workspaces = false; leftbox-padding = -1; + overview-click-to-exit = true; panel-anchors = ''{"0":"MIDDLE"}''; - panel-lengths=''{"0":100}''; - panel-sizes=''{"0":42}''; + panel-element-positions = ''{"0":[{"element":"showAppsButton","visible":true,"position":"stackedTL"},{"element":"activitiesButton","visible":true,"position":"stackedTL"},{"element":"leftBox","visible":false,"position":"stackedTL"},{"element":"taskbar","visible":true,"position":"centerMonitor"},{"element":"centerBox","visible":true,"position":"stackedBR"},{"element":"rightBox","visible":true,"position":"stackedBR"},{"element":"dateMenu","visible":true,"position":"stackedBR"},{"element":"systemMenu","visible":true,"position":"stackedBR"},{"element":"desktopButton","visible":false,"position":"stackedBR"}]}''; + panel-lengths = ''{"0":100}''; + panel-positions = ''{"0":"BOTTOM"}''; + panel-sizes = ''{"0":42}''; primary-monitor = 0; + secondarymenu-contains-showdetails = true; + show-showdesktop-hover = true; status-icon-padding = -1; + stockgs-force-hotcorner = false; + stockgs-keep-dash = false; + stockgs-keep-top-panel = false; + stockgs-panelbtn-click-only = false; + trans-bg-color = "#82a5c1"; + trans-dynamic-anim-target = 0.80000000000000002; + trans-dynamic-behavior = "MAXIMIZED_WINDOWS"; + trans-gradient-bottom-color = "#000000"; + trans-gradient-bottom-opacity = 0.5; + trans-gradient-top-opacity = 0.0; + trans-panel-opacity = 0.0; trans-use-custom-bg = false; + trans-use-custom-gradient = true; + trans-use-custom-opacity = true; + trans-use-dynamic-opacity = true; tray-padding = -1; window-preview-title-position = "TOP"; }; diff --git a/home/gnome/impl/home.nix b/home/gnome/impl/home.nix index d10861b1..8abf18ef 100644 --- a/home/gnome/impl/home.nix +++ b/home/gnome/impl/home.nix @@ -7,12 +7,13 @@ in mkIf cfg.enable { home.packages = with pkgs.gnome; with pkgs.gnomeExtensions; [ - # gnome - pkgs.gnome-terminal - # gnomeExtensions dash-to-panel dash-to-dock appindicator ]; + + catppuccin.enable = mkForce false; + home.pointerCursor = mkForce null; + gtk.enable = false; } diff --git a/home/gnome/impl/nixos.nix b/home/gnome/impl/nixos.nix index c05b24e4..bd5d6ff1 100644 --- a/home/gnome/impl/nixos.nix +++ b/home/gnome/impl/nixos.nix @@ -5,6 +5,8 @@ cfg = config.home.gnome; in mkIf cfg.enable { global.flatpak.enable = mkDefault true; + home.catppuccin.enable = mkDefault false; + catppuccin.enable = false; programs.regreet.enable = false; services.xserver.enable = true; services.xserver.displayManager.startx.enable = false; @@ -14,8 +16,13 @@ in mkIf cfg.enable { xdg.portal.configPackages = with pkgs; [ gnome.gnome-session ]; hardware.pulseaudio.enable = false; - users.home.persist.directories = [ - ".config/dconf" - ]; + environment.gnome.excludePackages = (with pkgs; [ + gnome-tour + ] ++ optionals config.global.flatpak.enable [ + gnome-calculator + ]) ++ (with pkgs.gnome; [ ] ++ optionals config.global.flatpak.enable [ + ]); + + users.home.persist.directories = [ ".config/dconf" ]; environment.persistence."/nix/persist/fhs".directories = [ ]; }