From 07b4f981d1cb2de1a69d7696b936f98e19d295e4 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Mon, 27 Apr 2026 15:15:06 +0800 Subject: [PATCH] fix: aagl --- flake.lock | 22 ++-- flake.nix | 2 +- home/base/tui/editors/neovim/default.nix | 2 +- .../gui/base/noctalia/config/settings.json | 106 ++++++++++++++---- 4 files changed, 98 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index 17847311..60fd7834 100644 --- a/flake.lock +++ b/flake.lock @@ -7,16 +7,16 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1777049951, - "narHash": "sha256-OdKgdlSuLnYcgdWDCgwDu9jPIKWdOneXdl23PRw8fz8=", + "lastModified": 1777049909, + "narHash": "sha256-t06XtDZpzxLxsq7nVxeMqppllJd4E0RMykDK+k1+CMM=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "6ef0cc1bcc6b1b2959680324ce044571fbb13d2a", + "rev": "7fa6541ef5e4d5c95d526a0c0dfb872648f85ab5", "type": "github" }, "original": { "owner": "ezKEa", - "ref": "release-25.11", + "ref": "main", "repo": "aagl-gtk-on-nix", "type": "github" } @@ -757,16 +757,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1770770419, - "narHash": "sha256-iKZMkr6Cm9JzWlRYW/VPoL0A9jVKtZYiU4zSrVeetIs=", + "lastModified": 1770841267, + "narHash": "sha256-9xejG0KoqsoKEGp2kVbXRlEYtFFcDTHjidiuX8hGO44=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6c5e707c6b5339359a9a9e215c5e66d6d802fd7a", + "rev": "ec7c70d12ce2fc37cb92aff673dcdca89d187bae", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -1068,11 +1068,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1770865833, - "narHash": "sha256-oiARqnlvaW6pVGheVi4ye6voqCwhg5hCcGish2ZvQzI=", + "lastModified": 1770952264, + "narHash": "sha256-CjymNrJZWBtpavyuTkfPVPaZkwzIzGaf0E/3WgcwM14=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c8cfbe26238638e2f3a2c0ae7e8d240f5e4ded85", + "rev": "ec6a3d5cdf14bb5a1dd03652bd3f6351004d2188", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 43a328cb..89c28862 100644 --- a/flake.nix +++ b/flake.nix @@ -143,7 +143,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; aagl = { - url = "github:ezKEa/aagl-gtk-on-nix/release-25.11"; + url = "github:ezKEa/aagl-gtk-on-nix/main"; # inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home/base/tui/editors/neovim/default.nix b/home/base/tui/editors/neovim/default.nix index 077e1d92..0d517a42 100644 --- a/home/base/tui/editors/neovim/default.nix +++ b/home/base/tui/editors/neovim/default.nix @@ -19,7 +19,7 @@ let configPath = "${config.home.homeDirectory}/nix-config/home/base/tui/editors/neovim/nvim"; in { - # xdg.configFile."nvim".source = config.lib.file.mkOutOfStoreSymlink configPath; + xdg.configFile."nvim".source = config.lib.file.mkOutOfStoreSymlink configPath; # Disable catppuccin to avoid conflict with my non-nix config. catppuccin.nvim.enable = false; diff --git a/home/linux/gui/base/noctalia/config/settings.json b/home/linux/gui/base/noctalia/config/settings.json index 0845645f..8a847564 100644 --- a/home/linux/gui/base/noctalia/config/settings.json +++ b/home/linux/gui/base/noctalia/config/settings.json @@ -8,7 +8,9 @@ "customLaunchPrefixEnabled": false, "density": "default", "enableClipPreview": true, + "enableClipboardChips": true, "enableClipboardHistory": true, + "enableClipboardSmartIcons": true, "enableSessionSearch": true, "enableSettingsSearch": true, "enableWindowsSearch": true, @@ -22,15 +24,16 @@ "showIconBackground": true, "sortByMostUsed": true, "terminalCommand": "xterm -e", - "useApp2Unit": true, "viewMode": "list" }, "audio": { - "cavaFrameRate": 30, "mprisBlacklist": [], "preferredPlayer": "", + "spectrumFrameRate": 30, + "spectrumMirrored": true, "visualizerType": "linear", "volumeFeedback": false, + "volumeFeedbackSoundFile": "", "volumeOverdrive": false, "volumeStep": 1 }, @@ -41,21 +44,34 @@ "barType": "simple", "capsuleColorKey": "none", "capsuleOpacity": 1, + "contentPadding": 2, "density": "comfortable", "displayMode": "always_visible", - "floating": false, + "enableExclusionZoneInset": true, + "fontScale": 1, "frameRadius": 12, "frameThickness": 8, "hideOnOverview": true, "marginHorizontal": 5, "marginVertical": 5, + "middleClickAction": "none", + "middleClickCommand": "", + "middleClickFollowMouse": false, "monitors": [], + "mouseWheelAction": "none", + "mouseWheelWrap": true, "outerCorners": true, "position": "top", + "reverseScroll": false, + "rightClickAction": "controlCenter", + "rightClickCommand": "", + "rightClickFollowMouse": true, "screenOverrides": [], "showCapsule": true, + "showOnWorkspaceSwitch": true, "showOutline": false, "useSeparateOpacity": true, + "widgetSpacing": 6, "widgets": { "center": [ { @@ -65,6 +81,7 @@ "enableScrollWheel": true, "focusedColor": "primary", "followFocusedScreen": false, + "fontWeight": "bold", "groupedBorderOpacity": 1, "hideUnoccupied": false, "iconScale": 0.8, @@ -73,6 +90,7 @@ "occupiedColor": "secondary", "pillSize": 0.6, "showApplications": false, + "showApplicationsHover": false, "showBadge": true, "showLabelsOnlyWhenOccupied": true, "unfocusedIconsOpacity": 1 @@ -80,9 +98,13 @@ ], "left": [ { + "colorizeSystemIcon": "none", + "customIconPath": "", + "enableColorization": false, "icon": "rocket", "iconColor": "none", - "id": "Launcher" + "id": "Launcher", + "useDistroLogo": false }, { "clockColor": "none", @@ -98,6 +120,7 @@ "diskPath": "/persistent", "iconColor": "none", "id": "SystemMonitor", + "showCpuCores": false, "showCpuFreq": false, "showCpuTemp": false, "showCpuUsage": true, @@ -121,19 +144,17 @@ "maxWidth": 145, "scrollingMode": "hover", "showIcon": true, + "showText": true, "textColor": "none", "useFixedWidth": false }, { "compactMode": false, - "compactShowAlbumArt": true, - "compactShowVisualizer": false, "hideMode": "hidden", "hideWhenIdle": false, "id": "MediaMini", "maxWidth": 145, "panelShowAlbumArt": true, - "panelShowVisualizer": true, "scrollingMode": "hover", "showAlbumArt": false, "showArtistFirst": true, @@ -198,6 +219,7 @@ } }, "brightness": { + "backlightDeviceMappings": [], "brightnessStep": 3, "enableDdcSupport": false, "enforceMinimum": true @@ -226,6 +248,7 @@ "monitorForColors": "", "predefinedScheme": "Noctalia (default)", "schedulingMode": "off", + "syncGsettings": true, "useWallpaperColors": true }, "controlCenter": { @@ -288,6 +311,7 @@ "desktopWidgets": { "enabled": true, "gridSnap": true, + "gridSnapScale": false, "monitorWidgets": [ { "name": "eDP-1", @@ -327,7 +351,8 @@ } ] } - ] + ], + "overviewEnabled": true }, "dock": { "animationSpeed": 1, @@ -338,13 +363,25 @@ "dockType": "floating", "enabled": false, "floatingRatio": 1, + "groupApps": false, + "groupClickAction": "cycle", + "groupContextMenuMode": "extended", + "groupIndicatorStyle": "dots", "inactiveIndicators": false, + "indicatorColor": "primary", + "indicatorOpacity": 0.6, + "indicatorThickness": 3, + "launcherIcon": "", + "launcherIconColor": "none", + "launcherPosition": "end", + "launcherUseDistroLogo": false, "monitors": [], "onlySameOutput": true, "pinnedApps": [], "pinnedStatic": false, "position": "bottom", - "showFrameIndicator": true, + "showDockIndicator": false, + "showLauncherIcon": false, "sitOnFrame": false, "size": 1 }, @@ -360,13 +397,15 @@ "clockStyle": "custom", "compactLockScreen": false, "dimmerOpacity": 0.2, + "enableBlurBehind": true, "enableLockScreenCountdown": true, + "enableLockScreenMediaControls": false, "enableShadows": true, "forceBlackScreenCorners": false, "iRadiusRatio": 1, "keybinds": { "keyDown": ["Down"], - "keyEnter": ["Return"], + "keyEnter": ["Return", "Enter"], "keyEscape": ["Esc"], "keyLeft": ["Left"], "keyRemove": ["Del"], @@ -380,6 +419,7 @@ "lockScreenCountdownDuration": 10000, "lockScreenMonitors": [], "lockScreenTint": 0, + "passwordChars": false, "radiusRatio": 1, "reverseScroll": false, "scaleRatio": 1, @@ -391,9 +431,11 @@ "showHibernateOnLockScreen": false, "showScreenCorners": false, "showSessionButtonsOnLockScreen": true, + "smoothScrollEnabled": true, "telemetryEnabled": false }, "hooks": { + "colorGeneration": "", "darkModeChange": "", "enabled": false, "performanceModeDisabled": "", @@ -404,8 +446,23 @@ "startup": "", "wallpaperChange": "" }, + "idle": { + "customCommands": "[]", + "enabled": false, + "fadeDuration": 5, + "lockCommand": "", + "lockTimeout": 660, + "resumeLockCommand": "", + "resumeScreenOffCommand": "", + "resumeSuspendCommand": "", + "screenOffCommand": "", + "screenOffTimeout": 600, + "suspendCommand": "", + "suspendTimeout": 1800 + }, "location": { "analogClockInCalendar": false, + "autoLocate": false, "firstDayOfWeek": 1, "hideWeatherCityName": false, "hideWeatherTimezone": false, @@ -416,17 +473,18 @@ "use12hourFormat": false, "useFahrenheit": false, "weatherEnabled": true, - "weatherShowEffects": true + "weatherShowEffects": true, + "weatherTaliaMascotAlways": false }, "network": { - "airplaneModeEnabled": false, + "bluetoothAutoConnect": true, "bluetoothDetailsViewMode": "grid", "bluetoothHideUnnamedDevices": false, "bluetoothRssiPollIntervalMs": 10000, "bluetoothRssiPollingEnabled": false, "disableDiscoverability": false, - "wifiDetailsViewMode": "grid", - "wifiEnabled": true + "networkPanelView": "wifi", + "wifiDetailsViewMode": "grid" }, "nightLight": { "autoSchedule": true, @@ -437,6 +495,10 @@ "manualSunset": "18:30", "nightTemp": "4000" }, + "noctaliaPerformance": { + "disableDesktopWidgets": true, + "disableWallpaper": true + }, "notifications": { "backgroundOpacity": 1, "clearDismissed": true, @@ -478,7 +540,8 @@ "overlayLayer": true }, "plugins": { - "autoUpdate": false + "autoUpdate": false, + "notifyUpdates": true }, "sessionMenu": { "countdownDuration": 10000, @@ -540,7 +603,7 @@ "showHeader": true, "showKeybinds": true }, - "settingsVersion": 53, + "settingsVersion": 59, "systemMonitor": { "batteryCriticalThreshold": 5, "batteryWarningThreshold": 20, @@ -569,19 +632,18 @@ "enableUserTheming": false }, "ui": { - "bluetoothDetailsViewMode": "grid", - "bluetoothHideUnnamedDevices": false, "boxBorderEnabled": false, "fontDefault": "Maple Mono NF CN", "fontDefaultScale": 1, "fontFixed": "Maple Mono NF CN", "fontFixedScale": 1, - "networkPanelView": "wifi", "panelBackgroundOpacity": 0.85, "panelsAttachedToBar": true, + "scrollbarAlwaysVisible": true, "settingsPanelMode": "attached", + "settingsPanelSideBarCardStyle": false, "tooltipsEnabled": true, - "wifiDetailsViewMode": "grid" + "translucentWidgets": false }, "wallpaper": { "automationEnabled": true, @@ -592,6 +654,7 @@ "fillColor": "#000000", "fillMode": "crop", "hideWallpaperFilenames": false, + "linkLightAndDarkWallpapers": true, "monitorDirectories": [], "overviewBlur": 0.4, "overviewEnabled": true, @@ -605,7 +668,8 @@ "sortOrder": "name", "transitionDuration": 1500, "transitionEdgeSmoothness": 0.05, - "transitionType": "random", + "transitionType": ["fade", "disc", "stripes", "wipe", "pixelate", "honeycomb"], + "useOriginalImages": false, "useSolidColor": false, "useWallhaven": false, "viewMode": "recursive",