diff --git a/flake.lock b/flake.lock index bc170ef..4cfe813 100644 --- a/flake.lock +++ b/flake.lock @@ -353,16 +353,15 @@ ] }, "locked": { - "lastModified": 1714390161, - "narHash": "sha256-hWPGLUGNr7IR2FT4xS0VlhTW3S6xpw0hU3LJJC3CaKo=", - "owner": "toast003", + "lastModified": 1712484920, + "narHash": "sha256-wNwv12U/QYYgZanycZ32A41cEDa2zPwYuMKK6AJYNJk=", + "owner": "pjones", "repo": "plasma-manager", - "rev": "d9754f6f5dcf96969ad40496326213d5344846e5", + "rev": "4b127a5ede004f5c6d7c41938c2986b599dc0bf3", "type": "github" }, "original": { - "owner": "toast003", - "ref": "libinput", + "owner": "pjones", "repo": "plasma-manager", "type": "github" } @@ -459,4 +458,4 @@ }, "root": "root", "version": 7 -} +} \ No newline at end of file diff --git a/flake.nix b/flake.nix index 524a6a9..9f65afb 100644 --- a/flake.nix +++ b/flake.nix @@ -51,7 +51,7 @@ }; plasma-manager = { - url = "github:toast003/plasma-manager/libinput"; + url = "github:pjones/plasma-manager"; inputs.nixpkgs.follows = "nixpkgs-unstable-raw"; inputs.home-manager.follows = "home-manager-unstable"; }; diff --git a/machines/WinMax2/configuration.nix b/machines/WinMax2/configuration.nix index 65f51ff..fd5f9ea 100755 --- a/machines/WinMax2/configuration.nix +++ b/machines/WinMax2/configuration.nix @@ -114,7 +114,6 @@ comment = "Application for managing and playing games on Steam"; }; }; - programs.plasma.input.keyboard.layouts = lib.mkForce ["us"]; } ]; diff --git a/roles/kde/plasma.nix b/roles/kde/plasma.nix index f7052e8..2d135ad 100644 --- a/roles/kde/plasma.nix +++ b/roles/kde/plasma.nix @@ -108,6 +108,12 @@ in { ]; programs.plasma = { enable = true; + overrideConfig = true; + # Delete config files that I fully configure here + overrideConfigFiles = [ + "plasmashellrc" + "plasma-org.kde.plasma.desktop-appletsrc" + ]; workspace = { clickItemTo = "select"; cursorTheme = "Breeze_Snow"; @@ -126,12 +132,6 @@ in { number = 2; }; }; - input = { - keyboard = { - layouts = ["es"]; - numlockOnStartup = "off"; - }; - }; panels = [ { location = "bottom";