From 0df97411b157bcee1f3bd5bce4895b4f657a754b Mon Sep 17 00:00:00 2001 From: Adrian G L Date: Sun, 2 Aug 2026 22:16:41 +0200 Subject: [PATCH] fix noctalia update --- flake.nix | 4 +- home/kdeconnect.nix | 18 ------- home/noctalia-plugins/osk/plugin.toml | 70 --------------------------- home/noctalia-plugins/osk/toggle.luau | 38 --------------- home/noctalia.nix | 43 ++++++++++++++-- hosts/aragon/configuration.nix | 1 + modules/kdeconnect.nix | 5 +- 7 files changed, 45 insertions(+), 134 deletions(-) delete mode 100644 home/kdeconnect.nix delete mode 100644 home/noctalia-plugins/osk/plugin.toml delete mode 100644 home/noctalia-plugins/osk/toggle.luau diff --git a/flake.nix b/flake.nix index 758173d..ccff710 100644 --- a/flake.nix +++ b/flake.nix @@ -11,8 +11,8 @@ }; noctalia = { - url = "github:noctalia-dev/noctalia-shell/42eed1d"; # remember to update this commit hash - inputs.nixpkgs.follows = "nixpkgs"; + url = "github:noctalia-dev/noctalia/v5.0.0-beta.7"; # remember to update this commit hash + #inputs.nixpkgs.follows = "nixpkgs"; }; nix-colors.url = "github:misterio77/nix-colors"; diff --git a/home/kdeconnect.nix b/home/kdeconnect.nix deleted file mode 100644 index 4608d0a..0000000 --- a/home/kdeconnect.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: -{ - home.packages = with pkgs; [ - kdePackages.xdg-desktop-portal-kde - kdePackages.kdeconnect-kde - ]; - services.kdeconnect = { - enable = true; - #package = pkgs.kdePackages.kdeconnect-kde; - package = pkgs.gnomeExtensions.gsconnect; - indicator = true; - }; -} diff --git a/home/noctalia-plugins/osk/plugin.toml b/home/noctalia-plugins/osk/plugin.toml deleted file mode 100644 index 109d5af..0000000 --- a/home/noctalia-plugins/osk/plugin.toml +++ /dev/null @@ -1,70 +0,0 @@ -id = "local/osk" -name = "wvkbd Toggle" -version = "0.2.0" -min_noctalia = "5.0.0" -author = "local" -description = "Bar button to toggle the wvkbd on-screen keyboard with style options." -icon = "keyboard" - -[[widget]] -id = "toggle" -entry = "toggle.luau" - - # Geometry & alpha - [[widget.setting]] - key = "height" - type = "int" - label = "Landscape height (px)" - default = 200 - - [[widget.setting]] - key = "rounding" - type = "int" - label = "Corner rounding (px)" - default = 10 - - [[widget.setting]] - key = "alpha" - type = "int" - label = "Alpha (0-255)" - default = 236 - min = 0 - max = 255 - - # Colors — raw wvkbd format: rrggbb or rrggbbaa (no leading #) - [[widget.setting]] - key = "bg" - type = "string" - label = "Background color (rrggbb|aa)" - default = "" - - [[widget.setting]] - key = "fg" - type = "string" - label = "Key color (rrggbb|aa)" - default = "" - - [[widget.setting]] - key = "press" - type = "string" - label = "Pressed key color (rrggbb|aa)" - default = "" - - [[widget.setting]] - key = "text" - type = "string" - label = "Key text color (rrggbb|aa)" - default = "" - - # Layers & behavior - [[widget.setting]] - key = "layers" - type = "string" - label = "Layers (comma-separated, e.g. full,emoji)" - default = "" - - [[widget.setting]] - key = "non_exclusive" - type = "bool" - label = "Non-exclusive (float over windows)" - default = false diff --git a/home/noctalia-plugins/osk/toggle.luau b/home/noctalia-plugins/osk/toggle.luau deleted file mode 100644 index e48e43a..0000000 --- a/home/noctalia-plugins/osk/toggle.luau +++ /dev/null @@ -1,38 +0,0 @@ -local BIN = "wvkbd-mobintl" - --- Build the wvkbd flag string from the widget's style settings. -local function buildArgs() - local args = {} - - local function add(value, flag) - if value ~= nil and value ~= "" then - table.insert(args, flag .. " " .. tostring(value)) - end - end - - add(barWidget.getConfig("height"), "-L") - add(barWidget.getConfig("rounding"), "-R") - add(barWidget.getConfig("alpha"), "--alpha") - add(barWidget.getConfig("bg"), "--bg") - add(barWidget.getConfig("fg"), "--fg") - add(barWidget.getConfig("press"), "--press") - add(barWidget.getConfig("text"), "--text") - add(barWidget.getConfig("layers"), "-l") - - if barWidget.getConfig("non_exclusive") == true then - table.insert(args, "--non-exclusive") - end - - return table.concat(args, " ") -end - -function update() - noctalia.setUpdateInterval(60000) - barWidget.setGlyph("keyboard") - barWidget.setTooltip("Toggle wvkbd on-screen keyboard") -end - -function onClick() - local launch = BIN .. " " .. buildArgs() - noctalia.runAsync("pkill -x " .. BIN .. " || setsid " .. launch) -end diff --git a/home/noctalia.nix b/home/noctalia.nix index 5e1a027..7c6520f 100644 --- a/home/noctalia.nix +++ b/home/noctalia.nix @@ -298,12 +298,50 @@ in hide_when_no_media = true; }; osk = { - type = "local/osk:toggle"; + type = "custom_button"; + glyph = "keyboard"; + actions = { + left = "exec pkill wvkbd-mobintl || wvkbd-mobintl --bg 00000099 -L 200 -R 15 &"; + right = "keyboard-layout-cycle"; + scroll_down = "keyboard-backlight-down"; + scroll_up = "keyboard-backlight-up"; + }; }; }; plugins = { - enabled = [ "local/osk" ]; + auto_update = true; + enabled = [ + "noctalia/bitwarden" + "noctalia/notes" + "noctalia/translator" + "alexander/mimir" + "elijaharch/wl-screen-mirror" + "pozzoo/hassio" + "yocraft/web-launcher" + "nightwatch75/todo" + "icefish/phone-connect" + ]; + source = [ + { + name = "official"; + kind = "git"; + location = "https://github.com/noctalia-dev/official-plugins"; + enabled = true; + } + { + name = "community"; + kind = "git"; + location = "https://github.com/noctalia-dev/community-plugins"; + enabled = true; + } + ]; + }; + + plugin_settings = { + "alexander/mimir" = { + api_endpoint = "http://galadriel:11112/v1"; + }; }; theme = { @@ -351,5 +389,4 @@ in }; }; - xdg.dataFile."noctalia/plugins/osk".source = ./noctalia-plugins/osk; } diff --git a/hosts/aragon/configuration.nix b/hosts/aragon/configuration.nix index 11e09e9..f8282ec 100644 --- a/hosts/aragon/configuration.nix +++ b/hosts/aragon/configuration.nix @@ -30,6 +30,7 @@ ../../modules/xdg.nix ../../modules/sound.nix ../../modules/bluetooth.nix + ../../modules/kdeconnect.nix ../../modules/desktopApplications.nix # Development tools and user configuration diff --git a/modules/kdeconnect.nix b/modules/kdeconnect.nix index b3b1f68..98a702f 100644 --- a/modules/kdeconnect.nix +++ b/modules/kdeconnect.nix @@ -8,12 +8,11 @@ environment.systemPackages = with pkgs; [ kdePackages.xdg-desktop-portal-kde kdePackages.kdeconnect-kde - gnomeExtensions.gsconnect kdePackages.qttools + sshfs ]; programs.kdeconnect = { - #package = pkgs.kdePackages.kdeconnect-kde; - package = pkgs.gnomeExtensions.gsconnect; + package = pkgs.kdePackages.kdeconnect-kde; enable = true; }; networking.firewall = rec {