From 0337f4f7a047f2278be2f8c7ce60c49c8b2a4320 Mon Sep 17 00:00:00 2001 From: Toast Date: Fri, 12 Apr 2024 00:11:25 +0200 Subject: [PATCH 1/5] Flake: temporarely change to my branch of plasma-manager --- flake.lock | 11 ++++++----- flake.nix | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 02e25cf..2046a49 100644 --- a/flake.lock +++ b/flake.lock @@ -339,15 +339,16 @@ ] }, "locked": { - "lastModified": 1712484920, - "narHash": "sha256-wNwv12U/QYYgZanycZ32A41cEDa2zPwYuMKK6AJYNJk=", - "owner": "pjones", + "lastModified": 1712872911, + "narHash": "sha256-gwYrKMXuUBf5acvTzH7+lXeBbBZYUUEgcLBugHXimuc=", + "owner": "toast003", "repo": "plasma-manager", - "rev": "4b127a5ede004f5c6d7c41938c2986b599dc0bf3", + "rev": "8a3ac8690d6f546ec9185e1f5ddbb1f76d63b6b1", "type": "github" }, "original": { - "owner": "pjones", + "owner": "toast003", + "ref": "libinput", "repo": "plasma-manager", "type": "github" } diff --git a/flake.nix b/flake.nix index 90defdb..a47a42f 100644 --- a/flake.nix +++ b/flake.nix @@ -51,7 +51,7 @@ }; plasma-manager = { - url = "github:pjones/plasma-manager"; + url = "github:toast003/plasma-manager/libinput"; inputs.nixpkgs.follows = "nixpkgs-unstable-raw"; inputs.home-manager.follows = "home-manager-unstable"; }; From 819b9bd218f02d9691e06f0aea5083d4a9f4fdfd Mon Sep 17 00:00:00 2001 From: Toast Date: Fri, 12 Apr 2024 00:40:19 +0200 Subject: [PATCH 2/5] Machines/WinMax2: apply home-manager tweaks to every user --- machines/WinMax2/configuration.nix | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/machines/WinMax2/configuration.nix b/machines/WinMax2/configuration.nix index 664adc3..b1bbbe5 100755 --- a/machines/WinMax2/configuration.nix +++ b/machines/WinMax2/configuration.nix @@ -110,19 +110,21 @@ environment.sessionVariables = { STEAM_FORCE_DESKTOPUI_SCALING = "2"; }; - home-manager.users.toast = { - # Steam's hidpi support is bugged so it needds to be hardcoded - # This bypasses that - xdg.desktopEntries = { - steam-noScaling = { - name = "Steam (No Scaling)"; - exec = "env STEAM_FORCE_DESKTOPUI_SCALING=0 steam %U"; - icon = "steam"; - categories = ["Network" "FileTransfer" "Game"]; - comment = "Application for managing and playing games on Steam"; + home-manager.sharedModules = [ + { + # Steam's hidpi support is bugged so it needds to be hardcoded + # This bypasses that + xdg.desktopEntries = { + steam-noScaling = { + name = "Steam (No Scaling)"; + exec = "env STEAM_FORCE_DESKTOPUI_SCALING=0 steam %U"; + icon = "steam"; + categories = ["Network" "FileTransfer" "Game"]; + comment = "Application for managing and playing games on Steam"; + }; }; - }; - }; + } + ]; # Enable sound. # sound.enable = true; From 26fde4688631ecd0406727ee62f9a03ae38fda64 Mon Sep 17 00:00:00 2001 From: Toast Date: Fri, 12 Apr 2024 00:58:09 +0200 Subject: [PATCH 3/5] Machines/WinMax2: set up keyboard layout for plasma --- machines/WinMax2/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/machines/WinMax2/configuration.nix b/machines/WinMax2/configuration.nix index b1bbbe5..f3a64c1 100755 --- a/machines/WinMax2/configuration.nix +++ b/machines/WinMax2/configuration.nix @@ -123,6 +123,7 @@ comment = "Application for managing and playing games on Steam"; }; }; + programs.plasma.input.keyboard.layouts = lib.mkForce [ "us" ]; } ]; From 7202d3a57f5d6b5389d8f18b790c3a3a867ba09e Mon Sep 17 00:00:00 2001 From: Toast Date: Fri, 12 Apr 2024 00:59:25 +0200 Subject: [PATCH 4/5] Kde/plasma: set up keyboard layout and numlock settings --- roles/kde/plasma.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/roles/kde/plasma.nix b/roles/kde/plasma.nix index 365dc9e..1a7ab52 100644 --- a/roles/kde/plasma.nix +++ b/roles/kde/plasma.nix @@ -126,6 +126,12 @@ in { right = ["minimize" "maximize" "close"]; }; }; + input = { + keyboard = { + layouts = ["es"]; + numlockOnStartup = "off"; + }; + }; panels = [ { location = "bottom"; From ea0d7caf4f16f2621a7c91333baafdf6d7189a0a Mon Sep 17 00:00:00 2001 From: Toast Date: Fri, 12 Apr 2024 01:16:31 +0200 Subject: [PATCH 5/5] Kde/plasma: configure virtual desktops with high level module --- roles/kde/plasma.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/kde/plasma.nix b/roles/kde/plasma.nix index 1a7ab52..b88ff52 100644 --- a/roles/kde/plasma.nix +++ b/roles/kde/plasma.nix @@ -125,6 +125,10 @@ in { left = ["on-all-desktops" "keep-above-windows"]; right = ["minimize" "maximize" "close"]; }; + virtualDesktops = { + rows = 1; + number = 2; + }; }; input = { keyboard = { @@ -162,10 +166,6 @@ in { configFile = { "kwinrc" = { "org.kde.kdecoration2"."BorderSize".value = "None"; - "Desktops" = { - "Number".value = 2; - "Rows".value = 1; - }; "TabBox"."LayoutName".value = "thumbnail_grid"; }; "kdeglobals"."General"."AccentColor".value = null;