From d71bfbcaa75ee43d38d219fc224989ac3b12103a Mon Sep 17 00:00:00 2001 From: albert Date: Tue, 7 Jan 2025 08:51:09 -0800 Subject: [PATCH] updates for Gnome --- .../common/desktops/gnome/dconf-dock.nix | 574 ++++++++++++++++++ .../gnome/{dconf.nix => dconf-panel.nix} | 44 +- .../common/desktops/gnome/default.nix | 2 +- home-manager/common/software/cli/fish.nix | 21 +- nixos/common/desktops/gnome/default.nix | 16 +- 5 files changed, 607 insertions(+), 50 deletions(-) create mode 100644 home-manager/common/desktops/gnome/dconf-dock.nix rename home-manager/common/desktops/gnome/{dconf.nix => dconf-panel.nix} (89%) diff --git a/home-manager/common/desktops/gnome/dconf-dock.nix b/home-manager/common/desktops/gnome/dconf-dock.nix new file mode 100644 index 00000000..22eaab6c --- /dev/null +++ b/home-manager/common/desktops/gnome/dconf-dock.nix @@ -0,0 +1,574 @@ +# Generated via dconf2nix: https://github.com/nix-commmunity/dconf2nix +{ theme, lib, ... }: + +with lib.hm.gvariant; + +{ + dconf.settings = { + "apps/seahorse/listing" = { + item-filter = "any"; + keyrings-selected = [ "secret-service:///org/freedesktop/secrets/collection/login" ]; + }; + + "apps/seahorse/windows/key-manager" = { + height = 476; + width = 600; + }; + + "org/gabmus/gfeeds" = { + blocklist-last-update = mkDouble "1.736259370419442e9"; + dark-mode = false; + read-items = "[]"; + window-height = 950; + window-width = 1203; + }; + + "org/gnome/Console" = { + custom-font = "JetBrainsMono Nerd Font 10"; + last-window-maximised = false; + last-window-size = mkTuple [ 980 793 ]; + theme = "night"; + use-system-font = false; + }; + + "org/gnome/Extensions" = { + window-height = 1280; + window-width = 1401; + }; + + "org/gnome/GWeather4" = { + temperature-unit = "centigrade"; + }; + + "org/gnome/Podcasts" = { + persist-window-geometry-height = 640; + persist-window-geometry-maximized = false; + persist-window-geometry-width = 860; + }; + + "org/gnome/Weather" = { + locations = [ (mkVariant (mkTuple [ (mkUint32 2) (mkVariant (mkTuple [ "Bakersfield" "KBFL" true [ (mkTuple [ (mkDouble "0.6184331778208805") (mkDouble "-2.0779308356004798") ]) ] [ (mkTuple [ (mkDouble "0.61738041266937") (mkDouble "-2.077268413336178") ]) ] ])) ])) ]; + window-height = 498; + window-maximized = false; + window-width = 992; + }; + + "org/gnome/baobab/ui" = { + is-maximized = false; + window-size = mkTuple [ 1341 774 ]; + }; + + "org/gnome/clocks" = { + world-clocks = [ [ + (mkDictionaryEntry ["location" (mkVariant (mkTuple [ (mkUint32 2) (mkVariant (mkTuple [ "Nagoya" "RJGG" true [ (mkTuple [ (mkDouble "0.6152285613280011") (mkDouble "2.3899375165798045") ]) ] [ (mkTuple [ (mkDouble "0.6137741261024366") (mkDouble "2.3896466400066667") ]) ] ])) ]))]) + ] [ + (mkDictionaryEntry ["location" (mkVariant (mkTuple [ (mkUint32 2) (mkVariant (mkTuple [ "Little Rock" "KLIT" true [ (mkTuple [ (mkDouble "0.6060946773936616") (mkDouble "-1.6098238261849593") ]) ] [ (mkTuple [ (mkDouble "0.6064404969316518") (mkDouble "-1.6107572980820963") ]) ] ])) ]))]) + ] [ + (mkDictionaryEntry ["location" (mkVariant (mkTuple [ (mkUint32 2) (mkVariant (mkTuple [ "Warsaw" "EPWA" true [ (mkTuple [ (mkDouble "0.9104800989414727") (mkDouble "0.36593737231924195") ]) ] [ (mkTuple [ (mkDouble "0.9119345341670372") (mkDouble "0.3665191429188092") ]) ] ])) ]))]) + ] [ + (mkDictionaryEntry ["location" (mkVariant (mkTuple [ (mkUint32 2) (mkVariant (mkTuple [ "Washington" "KDCA" true [ (mkTuple [ (mkDouble "0.6780313197611662") (mkDouble "-1.3444998506811625") ]) ] [ (mkTuple [ (mkDouble "0.6788477673319566") (mkDouble "-1.344538230471414") ]) ] ])) ]))]) + ] ]; + }; + + "org/gnome/clocks/state/window" = { + maximized = false; + panel-id = "world"; + size = mkTuple [ 870 690 ]; + }; + + "org/gnome/control-center" = { + last-panel = "keyboard"; + window-state = mkTuple [ 1272 1223 false ]; + }; + + "org/gnome/desktop/a11y/applications" = { + screen-reader-enabled = false; + }; + + "org/gnome/desktop/app-folders" = { + folder-children = [ "Utilities" "YaST" "Pardus" ]; + }; + + "org/gnome/desktop/app-folders/folders/Pardus" = { + categories = [ "X-Pardus-Apps" ]; + name = "X-Pardus-Apps.directory"; + translate = true; + }; + + "org/gnome/desktop/app-folders/folders/Utilities" = { + apps = [ "org.freedesktop.GnomeAbrt.desktop" "nm-connection-editor.desktop" "org.gnome.baobab.desktop" "org.gnome.Connections.desktop" "org.gnome.DejaDup.desktop" "org.gnome.DiskUtility.desktop" "org.gnome.Evince.desktop" "org.gnome.FileRoller.desktop" "org.gnome.font-viewer.desktop" "org.gnome.Loupe.desktop" "org.gnome.seahorse.Application.desktop" "org.gnome.tweaks.desktop" "org.gnome.Usage.desktop" ]; + categories = [ "X-GNOME-Utilities" ]; + name = "X-GNOME-Utilities.directory"; + translate = true; + }; + + "org/gnome/desktop/app-folders/folders/YaST" = { + categories = [ "X-SuSE-YaST" ]; + name = "suse-yast.directory"; + translate = true; + }; + + "org/gnome/desktop/background" = { + color-shading-type = "solid"; + picture-options = "zoom"; + picture-uri = "file:///etc/nixos/git/wallpapers/${theme}/wallpaper1.png"; + picture-uri-dark = "file:///etc/nixos/git/wallpapers/${theme}/wallpaper1.png"; + primary-color = "#000000000000"; + secondary-color = "#000000000000"; + }; + + "org/gnome/desktop/input-sources" = { + sources = [ (mkTuple [ "xkb" "us" ]) ]; + xkb-options = [ "terminate:ctrl_alt_bksp" ]; + }; + + "org/gnome/desktop/interface" = { + accent-color = "teal"; + color-scheme = "default"; + cursor-size = 24; + cursor-theme = "Adwaita"; + document-font-name = "Hack Nerd Font Regular 11"; + enable-animations = true; + font-antialiasing = "rgba"; + font-name = "JetBrains Mono, 12"; + gtk-theme = "Adwaita"; + icon-theme = "Papirus"; + monospace-font-name = "Hack Nerd Font Mono Regular 12"; + scaling-factor = mkUint32 1; + show-battery-percentage = false; + text-scaling-factor = mkDouble "1.0"; + toolbar-style = "text"; + }; + + "org/gnome/desktop/notifications" = { + application-children = [ "firefox" "steam" "org-gnome-settings" "gnome-power-panel" "org-gnome-console" "org-gnome-baobab" ]; + show-banners = true; + }; + + "org/gnome/desktop/notifications/application/firefox" = { + application-id = "firefox.desktop"; + }; + + "org/gnome/desktop/notifications/application/gnome-power-panel" = { + application-id = "gnome-power-panel.desktop"; + }; + + "org/gnome/desktop/notifications/application/logseq" = { + application-id = "logseq.desktop"; + }; + + "org/gnome/desktop/notifications/application/org-gnome-baobab" = { + application-id = "org.gnome.baobab.desktop"; + }; + + "org/gnome/desktop/notifications/application/org-gnome-console" = { + application-id = "org.gnome.Console.desktop"; + }; + + "org/gnome/desktop/notifications/application/org-gnome-settings" = { + application-id = "org.gnome.Settings.desktop"; + }; + + "org/gnome/desktop/notifications/application/steam" = { + application-id = "steam.desktop"; + }; + + "org/gnome/desktop/peripherals/touchpad" = { + two-finger-scrolling-enabled = true; + }; + + "org/gnome/desktop/screensaver" = { + color-shading-type = "solid"; + picture-options = "zoom"; + picture-uri = "file:///etc/nixos/git/wallpapers/default/wallpaper1.png"; + primary-color = "#000000000000"; + secondary-color = "#000000000000"; + }; + + "org/gnome/desktop/search-providers" = { + enabled = [ "org.gnome.Weather.desktop" ]; + sort-order = [ "org.gnome.Settings.desktop" "org.gnome.Contacts.desktop" "org.gnome.Nautilus.desktop" ]; + }; + + "org/gnome/desktop/sound" = { + theme-name = "ocean"; + }; + + "org/gnome/desktop/wm/keybindings" = { + maximize = []; + move-to-monitor-left = []; + move-to-monitor-right = []; + switch-applications = []; + switch-applications-backward = []; + switch-input-source = []; + switch-input-source-backward = []; + switch-to-workspace-left = [ "Left" ]; + switch-to-workspace-right = [ "Right" ]; + switch-windows = [ "Tab" ]; + switch-windows-backward = [ "Tab" ]; + unmaximize = []; + }; + + "org/gnome/desktop/wm/preferences" = { + button-layout = "icon:minimize,maximize,close"; + }; + + "org/gnome/evince/default" = { + continuous = true; + dual-page = false; + dual-page-odd-left = true; + enable-spellchecking = true; + fullscreen = false; + inverted-colors = false; + show-sidebar = true; + sidebar-page = "thumbnails"; + sidebar-size = 132; + sizing-mode = "automatic"; + window-ratio = mkTuple [ (mkDouble "1.011437908496732") (mkDouble "0.7575757575757576") ]; + zoom = mkDouble "3.9001195953446963"; + }; + + "org/gnome/evolution-data-server" = { + migrated = true; + }; + + "org/gnome/gnome-system-monitor" = { + show-dependencies = false; + show-whose-processes = "user"; + }; + + "org/gnome/gnome-system-monitor/proctree" = { + col-26-visible = false; + col-26-width = 0; + }; + + "org/gnome/mutter" = { + dynamic-workspaces = true; + edge-tiling = false; + overlay-key = "Super_L"; + workspaces-only-on-primary = false; + }; + + "org/gnome/mutter/keybindings" = { + toggle-tiled-left = []; + toggle-tiled-right = []; + }; + + "org/gnome/nautilus/preferences" = { + default-folder-viewer = "icon-view"; + migrated-gtk-settings = true; + search-filter-time-type = "last_modified"; + }; + + "org/gnome/nautilus/window-state" = { + initial-size = mkTuple [ 865 679 ]; + initial-size-file-chooser = mkTuple [ 890 550 ]; + }; + + "org/gnome/portal/filechooser/org/gnome/Settings" = { + last-folder-path = "/etc/nixos/git/wallpapers/default"; + }; + + "org/gnome/settings-daemon/plugins/color" = { + night-light-enabled = true; + night-light-schedule-automatic = true; + night-light-schedule-from = mkDouble "19.0"; + night-light-temperature = mkUint32 2867; + }; + + "org/gnome/settings-daemon/plugins/media-keys" = { + search = [ "space" ]; + }; + + "org/gnome/settings-daemon/plugins/power" = { + ambient-enabled = true; + power-button-action = "hibernate"; + sleep-inactive-ac-timeout = 7200; + }; + + "org/gnome/shell" = { + disable-user-extensions = false; + disabled-extensions = [ "wattmeter@bb" "trayIconsReloaded@selfmade.pl" "battery-usage-wattmeter@halfmexicanhalfamazing.gmail.com" "places-menu@gnome-shell-extensions.gcampax.github.com" "apps-menu@gnome-shell-extensions.gcampax.github.com" "light-style@gnome-shell-extensions.gcampax.github.com" "drive-menu@gnome-shell-extensions.gcampax.github.com" "status-icons@gnome-shell-extensions.gcampax.github.com" "system-monitor@gnome-shell-extensions.gcampax.github.com" "windowsNavigator@gnome-shell-extensions.gcampax.github.com" "workspace-indicator@gnome-shell-extensions.gcampax.github.com" "window-list@gnome-shell-extensions.gcampax.github.com" ]; + enabled-extensions = [ "blur-my-shell@aunetx" "dash-to-panel@jderose9.github.com" "hibernate-status@dromi" "launch-new-instance@gnome-shell-extensions.gcampax.github.com" "nightthemeswitcher@romainvigier.fr" "tilingshell@ferrarodomenico.com" "user-theme@gnome-shell-extensions.gcampax.github.com" "arcmenu@arcmenu.com" "tailscale@joaophi.github.com" "wattmeter-forked@clementherve.fr" "logowidget@github.com.howbea" "caffeine@patapon.info" "quick-settings-tweaks@qwreey" "dash-to-dock@micxgx.gmail.com" "auto-power-profile@dmy3k.github.io" "auto-move-windows@gnome-shell-extensions.gcampax.github.com" "dndsched@rozefound" ]; + favorite-apps = [ "org.gnome.Nautilus.desktop" "firefox.desktop" "com.mitchellh.ghostty.desktop" "bitwarden.desktop" "steam.desktop" "logseq.desktop" ]; + last-selected-power-profile = "performance"; + welcome-dialog-last-shown-version = "47.2"; + }; + + "org/gnome/shell/extensions/arcmenu" = { + button-padding = -1; + custom-menu-button-icon-size = mkDouble "40.0"; + distro-icon = 22; + hide-overview-on-startup = false; + menu-button-fg-color = mkTuple [ false "rgb(242,242,242)" ]; + menu-button-icon = "Distro_Icon"; + menu-button-position-offset = 0; + menu-layout = "Default"; + prefs-visible-page = 0; + recently-installed-apps = [ "org.gnome.Podcasts.desktop" ]; + search-entry-border-radius = mkTuple [ true 25 ]; + }; + + "org/gnome/shell/extensions/auto-power-profile" = { + threshold = 50; + }; + + "org/gnome/shell/extensions/battery_usage_wattmeter" = { + interval = 5; + pad-single-digit = false; + show-minus-sign = false; + }; + + "org/gnome/shell/extensions/blur-my-shell" = { + settings-version = 2; + }; + + "org/gnome/shell/extensions/blur-my-shell/appfolder" = { + brightness = mkDouble "0.6"; + sigma = 30; + }; + + "org/gnome/shell/extensions/blur-my-shell/dash-to-dock" = { + blur = true; + brightness = mkDouble "0.6"; + sigma = 30; + static-blur = true; + style-dash-to-dock = 0; + }; + + "org/gnome/shell/extensions/blur-my-shell/panel" = { + brightness = mkDouble "0.6"; + sigma = 30; + }; + + "org/gnome/shell/extensions/blur-my-shell/window-list" = { + brightness = mkDouble "0.6"; + sigma = 30; + }; + + "org/gnome/shell/extensions/caffeine" = { + countdown-timer = 0; + indicator-position-max = 3; + show-timer = false; + }; + + "org/gnome/shell/extensions/dash-to-dock" = { + apply-custom-theme = false; + background-opacity = mkDouble "0.0"; + custom-theme-shrink = false; + dash-max-icon-size = 38; + dock-position = "BOTTOM"; + extend-height = false; + height-fraction = mkDouble "0.9"; + hide-tooltip = true; + isolate-workspaces = true; + preferred-monitor = -2; + preferred-monitor-by-connector = "eDP-1"; + preview-size-scale = mkDouble "0.0"; + running-indicator-style = "DOTS"; + show-apps-at-top = true; + show-icons-emblems = true; + show-show-apps-button = false; + show-trash = false; + transparency-mode = "FIXED"; + }; + + "org/gnome/shell/extensions/dash-to-panel" = { + animate-appicon-hover = false; + animate-appicon-hover-animation-extent = [ + (mkDictionaryEntry ["RIPPLE" 4]) + (mkDictionaryEntry ["PLANK" 4]) + (mkDictionaryEntry ["SIMPLE" 1]) + ]; + appicon-margin = 0; + appicon-padding = 4; + appicon-style = "NORMAL"; + available-monitors = [ 0 ]; + desktop-line-custom-color = "rgb(255,255,255)"; + desktop-line-use-custom-color = false; + dot-position = "BOTTOM"; + dot-style-focused = "SEGMENTED"; + dot-style-unfocused = "SQUARES"; + group-apps = true; + hide-overview-on-startup = true; + hotkeys-overlay-combo = "TEMPORARILY"; + intellihide = false; + isolate-monitors = false; + isolate-workspaces = false; + leftbox-padding = 0; + multi-monitors = false; + panel-anchors = '' + {"0":"MIDDLE","1":"MIDDLE"}\\n\n + ''; + panel-element-positions = '' + {"0":[{"element":"showAppsButton","visible":false,"position":"stackedTL"},{"element":"activitiesButton","visible":false,"position":"stackedTL"},{"element":"leftBox","visible":true,"position":"stackedTL"},{"element":"taskbar","visible":true,"position":"stackedTL"},{"element":"centerBox","visible":true,"position":"centered"},{"element":"rightBox","visible":true,"position":"stackedBR"},{"element":"systemMenu","visible":true,"position":"stackedBR"},{"element":"dateMenu","visible":true,"position":"stackedBR"},{"element":"desktopButton","visible":false,"position":"stackedBR"}]}\\n\n + ''; + panel-element-positions-monitors-sync = true; + panel-lengths = '' + {"0":100,"1":100}\\n\n + ''; + panel-positions = '' + {"0":"BOTTOM","1":"BOTTOM"}\\\\n\\n\n + ''; + panel-sizes = '' + {"0":40,"1":32}\\n\n + ''; + primary-monitor = 0; + progress-show-count = true; + secondarymenu-contains-appmenu = true; + secondarymenu-contains-showdetails = false; + show-showdesktop-hover = true; + status-icon-padding = 0; + stockgs-keep-dash = false; + stockgs-keep-top-panel = false; + trans-bg-color = "#241f31"; + trans-panel-opacity = mkDouble "0.3"; + trans-use-custom-bg = false; + trans-use-custom-gradient = false; + trans-use-custom-opacity = true; + trans-use-dynamic-opacity = false; + tray-padding = 0; + window-preview-title-position = "TOP"; + }; + + "org/gnome/shell/extensions/dndsched" = { + disable-dnd-time-offset = 420; + enable-dnd-time-offset = 1320; + }; + + "org/gnome/shell/extensions/forge" = { + css-last-update = mkUint32 37; + }; + + "org/gnome/shell/extensions/lilypad" = { + lilypad-order = []; + reorder = true; + rightbox-order = []; + }; + + "org/gnome/shell/extensions/logo-widget" = { + logo-border = mkUint32 53; + logo-file = "/etc/nixos/git/docs/icons/nixos/white.png"; + logo-file-dark = "/etc/nixos/git/docs/icons/nixos/white.png"; + logo-opacity = mkUint32 255; + logo-position = "center"; + logo-size = mkDouble "6.344827586206897"; + }; + + "org/gnome/shell/extensions/nightthemeswitcher/commands" = { + enabled = false; + }; + + "org/gnome/shell/extensions/nightthemeswitcher/time" = { + location = mkTuple [ (mkDouble "35.40087412102659") (mkDouble "-119.071139") ]; + manual-schedule = false; + nightthemeswitcher-ondemand-keybinding = [ "t" ]; + sunrise = mkDouble "7.497174054622079"; + sunset = mkDouble "16.598930741411117"; + }; + + "org/gnome/shell/extensions/quick-settings-tweaks" = { + add-dnd-quick-toggle-enabled = false; + add-unsafe-quick-toggle-enabled = false; + input-always-show = true; + input-show-selected = true; + media-control-compact-mode = true; + media-control-enabled = false; + notifications-enabled = false; + notifications-hide-when-no-notifications = false; + notifications-integrated = false; + output-show-selected = true; + volume-mixer-position = "bottom"; + }; + + "org/gnome/shell/extensions/system-monitor" = { + show-download = false; + show-memory = true; + show-swap = false; + show-upload = false; + }; + + "org/gnome/shell/extensions/tilingshell" = { + enable-autotiling = false; + enable-window-border = false; + inner-gaps = mkUint32 8; + last-version-name-installed = "15.0"; + layouts-json = "[{\"id\":\"Layout 1\",\"tiles\":[{\"x\":0,\"y\":0,\"width\":0.22,\"height\":0.5,\"groups\":[1,2]},{\"x\":0,\"y\":0.5,\"width\":0.22,\"height\":0.5,\"groups\":[1,2]},{\"x\":0.22,\"y\":0,\"width\":0.56,\"height\":1,\"groups\":[2,3]},{\"x\":0.78,\"y\":0,\"width\":0.22,\"height\":0.5,\"groups\":[3,4]},{\"x\":0.78,\"y\":0.5,\"width\":0.22,\"height\":0.5,\"groups\":[3,4]}]},{\"id\":\"Layout 2\",\"tiles\":[{\"x\":0,\"y\":0,\"width\":0.22,\"height\":1,\"groups\":[1]},{\"x\":0.22,\"y\":0,\"width\":0.56,\"height\":1,\"groups\":[1,2]},{\"x\":0.78,\"y\":0,\"width\":0.22,\"height\":1,\"groups\":[2]}]},{\"id\":\"Layout 3\",\"tiles\":[{\"x\":0,\"y\":0,\"width\":0.33,\"height\":1,\"groups\":[1]},{\"x\":0.33,\"y\":0,\"width\":0.67,\"height\":1,\"groups\":[1]}]},{\"id\":\"Layout 4\",\"tiles\":[{\"x\":0,\"y\":0,\"width\":0.61875,\"height\":1,\"groups\":[1]},{\"x\":0.61875,\"y\":0,\"width\":0.38125000000000003,\"height\":1,\"groups\":[1]}]},{\"id\":\"778228\",\"tiles\":[{\"x\":0,\"y\":0,\"width\":0.6138888888888889,\"height\":1,\"groups\":[1]},{\"x\":0.6138888888888889,\"y\":0,\"width\":0.386111111111111,\"height\":0.500534188034188,\"groups\":[2,1]},{\"x\":0.6138888888888889,\"y\":0.500534188034188,\"width\":0.386111111111111,\"height\":0.49946581196581197,\"groups\":[2,1]}]},{\"id\":\"19537098\",\"tiles\":[{\"x\":0,\"y\":0,\"width\":0.2248263888888889,\"height\":1,\"groups\":[2]},{\"x\":0.2248263888888889,\"y\":0,\"width\":0.5503472222222225,\"height\":0.09793471019320453,\"groups\":[1,3,2]},{\"x\":0.7751736111111112,\"y\":0,\"width\":0.22482638888888817,\"height\":1,\"groups\":[1]},{\"x\":0.2248263888888889,\"y\":0.09793471019320453,\"width\":0.5503472222222225,\"height\":0.8047968021319121,\"groups\":[3,1,4,2]},{\"x\":0.2248263888888889,\"y\":0.9027315123251166,\"width\":0.5503472222222225,\"height\":0.09726848767488339,\"groups\":[4,1,2]}]},{\"id\":\"20106317\",\"tiles\":[{\"x\":0,\"y\":0,\"width\":0.13368055555555555,\"height\":1,\"groups\":[1]},{\"x\":0.13368055555555555,\"y\":0,\"width\":0.7326388888888895,\"height\":0.0966022651565623,\"groups\":[2,3,1]},{\"x\":0.8663194444444444,\"y\":0,\"width\":0.13368055555555552,\"height\":1,\"groups\":[2]},{\"x\":0.13368055555555555,\"y\":0.0966022651565623,\"width\":0.7326388888888895,\"height\":0.8101265822784811,\"groups\":[3,2,4,1]},{\"x\":0.13368055555555555,\"y\":0.9067288474350433,\"width\":0.7326388888888895,\"height\":0.09327115256495666,\"groups\":[4,2,1]}]}]"; + outer-gaps = mkUint32 4; + overridden-settings = "{\"org.gnome.mutter.keybindings\":{\"toggle-tiled-right\":\"['Right']\",\"toggle-tiled-left\":\"['Left']\"},\"org.gnome.desktop.wm.keybindings\":{\"maximize\":\"['Up']\",\"unmaximize\":\"['Down', 'F5']\"},\"org.gnome.mutter\":{\"edge-tiling\":\"false\"}}"; + selected-layouts = [ [ "778228" "778228" ] [ "20106317" "778228" ] [ "Layout 1" "Layout 1" ] ]; + tiling-system-activation-key = [ "2" ]; + tiling-system-deactivation-key = [ "0" ]; + top-edge-maximize = true; + }; + + "org/gnome/shell/extensions/trayIconsReloaded" = { + icon-brightness = 40; + icons-limit = 4; + }; + + "org/gnome/shell/extensions/user-theme" = { + name = ""; + }; + + "org/gnome/shell/extensions/workspace-indicator" = { + embed-previews = true; + }; + + "org/gnome/shell/weather" = { + automatic-location = true; + locations = [ (mkVariant (mkTuple [ (mkUint32 2) (mkVariant (mkTuple [ "Bakersfield" "KBFL" true [ (mkTuple [ (mkDouble "0.6184331778208805") (mkDouble "-2.0779308356004798") ]) ] [ (mkTuple [ (mkDouble "0.61738041266937") (mkDouble "-2.077268413336178") ]) ] ])) ])) ]; + }; + + "org/gnome/shell/world-clocks" = { + locations = [ (mkVariant (mkTuple [ (mkUint32 2) (mkVariant (mkTuple [ "Nagoya" "RJGG" true [ (mkTuple [ (mkDouble "0.6152285613280011") (mkDouble "2.3899375165798045") ]) ] [ (mkTuple [ (mkDouble "0.6137741261024366") (mkDouble "2.3896466400066667") ]) ] ])) ])) (mkVariant (mkTuple [ (mkUint32 2) (mkVariant (mkTuple [ "Little Rock" "KLIT" true [ (mkTuple [ (mkDouble "0.6060946773936616") (mkDouble "-1.6098238261849593") ]) ] [ (mkTuple [ (mkDouble "0.6064404969316518") (mkDouble "-1.6107572980820963") ]) ] ])) ])) (mkVariant (mkTuple [ (mkUint32 2) (mkVariant (mkTuple [ "Warsaw" "EPWA" true [ (mkTuple [ (mkDouble "0.9104800989414727") (mkDouble "0.36593737231924195") ]) ] [ (mkTuple [ (mkDouble "0.9119345341670372") (mkDouble "0.3665191429188092") ]) ] ])) ])) (mkVariant (mkTuple [ (mkUint32 2) (mkVariant (mkTuple [ "Washington" "KDCA" true [ (mkTuple [ (mkDouble "0.6780313197611662") (mkDouble "-1.3444998506811625") ]) ] [ (mkTuple [ (mkDouble "0.6788477673319566") (mkDouble "-1.344538230471414") ]) ] ])) ])) ]; + }; + + "org/gnome/system/location" = { + enabled = true; + }; + + "org/gnome/tweaks" = { + show-extensions-notice = false; + }; + + "org/gtk/gtk4/settings/color-chooser" = { + custom-colors = [ (mkTuple [ (mkDouble "0.7843137383460999") (mkDouble "0.7843137383460999") (mkDouble "0.7843137383460999") (mkDouble "0.20000000298023224") ]) ]; + selected-color = mkTuple [ true (mkDouble "1.0") (mkDouble "1.0") (mkDouble "1.0") (mkDouble "1.0") ]; + }; + + "org/gtk/gtk4/settings/file-chooser" = { + date-format = "regular"; + location-mode = "path-bar"; + show-hidden = false; + sidebar-width = 140; + sort-column = "name"; + sort-directories-first = true; + sort-order = "ascending"; + type-format = "category"; + view-type = "list"; + window-size = mkTuple [ 880 540 ]; + }; + + "org/gtk/settings/color-chooser" = { + custom-colors = [ (mkTuple [ (mkDouble "0.14901960784313725") (mkDouble "0.14901960784313725") (mkDouble "0.14901960784313725") (mkDouble "1.0") ]) (mkTuple [ (mkDouble "0.4235294117647059") (mkDouble "0.19215686274509805") (mkDouble "0.8901960784313725") (mkDouble "1.0") ]) (mkTuple [ (mkDouble "0.5058823529411764") (mkDouble "0.6509803921568628") (mkDouble "0.788235294117647") (mkDouble "1.0") ]) (mkTuple [ (mkDouble "0.3607843137254902") (mkDouble "0.3803921568627451") (mkDouble "0.4235294117647059") (mkDouble "1.0") ]) (mkTuple [ (mkDouble "0.1411764705882353") (mkDouble "0.5764705882352941") (mkDouble "0.9372549019607843") (mkDouble "1.0") ]) (mkTuple [ (mkDouble "0.8313725490196079") (mkDouble "0.8313725490196079") (mkDouble "0.8470588235294118") (mkDouble "1.0") ]) ]; + selected-color = mkTuple [ true (mkDouble "0.0") (mkDouble "0.0") (mkDouble "0.0") (mkDouble "1.0") ]; + }; + + "org/gtk/settings/file-chooser" = { + date-format = "regular"; + location-mode = "path-bar"; + show-hidden = false; + show-size-column = true; + show-type-column = true; + sidebar-width = 205; + sort-column = "name"; + sort-directories-first = false; + sort-order = "ascending"; + type-format = "category"; + window-position = mkTuple [ 26 23 ]; + window-size = mkTuple [ 849 597 ]; + }; + + }; +} diff --git a/home-manager/common/desktops/gnome/dconf.nix b/home-manager/common/desktops/gnome/dconf-panel.nix similarity index 89% rename from home-manager/common/desktops/gnome/dconf.nix rename to home-manager/common/desktops/gnome/dconf-panel.nix index 2890f34a..37aaca65 100644 --- a/home-manager/common/desktops/gnome/dconf.nix +++ b/home-manager/common/desktops/gnome/dconf-panel.nix @@ -312,36 +312,6 @@ with lib.hm.gvariant; "org/gnome/shell/extensions/dash-to-panel" = { animate-appicon-hover = false; - animate-appicon-hover-animation-convexity = [ - (mkDictionaryEntry ["RIPPLE" (mkDouble "2.0")]) - (mkDictionaryEntry ["PLANK" (mkDouble "1.0")]) - ]; - animate-appicon-hover-animation-duration = [ - (mkDictionaryEntry ["SIMPLE" (mkUint32 160)]) - (mkDictionaryEntry ["RIPPLE" 130]) - (mkDictionaryEntry ["PLANK" 100]) - ]; - animate-appicon-hover-animation-extent = [ - (mkDictionaryEntry ["RIPPLE" 4]) - (mkDictionaryEntry ["PLANK" 4]) - (mkDictionaryEntry ["SIMPLE" 1]) - ]; - animate-appicon-hover-animation-rotation = [ - (mkDictionaryEntry ["SIMPLE" 0]) - (mkDictionaryEntry ["RIPPLE" 10]) - (mkDictionaryEntry ["PLANK" 0]) - ]; - animate-appicon-hover-animation-travel = [ - (mkDictionaryEntry ["SIMPLE" (mkDouble "0.3")]) - (mkDictionaryEntry ["RIPPLE" (mkDouble "0.4")]) - (mkDictionaryEntry ["PLANK" (mkDouble "0.0")]) - ]; - animate-appicon-hover-animation-type = "SIMPLE"; - animate-appicon-hover-animation-zoom = [ - (mkDictionaryEntry ["SIMPLE" (mkDouble "1.0")]) - (mkDictionaryEntry ["RIPPLE" (mkDouble "1.25")]) - (mkDictionaryEntry ["PLANK" (mkDouble "2.0")]) - ]; appicon-margin = 0; appicon-padding = 4; appicon-style = "NORMAL"; @@ -363,7 +333,19 @@ with lib.hm.gvariant; {"0":"MIDDLE","1":"MIDDLE"} ''; panel-element-positions = '' - {"0":[{"element":"showAppsButton","visible":false,"position":"stackedTL"},{"element":"activitiesButton","visible":false,"position":"stackedTL"},{"element":"leftBox","visible":true,"position":"stackedTL"},{"element":"taskbar","visible":true,"position":"stackedTL"},{"element":"centerBox","visible":true,"position":"stackedBR"},{"element":"rightBox","visible":true,"position":"stackedBR"},{"element":"systemMenu","visible":true,"position":"stackedBR"},{"element":"dateMenu","visible":true,"position":"stackedBR"},{"element":"desktopButton","visible":false,"position":"stackedBR"}],"1":[{"element":"showAppsButton","visible":false,"position":"stackedTL"},{"element":"activitiesButton","visible":false,"position":"stackedTL"},{"element":"leftBox","visible":true,"position":"stackedTL"},{"element":"taskbar","visible":true,"position":"stackedTL"},{"element":"centerBox","visible":true,"position":"stackedBR"},{"element":"rightBox","visible":true,"position":"stackedBR"},{"element":"systemMenu","visible":true,"position":"stackedBR"},{"element":"dateMenu","visible":true,"position":"stackedBR"},{"element":"desktopButton","visible":false,"position":"stackedBR"}]}\n + { + "0": [ + {"element":"showAppsButton","visible":false,"position":"stackedTL"}, + {"element":"activitiesButton","visible":false,"position":"stackedTL"}, + {"element":"leftBox","visible":true,"position":"stackedTL"}, + {"element":"taskbar","visible":true,"position":"stackedTL"}, + {"element":"centerBox","visible":true,"position":"stackedBR"}, + {"element":"rightBox","visible":true,"position":"stackedBR"}, + {"element":"systemMenu","visible":true,"position":"stackedBR"}, + {"element":"dateMenu","visible":true,"position":"stackedBR"}, + {"element":"desktopButton","visible":false,"position":"stackedBR"} + ] + } ''; panel-element-positions-monitors-sync = true; panel-lengths = '' diff --git a/home-manager/common/desktops/gnome/default.nix b/home-manager/common/desktops/gnome/default.nix index 58d308c9..6d343aa4 100644 --- a/home-manager/common/desktops/gnome/default.nix +++ b/home-manager/common/desktops/gnome/default.nix @@ -1,7 +1,7 @@ # Generated via dconf2nix: https://github.com/gvolpe/dconf2nix { ... }: { imports = [ - ./dconf.nix + ./dconf-dock.nix # TODO Re-eanble this when in hm 24.11 # ../../software/gui/ghostty.nix ]; diff --git a/home-manager/common/software/cli/fish.nix b/home-manager/common/software/cli/fish.nix index d363ea0a..31be2dcc 100644 --- a/home-manager/common/software/cli/fish.nix +++ b/home-manager/common/software/cli/fish.nix @@ -166,16 +166,17 @@ cat = "bat"; # git - g = "git"; - ga = "git add -A"; - gb = "git branch"; - gc = "git commit"; - gca = "git commit -a"; - gco = "git checkout"; - gd = "git diff"; - gp = "git pull --prune"; - gpu = "git push origin HEAD"; - gs = "git status -sb"; + g = "git"; + ga = "git add -A"; + gb = "git branch"; + gc = "git commit"; + gca = "git commit -a"; + gcam = "git commit -am"; + gco = "git checkout"; + gd = "git diff"; + gp = "git pull --prune"; + gpu = "git push origin HEAD"; + gs = "git status -sb"; # time / date tdate = "date +%Y.%m.%d..%H.%M"; diff --git a/nixos/common/desktops/gnome/default.nix b/nixos/common/desktops/gnome/default.nix index 545b7623..932cf581 100644 --- a/nixos/common/desktops/gnome/default.nix +++ b/nixos/common/desktops/gnome/default.nix @@ -70,23 +70,23 @@ environment.systemPackages = with pkgs; [ # Gnome Extensions - gnomeExtensions.arcmenu gnomeExtensions.tiling-shell - gnomeExtensions.dash-to-panel + gnomeExtensions.dash-to-dock gnomeExtensions.blur-my-shell gnomeExtensions.caffeine gnomeExtensions.hibernate-status-button gnomeExtensions.night-theme-switcher gnomeExtensions.tailscale-qs - gnomeExtensions.battery-usage-wattmeter - gnomeExtensions.lilypad - - gnome-podcasts - + gnomeExtensions.auto-power-profile + gnomeExtensions.dnd-on-time + # gnomeExtensions.arcmenu + # gnomeExtensions.dash-to-panel + # gnomeExtensions.battery-usage-wattmeter + # Gnome relevant packages gnome-tweaks papirus-icon-theme - dconf2nix # https://github.com/gvolpe/dconf2nix + dconf2nix # https://github.com/gvolpe/dconf2nix - This version is out of date. it's better to grab the github master branch and build ghostty # Terminal Emulator gnome-session ];