diff --git a/home/linux/gui/base/noctalia/default.nix b/home/linux/gui/base/noctalia/default.nix index 2fc3c2a6..7cdc44bf 100644 --- a/home/linux/gui/base/noctalia/default.nix +++ b/home/linux/gui/base/noctalia/default.nix @@ -2,22 +2,24 @@ lib, config, pkgs, + pkgs-patched, wallpapers, ... }: +let + package = pkgs-patched.noctalia-shell; +in { - home.packages = - with pkgs; - [ - noctalia-shell - qt6Packages.qt6ct # for icon theme - app2unit # Launch Desktop Entries (or arbitrary commands) as Systemd user units - ] - ++ (lib.optionals pkgs.stdenv.isx86_64 [ - gpu-screen-recorder # recoding screen - ]); + home.packages = [ + package + pkgs.qt6Packages.qt6ct # for icon theme + pkgs.app2unit # Launch Desktop Entries (or arbitrary commands) as Systemd user units + ] + ++ (lib.optionals pkgs.stdenv.isx86_64 [ + pkgs.gpu-screen-recorder # recoding screen + ]); home.file."Pictures/Wallpapers".source = wallpapers; @@ -39,7 +41,7 @@ }; Service = { - ExecStart = lib.getExe pkgs.noctalia-shell; + ExecStart = lib.getExe package; Restart = "on-failure"; Environment = [ diff --git a/home/linux/gui/base/noctalia/settings.json b/home/linux/gui/base/noctalia/settings.json index ebfca226..3b8add0f 100644 --- a/home/linux/gui/base/noctalia/settings.json +++ b/home/linux/gui/base/noctalia/settings.json @@ -3,11 +3,14 @@ "customLaunchPrefix": "", "customLaunchPrefixEnabled": false, "enableClipPreview": true, - "enableClipboardHistory": false, + "enableClipboardHistory": true, "iconMode": "native", + "ignoreMouseInput": false, "pinnedExecs": [], "position": "center", + "screenshotAnnotationTool": "", "showCategories": true, + "showIconBackground": true, "sortByMostUsed": true, "terminalCommand": "xterm -e", "useApp2Unit": true, @@ -23,6 +26,7 @@ "volumeStep": 1 }, "bar": { + "backgroundOpacity": 0.2, "capsuleOpacity": 1, "density": "comfortable", "exclusive": true, @@ -34,7 +38,7 @@ "position": "top", "showCapsule": true, "showOutline": false, - "transparent": true, + "useSeparateOpacity": true, "widgets": { "center": [ { @@ -42,15 +46,20 @@ "colorizeIcons": false, "enableScrollWheel": true, "followFocusedScreen": false, + "groupedBorderOpacity": 1, "hideUnoccupied": false, + "iconScale": 0.8, "id": "Workspace", "labelMode": "index", "showApplications": false, - "showLabelsOnlyWhenOccupied": true + "showLabelsOnlyWhenOccupied": true, + "unfocusedIconsOpacity": 1 } ], "left": [ { + "colorizeSystemIcon": "none", + "enableColorization": false, "hideMode": "alwaysExpanded", "icon": "rocket", "id": "CustomButton", @@ -83,19 +92,23 @@ "formatHorizontal": "HH:mm ddd, MMM dd", "formatVertical": "HH mm - dd MM", "id": "Clock", + "tooltipFormat": "HH:mm ddd, MMM dd", "useCustomFont": false, "usePrimaryColor": false }, { + "compactMode": true, "diskPath": "/persistent", "id": "SystemMonitor", "showCpuTemp": false, "showCpuUsage": true, "showDiskUsage": true, "showGpuTemp": false, + "showLoadAverage": false, "showMemoryAsPercent": true, "showMemoryUsage": true, "showNetworkStats": true, + "useMonospaceFont": true, "usePrimaryColor": false }, { @@ -229,6 +242,7 @@ "id": "media-sysmon-card" } ], + "diskPath": "/persistent", "position": "close_to_bar_button", "shortcuts": { "left": [ @@ -326,6 +340,11 @@ "weatherShowEffects": true }, "network": { + "bluetoothDetailsViewMode": "grid", + "bluetoothHideUnnamedDevices": false, + "bluetoothRssiPollIntervalMs": 10000, + "bluetoothRssiPollingEnabled": false, + "wifiDetailsViewMode": "grid", "wifiEnabled": true }, "nightLight": { @@ -348,6 +367,11 @@ "normalUrgencyDuration": 8, "overlayLayer": true, "respectExpireTimeout": false, + "saveToHistory": { + "critical": true, + "low": true, + "normal": true + }, "sounds": { "criticalSoundFile": "", "enabled": true, @@ -362,7 +386,7 @@ "autoHideMs": 2000, "backgroundOpacity": 1, "enabled": true, - "enabledTypes": [0, 1, 2, 4], + "enabledTypes": [0, 1, 2, 4, 3], "location": "top_right", "monitors": [], "overlayLayer": true @@ -371,6 +395,7 @@ "audioCodec": "opus", "audioSource": "default_output", "colorRange": "limited", + "copyToClipboard": false, "directory": "~/Videos", "frameRate": 30, "quality": "high", @@ -381,6 +406,7 @@ "sessionMenu": { "countdownDuration": 10000, "enableCountdown": true, + "largeButtonsLayout": "grid", "largeButtonsStyle": true, "position": "center", "powerOptions": [ @@ -421,9 +447,10 @@ "enabled": true } ], - "showHeader": true + "showHeader": true, + "showNumberLabels": true }, - "settingsVersion": 32, + "settingsVersion": 37, "systemMonitor": { "cpuCriticalThreshold": 95, "cpuPollingInterval": 10000, @@ -433,9 +460,11 @@ "diskPollingInterval": 250, "diskWarningThreshold": 80, "enableDgpuMonitoring": false, + "externalMonitor": "resources || missioncenter || jdsystemmonitor || corestats || system-monitoring-center || gnome-system-monitor || plasma-systemmonitor || mate-system-monitor || ukui-system-monitor || deepin-system-monitor || pantheon-system-monitor", "gpuCriticalThreshold": 90, "gpuPollingInterval": 3000, "gpuWarningThreshold": 80, + "loadAvgPollingInterval": 3000, "memCriticalThreshold": 90, "memPollingInterval": 250, "memWarningThreshold": 80, @@ -474,8 +503,7 @@ "zed": false }, "ui": { - "bluetoothDetailsViewMode": "grid", - "bluetoothHideUnnamedDevices": false, + "boxBorderEnabled": false, "fontDefault": "Maple Mono NF CN", "fontDefaultScale": 1, "fontFixed": "Maple Mono NF CN", @@ -483,8 +511,7 @@ "panelBackgroundOpacity": 0.85, "panelsAttachedToBar": true, "settingsPanelMode": "attached", - "tooltipsEnabled": true, - "wifiDetailsViewMode": "grid" + "tooltipsEnabled": true }, "wallpaper": { "directory": "~/Pictures/Wallpapers", @@ -500,10 +527,13 @@ "randomIntervalSec": 600, "recursiveSearch": false, "setWallpaperOnAllMonitors": true, + "solidColor": "#1a1a2e", "transitionDuration": 1500, "transitionEdgeSmoothness": 0.05, "transitionType": "random", + "useSolidColor": false, "useWallhaven": false, + "wallhavenApiKey": "", "wallhavenCategories": "111", "wallhavenOrder": "desc", "wallhavenPurity": "100", @@ -512,6 +542,7 @@ "wallhavenResolutionHeight": "", "wallhavenResolutionMode": "atleast", "wallhavenResolutionWidth": "", - "wallhavenSorting": "relevance" + "wallhavenSorting": "relevance", + "wallpaperChangeMode": "random" } }