diff --git a/README.md b/README.md index 9868463..e1abeb4 100644 --- a/README.md +++ b/README.md @@ -10,16 +10,17 @@ - Grub menu: - + + ## Setup Overview - **OS**: Archlinux -- **WM**: Hyprland | Niri -- **Bar**: Waybar | Quickshell +- **WM**: Hyprland | **Niri** +- **Bar**: Waybar | **Quickshell** - **Shell**: Fish - **Prompt**: Oh My Posh -- **Terminal**: Kitty & Ghostty +- **Terminal**: **Kitty** & Ghostty - **Colorscheme**: Catppuccin Mocha - **App Launcher**: Rofi - **Logout Screen**: Wlogout @@ -27,6 +28,8 @@ - **Wallpaper Daemon**: Swww - **Notification Daemon**: Mako +(**bold**: I currently prefer) + ## Hyprland & friends Based on an old version of [end-4/dots-hyprland](https://github.com/end-4/dots-hyprland) but without ags amd tons of other stuff. diff --git a/niri/config.kdl b/niri/config.kdl index c4ced67..73945cc 100644 --- a/niri/config.kdl +++ b/niri/config.kdl @@ -27,7 +27,7 @@ input { warp-mouse-to-focus // Focus windows and outputs automatically when moving the mouse into them. - focus-follows-mouse max-scroll-amount="100%" + focus-follows-mouse max-scroll-amount="99%" } /************************Output************************/ @@ -280,11 +280,10 @@ binds { Mod+Shift+Return { spawn "ghostty"; } Mod+Shift+W { spawn "wallpaper-chooser"; } - // EWW - Mod+Space { spawn-sh "qs ipc call panels toggleControlCenter"; } - Mod+Shift+L { spawn-sh "qs ipc call lyrics toggleBarLyrics"; } - // Quickshell + Mod+Space { spawn-sh "qs ipc call panels toggleControlCenter"; } + Mod+Shift+D { spawn-sh "qs ipc call panels toggleCalendar"; } + Mod+Shift+L { spawn-sh "qs ipc call lyrics toggleBarLyrics"; } Mod+Shift+K { spawn-sh "pkill -x quickshell || quickshell"; } Mod+I { spawn-sh "qs ipc call idleInhibitor toggleInhibitor"; } diff --git a/niri/config.kdl.template b/niri/config.kdl.template index e4d11d2..1dbe5cc 100644 --- a/niri/config.kdl.template +++ b/niri/config.kdl.template @@ -27,7 +27,7 @@ input { warp-mouse-to-focus // Focus windows and outputs automatically when moving the mouse into them. - focus-follows-mouse max-scroll-amount="100%" + focus-follows-mouse max-scroll-amount="99%" } /************************Output************************/ @@ -280,11 +280,10 @@ binds { Mod+Shift+Return { spawn "ghostty"; } Mod+Shift+W { spawn "wallpaper-chooser"; } - // EWW - Mod+Space { spawn-sh "qs ipc call panels toggleControlCenter"; } - Mod+Shift+L { spawn-sh "qs ipc call lyrics toggleBarLyrics"; } - // Quickshell + Mod+Space { spawn-sh "qs ipc call panels toggleControlCenter"; } + Mod+Shift+D { spawn-sh "qs ipc call panels toggleCalendar"; } + Mod+Shift+L { spawn-sh "qs ipc call lyrics toggleBarLyrics"; } Mod+Shift+K { spawn-sh "pkill -x quickshell || quickshell"; } Mod+I { spawn-sh "qs ipc call idleInhibitor toggleInhibitor"; } diff --git a/quickshell/Constants/Color.qml b/quickshell/Constants/Color.qml index 17a0e35..90f9f29 100644 --- a/quickshell/Constants/Color.qml +++ b/quickshell/Constants/Color.qml @@ -7,6 +7,7 @@ pragma Singleton Singleton { id: root + // Compatibility colors for noctalia modules property color mPrimary: Colors.primary property color mOnPrimary: Colors.base property color mSecondary: Colors.primary diff --git a/quickshell/Constants/Icons.qml b/quickshell/Constants/Icons.qml index edc8af2..9f4d56b 100644 --- a/quickshell/Constants/Icons.qml +++ b/quickshell/Constants/Icons.qml @@ -36,6 +36,7 @@ Singleton { readonly property string speedReset: "󰾅" readonly property string reset: "󰑙" readonly property string lines: "" + // Tabler icons // Expose the font family name for easy access readonly property string fontFamily: currentFontLoader ? currentFontLoader.name : "" readonly property string defaultIcon: TablerIcons.defaultIcon diff --git a/quickshell/Modules/Panel/CalendarPanel.qml b/quickshell/Modules/Panel/CalendarPanel.qml index eb562b2..be4beb2 100644 --- a/quickshell/Modules/Panel/CalendarPanel.qml +++ b/quickshell/Modules/Panel/CalendarPanel.qml @@ -49,12 +49,9 @@ NPanel { } // Combined blue banner with date/time and weather summary - Rectangle { + NBox { Layout.fillWidth: true Layout.preferredHeight: blueColumn.implicitHeight + Style.marginM * 2 - radius: Style.radiusL - color: Color.mSurfaceVariant - layer.enabled: true ColumnLayout { id: blueColumn @@ -255,14 +252,6 @@ NPanel { } - layer.effect: DropShadow { - horizontalOffset: 6 - verticalOffset: 6 - radius: 8 - samples: 12 - color: Qt.rgba(0, 0, 0, 0.3) - } - } // 6-day forecast (outside blue banner) diff --git a/quickshell/Services/IpService.qml b/quickshell/Services/IpService.qml index a48f0ee..8c19a02 100644 --- a/quickshell/Services/IpService.qml +++ b/quickshell/Services/IpService.qml @@ -116,7 +116,7 @@ Singleton { repeat: false running: false onTriggered: { - refresh(); + fetchIP(); } } @@ -127,7 +127,9 @@ Singleton { repeat: true running: true onTriggered: { + fetchTimer.stop(); fetchIP(); + fetchTimer.start(); } }