diff --git a/home/aiden/.config/niri/startup.kdl b/home/aiden/.config/niri/startup.kdl index efbac2e..b973b9b 100644 --- a/home/aiden/.config/niri/startup.kdl +++ b/home/aiden/.config/niri/startup.kdl @@ -1,5 +1,6 @@ //spawn-at-startup "/usr/lib/pam_kwallet_init" //spawn-at-startup "/usr/lib/polkit-1/polkitd" + spawn-at-startup "/usr/bin/gnome-keyring-daemon" "--start" "--components=secrets" spawn-at-startup "/usr/libexec/polkit-kde-authentication-agent-1" spawn-at-startup "qs" "-c" "noctalia-shell" diff --git a/home/aiden/.config/niri/style.kdl b/home/aiden/.config/niri/style.kdl index 08686ae..3cb8b69 100644 --- a/home/aiden/.config/niri/style.kdl +++ b/home/aiden/.config/niri/style.kdl @@ -93,11 +93,11 @@ animations { // enable transparency window-rule { match is-active=false - opacity 0.8 + opacity 0.8 //inactive transparency } window-rule { match is-active=true - opacity 0.95 + opacity 0.95 //active transparency } window-rule { draw-border-with-background false @@ -107,6 +107,7 @@ window-rule { match app-id="gimp" match title="^*Invidious — Mozilla Firefox$" match title="^Watch2Gether — Mozilla Firefox$" + match app-id="org.gnome.Loupe" opacity 1.0 } diff --git a/home/aiden/.config/noctalia/plugins/update-count/BarWidget.qml b/home/aiden/.config/noctalia/plugins/update-count/BarWidget.qml index 250f733..a9997ca 100644 --- a/home/aiden/.config/noctalia/plugins/update-count/BarWidget.qml +++ b/home/aiden/.config/noctalia/plugins/update-count/BarWidget.qml @@ -70,7 +70,8 @@ Rectangle { cursorShape: root.pluginApi?.mainInstance?.updateCount > 0 ? Qt.PointingHandCursor : Qt.ArrowCursor onClicked: { - root.pluginApi?.mainInstance?.startDoSystemUpdate(); + if (root.pluginApi?.mainInstance?.updateCount > 0) + root.pluginApi?.mainInstance?.startDoSystemUpdate(); } diff --git a/home/aiden/.config/noctalia/plugins/update-count/Main.qml b/home/aiden/.config/noctalia/plugins/update-count/Main.qml index 1589a8b..d1f956b 100644 --- a/home/aiden/.config/noctalia/plugins/update-count/Main.qml +++ b/home/aiden/.config/noctalia/plugins/update-count/Main.qml @@ -115,12 +115,35 @@ Item { // ------ Start update ------ // function startDoSystemUpdate() { - const cmd = root.customUpdater.cmdDoSystemUpdate || root.updater.cmdDoSystemUpdate || "echo 'No update cmd found.'" + const updateCmd = root.customUpdater.cmdDoSystemUpdate || root.updater.cmdDoSystemUpdate || "echo 'No update cmd found.'" + const ipcCmd = "qs -c noctalia-shell ipc call plugin:update-count check" + const combinedCmd = updateCmd + " && " + ipcCmd + const term = root.updateTerminalCommand.trim(); + const fullCmd = (term.indexOf("{}") !== -1) ? term.replace("{}", combinedCmd) : term + " " + combinedCmd; - const fullCmd = (term.indexOf("{}") !== -1) ? term.replace("{}", cmd) : term + " " + cmd; + doSystemUpdate.command = ["sh", "-c", fullCmd] + doSystemUpdate.running = true; - Quickshell.execDetached(["sh", "-c", fullCmd]); Logger.i("UpdateCount", `Executed update command: ${fullCmd}`); } + + Process { + id: doSystemUpdate + } + + // + // ------ IPC ------ + // + IpcHandler { + target: "plugin:update-count" + + function check(): void { + root.startGetNumUpdates() + } + + function run(): void { + root.startDoSystemUpdate() + } + } } diff --git a/home/aiden/.config/noctalia/plugins/update-count/manifest.json b/home/aiden/.config/noctalia/plugins/update-count/manifest.json index a0daffb..db18021 100644 --- a/home/aiden/.config/noctalia/plugins/update-count/manifest.json +++ b/home/aiden/.config/noctalia/plugins/update-count/manifest.json @@ -1,7 +1,7 @@ { "id": "update-count", "name": "Update Count", - "version": "1.0.5", + "version": "1.0.6", "minNoctaliaVersion": "3.6.0", "author": "BukoMoon", "license": "GPLv3", diff --git a/home/aiden/.config/noctalia/settings.json b/home/aiden/.config/noctalia/settings.json index 9f1fa0b..6199ecd 100644 --- a/home/aiden/.config/noctalia/settings.json +++ b/home/aiden/.config/noctalia/settings.json @@ -25,6 +25,7 @@ "volumeStep": 5 }, "bar": { + "backgroundOpacity": 0.93, "capsuleOpacity": 1, "density": "comfortable", "exclusive": true, @@ -37,7 +38,7 @@ "position": "top", "showCapsule": true, "showOutline": false, - "transparent": false, + "useSeparateOpacity": false, "widgets": { "center": [ { @@ -88,24 +89,34 @@ "colorizeIcons": false, "enableScrollWheel": true, "followFocusedScreen": false, + "groupedBorderOpacity": 1, "hideUnoccupied": true, "id": "Workspace", "labelMode": "name", "showApplications": false, - "showLabelsOnlyWhenOccupied": true + "showLabelsOnlyWhenOccupied": true, + "unfocusedIconsOpacity": 1 }, { "customFont": "", "formatHorizontal": "HH:mm ddd, MMM dd", "formatVertical": "HH mm - dd MM", "id": "Clock", + "tooltipFormat": "HH:mm ddd, MMM dd", "useCustomFont": false, "usePrimaryColor": false }, { + "defaultSettings": { + "currentIconName": "world-download", + "hideOnZero": false, + "updateIntervalMinutes": 30, + "updateTerminalCommand": "foot -e" + }, "id": "plugin:update-count" }, { + "compactMode": false, "diskPath": "/", "id": "SystemMonitor", "showCpuTemp": true, @@ -114,8 +125,9 @@ "showGpuTemp": false, "showMemoryAsPercent": false, "showMemoryUsage": true, - "showNetworkStats": false, - "usePrimaryColor": false + "showNetworkStats": true, + "useMonospaceFont": true, + "usePrimaryColor": true }, { "colorizeIcons": true, @@ -132,6 +144,34 @@ } ], "right": [ + { + "hideMode": "alwaysExpanded", + "icon": "eye", + "id": "CustomButton", + "leftClickExec": "/home/aiden/toggle-transparency.sh", + "leftClickUpdateText": true, + "maxTextLength": { + "horizontal": 10, + "vertical": 10 + }, + "middleClickExec": "", + "middleClickUpdateText": false, + "parseJson": false, + "rightClickExec": "", + "rightClickUpdateText": false, + "showIcon": true, + "textCollapse": "", + "textCommand": "", + "textIntervalMs": 3000, + "textStream": false, + "wheelDownExec": "", + "wheelDownUpdateText": false, + "wheelExec": "", + "wheelMode": "unified", + "wheelUpExec": "", + "wheelUpUpdateText": false, + "wheelUpdateText": false + }, { "id": "ScreenRecorder" }, @@ -152,11 +192,11 @@ }, { "deviceNativePath": "", - "displayMode": "onhover", + "displayMode": "alwaysShow", "hideIfNotDetected": true, "id": "Battery", "showNoctaliaPerformance": false, - "showPowerProfiles": false, + "showPowerProfiles": true, "warningThreshold": 30 }, { @@ -168,6 +208,10 @@ "id": "Brightness" }, { + "defaultSettings": { + "hideInactive": false, + "removeMargins": false + }, "id": "plugin:privacy-indicator" }, { @@ -277,7 +321,7 @@ } }, "desktopWidgets": { - "enabled": false, + "enabled": true, "gridSnap": true, "monitorWidgets": [ { @@ -378,6 +422,11 @@ "normalUrgencyDuration": 8, "overlayLayer": true, "respectExpireTimeout": false, + "saveToHistory": { + "critical": true, + "low": true, + "normal": true + }, "sounds": { "criticalSoundFile": "", "enabled": false, @@ -406,6 +455,7 @@ "audioCodec": "opus", "audioSource": "default_output", "colorRange": "limited", + "copyToClipboard": false, "directory": "/home/aiden/Videos", "frameRate": 60, "quality": "very_high", @@ -456,15 +506,17 @@ "enabled": true } ], - "showHeader": true + "showHeader": true, + "showNumberLabels": true }, - "settingsVersion": 32, + "settingsVersion": 35, "systemMonitor": { "cpuCriticalThreshold": 90, "cpuPollingInterval": 3000, "cpuWarningThreshold": 80, "criticalColor": "", "diskCriticalThreshold": 90, + "diskPath": "/", "diskPollingInterval": 3000, "diskWarningThreshold": 80, "enableDgpuMonitoring": false, @@ -545,6 +597,7 @@ "transitionEdgeSmoothness": 0.05, "transitionType": "random", "useWallhaven": false, + "wallhavenApiKey": "", "wallhavenCategories": "111", "wallhavenOrder": "desc", "wallhavenPurity": "100", @@ -553,6 +606,7 @@ "wallhavenResolutionHeight": "", "wallhavenResolutionMode": "atleast", "wallhavenResolutionWidth": "", - "wallhavenSorting": "relevance" + "wallhavenSorting": "relevance", + "wallpaperChangeMode": "random" } } diff --git a/home/aiden/sync-config.sh b/home/aiden/sync-config.sh index 6b4f5c6..5e2484e 100755 --- a/home/aiden/sync-config.sh +++ b/home/aiden/sync-config.sh @@ -9,9 +9,11 @@ rsync -a /home/aiden/update-git-dot.sh /home/aiden/Nextcloud/Backups/Laptop/Noct rsync -a /home/aiden/update.sh /home/aiden/Nextcloud/Backups/Laptop/Noctalia-niri/update.sh rsync -a /home/aiden/sddm-random-background.sh /home/aiden/Nextcloud/Backups/Laptop/Noctalia-niri/sddm-random-background.sh rsync -a /home/aiden/.bashrc /home/aiden/Nextcloud/Backups/Laptop/void/bashrc +rsync -a /home/aiden/toggle-transparency.sh /home/aiden/Nextcloud/Backups/Laptop/Noctalia-niri/toggle-transparency.sh rsync -a /usr/share/xdg-desktop-portal/niri-portals.conf /home/aiden/Nextcloud/Backups/Laptop/Noctalia-niri/xdg-desktop-portal/niri-portals.conf rsync -a /usr/share/wayland-sessions/niri.desktop /home/aiden/Nextcloud/Backups/Laptop/Noctalia-niri/wayland-sessions/niri.desktop +rsync -a /usr/local/bin/discord-delay.sh /home/aiden/Nextcloud/Backups/Laptop/Noctalia-niri/discord-delay.sh rsync -a /etc/cron.d/* /home/aiden/Nextcloud/Backups/Laptop/void/cron.d rsync -a /etc/cron.hourly/* /home/aiden/Nextcloud/Backups/Laptop/void/cron.hourly diff --git a/home/aiden/toggle-transparency.sh b/home/aiden/toggle-transparency.sh new file mode 100755 index 0000000..228ea8b --- /dev/null +++ b/home/aiden/toggle-transparency.sh @@ -0,0 +1,10 @@ +#! /bin/bash +stylef=/home/aiden/.config/niri/style.kdl + +if grep -q "opacity 0.8 //inactive" $stylef; then + sed -i 's/opacity 0.8 \/\/inactive/opacity 1.0 \/\/inactive/' $stylef + sed -i 's/opacity 0.95 \/\/active/opacity 1.0 \/\/active/' $stylef +else + sed -i 's/opacity 1.0 \/\/inactive/opacity 0.8 \/\/inactive/' $stylef + sed -i 's/opacity 1.0 \/\/active/opacity 0.95 \/\/active/' $stylef +fi diff --git a/home/aiden/update-git-dot.sh b/home/aiden/update-git-dot.sh index a74a985..2a0ab73 100755 --- a/home/aiden/update-git-dot.sh +++ b/home/aiden/update-git-dot.sh @@ -11,10 +11,12 @@ rsync -a $backupdir/Noctalia-niri/sddm-random-background.sh $gitdir/home/aiden/ rsync -a $backupdir/Noctalia-niri/sync-config.sh $gitdir/home/aiden/ rsync -a $backupdir/Noctalia-niri/update.sh $gitdir/home/aiden/ rsync -a $backupdir/Noctalia-niri/update-git-dot.sh $gitdir/home/aiden/ +rsync -a $backupdir/Noctalia-niri/toggle-transparency.sh $gitdir/home/aiden/ rsync -a $backupdir/void/bashrc $gitdir/home/aiden/.bashrc rsync -a $backupdir/Noctalia-niri/wayland-sessions $gitdir/usr/share/ rsync -a $backupdir/Noctalia-niri/xdg-desktop-portal $gitdir/usr/share/ +rsync -a $backupdir/Noctalia-niri/discord-delay.sh $gitdir/usr/local/bin/ rsync -a $backupdir/void/cron.d $gitdir/etc/ rsync -a $backupdir/void/cron.daily $gitdir/etc/