From 9cbd262e142a5bdaa6330592c57eb5e4064ccd93 Mon Sep 17 00:00:00 2001 From: Toast Date: Tue, 12 Nov 2024 09:58:25 +0100 Subject: [PATCH 1/3] Kde/kwin: fix patch path --- roles/kde/programs/kwin.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/kde/programs/kwin.nix b/roles/kde/programs/kwin.nix index 0dfddbb..2d6a747 100644 --- a/roles/kde/programs/kwin.nix +++ b/roles/kde/programs/kwin.nix @@ -8,7 +8,7 @@ patches = kPrev.kwin.patches ++ [ - ./patches/kwin-pr6406.patch + ../patches/kwin-pr6406.patch ]; }; } From 84f5b7537be173737c36af6d3ae9d1bab4adebf8 Mon Sep 17 00:00:00 2001 From: Toast Date: Tue, 12 Nov 2024 10:50:23 +0100 Subject: [PATCH 2/3] Kde: add plasma-workspace patch --- .../kde/patches/plasma_workspace-pr4883.patch | 40 +++++++++++++++++++ roles/kde/plasma.nix | 5 +++ 2 files changed, 45 insertions(+) create mode 100644 roles/kde/patches/plasma_workspace-pr4883.patch diff --git a/roles/kde/patches/plasma_workspace-pr4883.patch b/roles/kde/patches/plasma_workspace-pr4883.patch new file mode 100644 index 0000000..7b575d0 --- /dev/null +++ b/roles/kde/patches/plasma_workspace-pr4883.patch @@ -0,0 +1,40 @@ +From 11e7f5306fa013ec5c2b894a28457dabf5c42bad Mon Sep 17 00:00:00 2001 +From: Nate Graham +Date: Wed, 30 Oct 2024 21:55:49 -0600 +Subject: [PATCH] Merge "Settings" menu category into "System" + +This category is a bit of an odd duck. On a default install, it contains +only one item: System Settings. Random other apps you install will also +appear there, but all of these could just as logically live in the +"System" category. Let's put them there, so as to consolidate two +nebulous overlapping categories into one clear and obvious one. +--- + menu/desktop/plasma-applications.menu | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/menu/desktop/plasma-applications.menu b/menu/desktop/plasma-applications.menu +index e153604252e..85f842d6a04 100644 +--- a/menu/desktop/plasma-applications.menu ++++ b/menu/desktop/plasma-applications.menu +@@ -334,17 +334,11 @@ + + + +- +- Settingsmenu +- kf5-settingsmenu.directory +- +- Settings +- +- + + System + kf5-system.directory + ++ Settings + + System + X-KDE-More +-- +GitLab + diff --git a/roles/kde/plasma.nix b/roles/kde/plasma.nix index ca29d2e..dd6b234 100644 --- a/roles/kde/plasma.nix +++ b/roles/kde/plasma.nix @@ -49,6 +49,11 @@ in { ./patches/libplasma-pr1214.patch ]; }; + plasma-workspace = kPrev.plasma-workspace.overrideAttrs { + patches = kPrev.plasma-workspace.patches ++ [ + ./patches/plasma_workspace-pr4883.patch + ]; + }; } ); } From e952cfa34f617c996c6a3c3e65bf0f5f0dfcafc7 Mon Sep 17 00:00:00 2001 From: Toast Date: Tue, 12 Nov 2024 11:01:00 +0100 Subject: [PATCH 3/3] Flake: update lock file --- flake.lock | 108 ++++++++++++++++++++++++++--------------------------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/flake.lock b/flake.lock index f8b45ad..b84b46e 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1730036420, - "narHash": "sha256-rv2bz7J6Wo7AenPiu4+ptCB1AFyaMcS77y89zbRAtI8=", + "lastModified": 1731232837, + "narHash": "sha256-0aIwr/RC/oe7rYkfJb47xjdEQDSNcqpFGsEa+EPlDEs=", "owner": "catppuccin", "repo": "nix", - "rev": "0b7bf04628414a402d255924f65e9a0d1a53d92b", + "rev": "32359bf226fe874d3b7a0a5753d291a4da9616fe", "type": "github" }, "original": { @@ -43,11 +43,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1725822842, - "narHash": "sha256-fOR805OwfINbMFzqSmE8piFAFHM9fE+BDdQQUahqDaQ=", + "lastModified": 1731107453, + "narHash": "sha256-U5+2/yP0NMFPHc8/HVz0pKApXvKHB+tNrnQcekGiauc=", "owner": "catppuccin", "repo": "vscode", - "rev": "54316f9afc31c3b5070a242cd3ca47d66ab0e9ac", + "rev": "bbb0b5a231a082790398613266e56268ae2e4de0", "type": "github" }, "original": { @@ -234,11 +234,11 @@ ] }, "locked": { - "lastModified": 1730450782, - "narHash": "sha256-0AfApF8aexgB6o34qqLW2cCX4LaWJajBVdU6ddiWZBM=", + "lastModified": 1731235328, + "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=", "owner": "nix-community", "repo": "home-manager", - "rev": "8ca921e5a806b5b6171add542defe7bdac79d189", + "rev": "60bb110917844d354f3c18e05450606a435d2d10", "type": "github" }, "original": { @@ -276,11 +276,11 @@ ] }, "locked": { - "lastModified": 1730441026, - "narHash": "sha256-xmZQFGeIm2TzXv4jGaQ3nfBoUbt4gKbIv/SHVWw93ag=", + "lastModified": 1731227601, + "narHash": "sha256-aGUQ6W/Oxd9xjH9RQbnUtC61sTK2fWlKr+J7kavT/RQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "bd1da5657b8903b293a0ff51eb896a91a544ebed", + "rev": "7691d0ac1deb6ac7482c5a22fe1a14a34ca608b0", "type": "github" }, "original": { @@ -292,11 +292,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1730610940, - "narHash": "sha256-ZsTpii4kZcioRF3bu3/pS374R9GYQVyrMpBNr2ZUnVg=", - "rev": "b1a0e3c0029c2dd5fb7c8dd2db4f9e0b309c9f54", + "lastModified": 1731334117, + "narHash": "sha256-GoddkPg0/UDv06KcQJiOYP/2IzruYorbI03QRCjN3K8=", + "rev": "8a9094303bc7873c979e54ea20b9f50464ee3965", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/b1a0e3c0029c2dd5fb7c8dd2db4f9e0b309c9f54.tar.gz?rev=b1a0e3c0029c2dd5fb7c8dd2db4f9e0b309c9f54" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/8a9094303bc7873c979e54ea20b9f50464ee3965.tar.gz?rev=8a9094303bc7873c979e54ea20b9f50464ee3965" }, "original": { "type": "tarball", @@ -315,11 +315,11 @@ ] }, "locked": { - "lastModified": 1727752861, - "narHash": "sha256-jowmo2aEzrEpPSM96IWtajuogdJm7DjAWxFTEb7Ct0s=", - "rev": "fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d", + "lastModified": 1731185731, + "narHash": "sha256-RNaIu43b9PoXEhW4OqXUNZKY/jezQyCYWwdv1M0VjsA=", + "rev": "691193879d96bdfd1e6ab5ebcca2fadc7604cf34", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d.tar.gz?rev=fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/691193879d96bdfd1e6ab5ebcca2fadc7604cf34.tar.gz?rev=691193879d96bdfd1e6ab5ebcca2fadc7604cf34" }, "original": { "type": "tarball", @@ -338,11 +338,11 @@ ] }, "locked": { - "lastModified": 1727752861, - "narHash": "sha256-jowmo2aEzrEpPSM96IWtajuogdJm7DjAWxFTEb7Ct0s=", - "rev": "fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d", + "lastModified": 1731185731, + "narHash": "sha256-RNaIu43b9PoXEhW4OqXUNZKY/jezQyCYWwdv1M0VjsA=", + "rev": "691193879d96bdfd1e6ab5ebcca2fadc7604cf34", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d.tar.gz?rev=fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/691193879d96bdfd1e6ab5ebcca2fadc7604cf34.tar.gz?rev=691193879d96bdfd1e6ab5ebcca2fadc7604cf34" }, "original": { "type": "tarball", @@ -389,11 +389,11 @@ }, "nix-impermanence": { "locked": { - "lastModified": 1730403150, - "narHash": "sha256-W1FH5aJ/GpRCOA7DXT/sJHFpa5r8sq2qAUncWwRZ3Gg=", + "lastModified": 1731242966, + "narHash": "sha256-B3C3JLbGw0FtLSWCjBxU961gLNv+BOOBC6WvstKLYMw=", "owner": "nix-community", "repo": "impermanence", - "rev": "0d09341beeaa2367bac5d718df1404bf2ce45e6f", + "rev": "3ed3f0eaae9fcc0a8331e77e9319c8a4abd8a71a", "type": "github" }, "original": { @@ -409,11 +409,11 @@ ] }, "locked": { - "lastModified": 1729999765, - "narHash": "sha256-LYsavZXitFjjyETZoij8usXjTa7fa9AIF3Sk3MJSX+Y=", + "lastModified": 1731209121, + "narHash": "sha256-BF7FBh1hIYPDihdUlImHGsQzaJZVLLfYqfDx41wjuF0=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "0e3a8778c2ee218eff8de6aacf3d2fa6c33b2d4f", + "rev": "896019f04b22ce5db4c0ee4f89978694f44345c3", "type": "github" }, "original": { @@ -429,11 +429,11 @@ ] }, "locked": { - "lastModified": 1729999765, - "narHash": "sha256-LYsavZXitFjjyETZoij8usXjTa7fa9AIF3Sk3MJSX+Y=", + "lastModified": 1731209121, + "narHash": "sha256-BF7FBh1hIYPDihdUlImHGsQzaJZVLLfYqfDx41wjuF0=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "0e3a8778c2ee218eff8de6aacf3d2fa6c33b2d4f", + "rev": "896019f04b22ce5db4c0ee4f89978694f44345c3", "type": "github" }, "original": { @@ -451,11 +451,11 @@ ] }, "locked": { - "lastModified": 1730426071, - "narHash": "sha256-2BkSiHqyWikpz9HSgTBk5kikaQ5m0Rs60C9KA2kf53o=", + "lastModified": 1731375802, + "narHash": "sha256-CvWPEzrl2EA3xrtg9X6K8aqV7T5r0SaDz6PLpGA0yIY=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "4b371c3d119493051d081ff5b6cff689a97ad1a1", + "rev": "b873a123366b9a62f9262414ada8d83b03f1f0bf", "type": "github" }, "original": { @@ -466,11 +466,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1730368399, - "narHash": "sha256-F8vJtG389i9fp3k2/UDYHMed3PLCJYfxCqwiVP7b9ig=", + "lastModified": 1731332224, + "narHash": "sha256-0ctfVp27ingWtY7dbP5+QpSQ98HaOZleU0teyHQUAw0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "da14839ac5f38ee6adbdb4e6db09b5eef6d6ccdc", + "rev": "184687ae1a3139faa4746168baf071f60d0310c8", "type": "github" }, "original": { @@ -498,11 +498,11 @@ }, "nixpkgs-raw": { "locked": { - "lastModified": 1730327045, - "narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=", + "lastModified": 1731239293, + "narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "080166c15633801df010977d9d7474b4a6c549d7", + "rev": "9256f7c71a195ebe7a218043d9f93390d49e6884", "type": "github" }, "original": { @@ -513,11 +513,11 @@ }, "nixpkgs-unstable-raw": { "locked": { - "lastModified": 1730200266, - "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", + "lastModified": 1731139594, + "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", + "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", "type": "github" }, "original": { @@ -528,11 +528,11 @@ }, "nur": { "locked": { - "lastModified": 1730455118, - "narHash": "sha256-E5yWeAUKohUot11JBfH7apOyPjqs3z2/fAtUc2LNfHw=", + "lastModified": 1731401176, + "narHash": "sha256-khh5dM0oofqK3wmoL3xD09DokRg8E2XpkeEoOK6ShBg=", "owner": "nix-community", "repo": "NUR", - "rev": "5bf603459b923edbee4955e9fc94b94662add85c", + "rev": "1f5438e9803717a9bbce8b54356e305b87f1fde5", "type": "github" }, "original": { @@ -551,11 +551,11 @@ ] }, "locked": { - "lastModified": 1730366788, - "narHash": "sha256-0Ezvv4KkyFdLAblPBFDgZbiMLlJZtpHruT2i4KC2wIY=", + "lastModified": 1731193165, + "narHash": "sha256-pGF8L5g9QpkQtJP9JmNIRNZfcyhJHf7uT+d8tqI1h6Y=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "f634d5f6ee9be365b2ca08b2d00e0e3b0c240b9e", + "rev": "f33173b9d22e554a6f869626bc01808d35995257", "type": "github" }, "original": { @@ -690,11 +690,11 @@ ] }, "locked": { - "lastModified": 1730426202, - "narHash": "sha256-swwKpE3lrdvcSh6Hjyf/eSe/zPnsZgeVlSl+B4yBpeo=", + "lastModified": 1731375910, + "narHash": "sha256-LSzQ2lj0Tt663NYNEo4R+Mh173zdi/FS0N5L9wYQv4w=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "96dcbddd24edc60ad47f41bb2a73e06099eba4af", + "rev": "db33a1df899d08e12160bc836d34d309d6ca372b", "type": "github" }, "original": {