[plasma-manager] Merge config from z790prors

flake.lock

@@ -52,10 +52,34 @@
         "type": "github"
       }
     },
+    "plasma-manager": {
+      "inputs": {
+        "home-manager": [
+          "home-manager"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1728750492,
+        "narHash": "sha256-9IHlIsH4gLqQjS2lFbEnsl/ItdqzBBLWLsyXS0k0jf8=",
+        "owner": "nix-community",
+        "repo": "plasma-manager",
+        "rev": "c6d4b6f3e0138c08f37d66fcfbcbe37dab08f108",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "plasma-manager",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
+        "plasma-manager": "plasma-manager",
         "sops-nix": "sops-nix"
       }
     },

flake.nix

@@ -13,6 +13,12 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    plasma-manager = {
+      url = "github:nix-community/plasma-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.home-manager.follows = "home-manager";
+    };
   };
 
   outputs = { self, nixpkgs, ... } @ inputs: let
@@ -23,6 +29,7 @@
       {
         home-manager.useGlobalPkgs = true;
         home-manager.useUserPackages = true;
+        home-manager.sharedModules = [ inputs.plasma-manager.homeManagerModules.plasma-manager ];
       }
     ];
   in {
@@ -55,13 +62,12 @@
       system = "x86_64-linux";
       modules = baseModules ++ [
         ./machines/boxy/configuration.nix
-        # inputs.home-manager.nixosModules.home-manager
+        inputs.home-manager.nixosModules.home-manager
-        # {
+        {
-        #   home-manager.users.johno = import ./home/home-default.nix;
+          home-manager.users.johno = import ./home/home-default.nix;
-        #   home-manager.extraSpecialArgs.customPkgs =
+          home-manager.extraSpecialArgs.customPkgs =
-        #     nixpkgs.legacyPackages."${system}".callPackage ./packages {};
+            nixpkgs.legacyPackages."${system}".callPackage ./packages {};
-        #     customPkgs = nixpkgs.legacyPackages."${system}".callPackage ./packages {};
+        }
-        # }
       ];
     };
   };

home/home-default.nix

@@ -104,8 +104,9 @@
 
   imports = [
     ./modules/emacs
-    ./modules/lutris
     ./modules/i3+sway
+    ./modules/lutris
+    ./modules/plasma-manager
   ];
 
   programs.bash.enable = true;

home/modules/i3+sway/default.nix

@@ -6,13 +6,13 @@ let
   cfg = config.home.i3_sway;
   i3_cfg = config.xsession.windowManager.i3.config;
 
-  shared_config = recursiveUpdate {
+  shared_config = recursiveUpdate rec {
     modifier = "Mod4";
     terminal = "kitty";
     defaultWorkspace = "workspace number 1";
 
     keybindings = {
-      "${shared_config.modifier}+Return" = "exec ${i3_cfg.terminal}";
+      "${shared_config.modifier}+Return" = "exec ${terminal}";
       "${shared_config.modifier}+Shift+q" = "kill";
       "${shared_config.modifier}+d" = "exec ${i3_cfg.menu}";
 
@@ -129,6 +129,13 @@ in {
           "type:keyboard" = {
             xkb_options = "caps:escape";
           };
+          "type:touchpad" = {
+            tap = "enabled";
+            tap_button_map = "lrm";
+            drag = "enabled";
+            natural_scroll = "disabled";
+            dwt = "enabled";
+          };
         };
       };
     in {

home/modules/plasma-manager/default.nix

@@ -0,0 +1,451 @@
+{ config, lib, pkgs, ... }:
+
+
+# The following can be generated with the command:
+# nix run github:nix-community/plasma-manager
+#
+# Plasma-manager options documentation
+# https://nix-community.github.io/plasma-manager/options.xhtml
+#
+# Polonium usage
+# https://github.com/zeroxoneafour/polonium/blob/master/docs/usage.md
+#
+# TODO: Extract this configuration into something that's a bit easier to manage
+# TODO: Update shortcuts for better window/tiling/desktop management akin to i3wm
+# TODO(ambitious): Add Kmail support to plasma-manager
+{
+  programs.plasma = {
+    enable = true;
+    shortcuts = {
+      "KDE Keyboard Layout Switcher"."Switch to Last-Used Keyboard Layout" = "Meta+Alt+L";
+      "KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "Meta+Alt+K";
+      "kaccess"."Toggle Screen Reader On and Off" = "Meta+Alt+S";
+      "kcm_touchpad"."Disable Touchpad" = "Touchpad Off";
+      "kcm_touchpad"."Enable Touchpad" = "Touchpad On";
+      "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku,Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku,Toggle Touchpad"];
+      "kmix"."decrease_microphone_volume" = "Microphone Volume Down";
+      "kmix"."decrease_volume" = "Volume Down";
+      "kmix"."decrease_volume_small" = "Shift+Volume Down";
+      "kmix"."increase_microphone_volume" = "Microphone Volume Up";
+      "kmix"."increase_volume" = "Volume Up";
+      "kmix"."increase_volume_small" = "Shift+Volume Up";
+      "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute,Microphone Mute" "Meta+Volume Mute,Mute Microphone"];
+      "kmix"."mute" = "Volume Mute";
+      "ksmserver"."Halt Without Confirmation" = "none,,Shut Down Without Confirmation";
+      "ksmserver"."Lock Session" = ["Meta+L" "Screensaver,Meta+L" "Screensaver,Lock Session"];
+      "ksmserver"."Log Out" = "Ctrl+Alt+Del";
+      "ksmserver"."Log Out Without Confirmation" = "none,,Log Out Without Confirmation";
+      "ksmserver"."LogOut" = "none,,Log Out";
+      "ksmserver"."Reboot" = "none,,Reboot";
+      "ksmserver"."Reboot Without Confirmation" = "none,,Reboot Without Confirmation";
+      "ksmserver"."Shut Down" = "none,,Shut Down";
+      "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A";
+      "kwin"."Cycle Overview" = [ ];
+      "kwin"."Cycle Overview Opposite" = [ ];
+      "kwin"."Decrease Opacity" = "none,,Decrease Opacity of Active Window by 5%";
+      "kwin"."Edit Tiles" = "Meta+T";
+      "kwin"."Expose" = "Ctrl+F9";
+      "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C),Ctrl+F10" "Launch (C),Toggle Present Windows (All desktops)"];
+      "kwin"."ExposeClass" = "Ctrl+F7";
+      "kwin"."ExposeClassCurrentDesktop" = [ ];
+      "kwin"."Grid View" = "Meta+G";
+      "kwin"."Increase Opacity" = "none,,Increase Opacity of Active Window by 5%";
+      "kwin"."Kill Window" = "Meta+Ctrl+Esc";
+      "kwin"."Move Tablet to Next Output" = [ ];
+      "kwin"."MoveMouseToCenter" = "Meta+F6";
+      "kwin"."MoveMouseToFocus" = "Meta+F5";
+      "kwin"."MoveZoomDown" = [ ];
+      "kwin"."MoveZoomLeft" = [ ];
+      "kwin"."MoveZoomRight" = [ ];
+      "kwin"."MoveZoomUp" = [ ];
+      "kwin"."Overview" = "Meta+W";
+      "kwin"."PoloniumCycleEngine" = "Meta+|,none,Polonium: Cycle Engine";
+      "kwin"."PoloniumFocusAbove" = "Meta+K,none,Polonium: Focus Above";
+      "kwin"."PoloniumFocusBelow" = "Meta+J,none,Polonium: Focus Below";
+      "kwin"."PoloniumFocusLeft" = "Meta+H,none,Polonium: Focus Left";
+      "kwin"."PoloniumFocusRight" = "Meta+L,none,Polonium: Focus Right";
+      "kwin"."PoloniumInsertAbove" = "Meta+Shift+K,none,Polonium: Insert Above";
+      "kwin"."PoloniumInsertBelow" = "Meta+Shift+J,none,Polonium: Insert Below";
+      "kwin"."PoloniumInsertLeft" = "Meta+Shift+H,none,Polonium: Insert Left";
+      "kwin"."PoloniumInsertRight" = "Meta+Shift+L,none,Polonium: Insert Right";
+      "kwin"."PoloniumOpenSettings" = "Meta+\\\\,none,Polonium: Open Settings Dialog";
+      "kwin"."PoloniumResizeAbove" = "Meta+Ctrl+K,none,Polonium: Resize Above";
+      "kwin"."PoloniumResizeBelow" = "Meta+Ctrl+J,none,Polonium: Resize Below";
+      "kwin"."PoloniumResizeLeft" = "Meta+Ctrl+H,none,Polonium: Resize Left";
+      "kwin"."PoloniumResizeRight" = "Meta+Ctrl+L,none,Polonium: Resize Right";
+      "kwin"."PoloniumRetileWindow" = "Meta+Shift+Space,none,Polonium: Retile Window";
+      "kwin"."PoloniumSwitchBTree" = [ ];
+      "kwin"."PoloniumSwitchHalf" = [ ];
+      "kwin"."PoloniumSwitchKwin" = [ ];
+      "kwin"."PoloniumSwitchMonocle" = [ ];
+      "kwin"."PoloniumSwitchThreeColumn" = [ ];
+      "kwin"."Setup Window Shortcut" = "none,,Setup Window Shortcut";
+      "kwin"."Show Desktop" = "Meta+D";
+      "kwin"."Suspend Compositing" = "Alt+Shift+F12";
+      "kwin"."Switch One Desktop Down" = "Meta+Ctrl+Down";
+      "kwin"."Switch One Desktop Up" = "Meta+Ctrl+Up";
+      "kwin"."Switch One Desktop to the Left" = "Meta+Ctrl+Left";
+      "kwin"."Switch One Desktop to the Right" = "Meta+Ctrl+Right";
+      "kwin"."Switch Window Down" = "Meta+Alt+Down";
+      "kwin"."Switch Window Left" = "Meta+Alt+Left";
+      "kwin"."Switch Window Right" = "Meta+Alt+Right";
+      "kwin"."Switch Window Up" = "Meta+Alt+Up";
+      "kwin"."Switch to Desktop 1" = "Meta+1,Ctrl+F1,Switch to Desktop 1";
+      "kwin"."Switch to Desktop 10" = "none,,Switch to Desktop 10";
+      "kwin"."Switch to Desktop 11" = "none,,Switch to Desktop 11";
+      "kwin"."Switch to Desktop 12" = "none,,Switch to Desktop 12";
+      "kwin"."Switch to Desktop 13" = "none,,Switch to Desktop 13";
+      "kwin"."Switch to Desktop 14" = "none,,Switch to Desktop 14";
+      "kwin"."Switch to Desktop 15" = "none,,Switch to Desktop 15";
+      "kwin"."Switch to Desktop 16" = "none,,Switch to Desktop 16";
+      "kwin"."Switch to Desktop 17" = "none,,Switch to Desktop 17";
+      "kwin"."Switch to Desktop 18" = "none,,Switch to Desktop 18";
+      "kwin"."Switch to Desktop 19" = "none,,Switch to Desktop 19";
+      "kwin"."Switch to Desktop 2" = "Meta+2,Ctrl+F2,Switch to Desktop 2";
+      "kwin"."Switch to Desktop 20" = "none,,Switch to Desktop 20";
+      "kwin"."Switch to Desktop 3" = "Meta+3,Ctrl+F3,Switch to Desktop 3";
+      "kwin"."Switch to Desktop 4" = "Meta+4,Ctrl+F4,Switch to Desktop 4";
+      "kwin"."Switch to Desktop 5" = "Meta+5,,Switch to Desktop 5";
+      "kwin"."Switch to Desktop 6" = "none,,Switch to Desktop 6";
+      "kwin"."Switch to Desktop 7" = "none,,Switch to Desktop 7";
+      "kwin"."Switch to Desktop 8" = "none,,Switch to Desktop 8";
+      "kwin"."Switch to Desktop 9" = "none,,Switch to Desktop 9";
+      "kwin"."Switch to Next Desktop" = "none,,Switch to Next Desktop";
+      "kwin"."Switch to Next Screen" = "none,,Switch to Next Screen";
+      "kwin"."Switch to Previous Desktop" = "none,,Switch to Previous Desktop";
+      "kwin"."Switch to Previous Screen" = "none,,Switch to Previous Screen";
+      "kwin"."Switch to Screen 0" = "none,,Switch to Screen 0";
+      "kwin"."Switch to Screen 1" = "none,,Switch to Screen 1";
+      "kwin"."Switch to Screen 2" = "none,,Switch to Screen 2";
+      "kwin"."Switch to Screen 3" = "none,,Switch to Screen 3";
+      "kwin"."Switch to Screen 4" = "none,,Switch to Screen 4";
+      "kwin"."Switch to Screen 5" = "none,,Switch to Screen 5";
+      "kwin"."Switch to Screen 6" = "none,,Switch to Screen 6";
+      "kwin"."Switch to Screen 7" = "none,,Switch to Screen 7";
+      "kwin"."Switch to Screen Above" = "none,,Switch to Screen Above";
+      "kwin"."Switch to Screen Below" = "none,,Switch to Screen Below";
+      "kwin"."Switch to Screen to the Left" = "none,,Switch to Screen to the Left";
+      "kwin"."Switch to Screen to the Right" = "none,,Switch to Screen to the Right";
+      "kwin"."Toggle Night Color" = [ ];
+      "kwin"."Toggle Window Raise/Lower" = "none,,Toggle Window Raise/Lower";
+      "kwin"."Walk Through Windows" = "Alt+Tab";
+      "kwin"."Walk Through Windows (Reverse)" = "Alt+Shift+Tab";
+      "kwin"."Walk Through Windows Alternative" = "none,,Walk Through Windows Alternative";
+      "kwin"."Walk Through Windows Alternative (Reverse)" = "none,,Walk Through Windows Alternative (Reverse)";
+      "kwin"."Walk Through Windows of Current Application" = "Alt+`";
+      "kwin"."Walk Through Windows of Current Application (Reverse)" = "Alt+~";
+      "kwin"."Walk Through Windows of Current Application Alternative" = "none,,Walk Through Windows of Current Application Alternative";
+      "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = "none,,Walk Through Windows of Current Application Alternative (Reverse)";
+      "kwin"."Window Above Other Windows" = "none,,Keep Window Above Others";
+      "kwin"."Window Below Other Windows" = "none,,Keep Window Below Others";
+      "kwin"."Window Close" = "Alt+F4";
+      "kwin"."Window Fullscreen" = "none,,Make Window Fullscreen";
+      "kwin"."Window Grow Horizontal" = "none,,Expand Window Horizontally";
+      "kwin"."Window Grow Vertical" = "none,,Expand Window Vertically";
+      "kwin"."Window Lower" = "none,,Lower Window";
+      "kwin"."Window Maximize" = "Meta+PgUp";
+      "kwin"."Window Maximize Horizontal" = "none,,Maximize Window Horizontally";
+      "kwin"."Window Maximize Vertical" = "none,,Maximize Window Vertically";
+      "kwin"."Window Minimize" = "Meta+PgDown";
+      "kwin"."Window Move" = "none,,Move Window";
+      "kwin"."Window Move Center" = "none,,Move Window to the Center";
+      "kwin"."Window No Border" = "none,,Toggle Window Titlebar and Frame";
+      "kwin"."Window On All Desktops" = "none,,Keep Window on All Desktops";
+      "kwin"."Window One Desktop Down" = "Meta+Ctrl+Shift+Down";
+      "kwin"."Window One Desktop Up" = "Meta+Ctrl+Shift+Up";
+      "kwin"."Window One Desktop to the Left" = "Meta+Ctrl+Shift+Left";
+      "kwin"."Window One Desktop to the Right" = "Meta+Ctrl+Shift+Right";
+      "kwin"."Window One Screen Down" = "none,,Move Window One Screen Down";
+      "kwin"."Window One Screen Up" = "none,,Move Window One Screen Up";
+      "kwin"."Window One Screen to the Left" = "none,,Move Window One Screen to the Left";
+      "kwin"."Window One Screen to the Right" = "none,,Move Window One Screen to the Right";
+      "kwin"."Window Operations Menu" = "Alt+F3";
+      "kwin"."Window Pack Down" = "none,,Move Window Down";
+      "kwin"."Window Pack Left" = "none,,Move Window Left";
+      "kwin"."Window Pack Right" = "none,,Move Window Right";
+      "kwin"."Window Pack Up" = "none,,Move Window Up";
+      "kwin"."Window Quick Tile Bottom" = "Meta+Down";
+      "kwin"."Window Quick Tile Bottom Left" = "none,,Quick Tile Window to the Bottom Left";
+      "kwin"."Window Quick Tile Bottom Right" = "none,,Quick Tile Window to the Bottom Right";
+      "kwin"."Window Quick Tile Left" = "Meta+Left";
+      "kwin"."Window Quick Tile Right" = "Meta+Right";
+      "kwin"."Window Quick Tile Top" = "Meta+Up";
+      "kwin"."Window Quick Tile Top Left" = "none,,Quick Tile Window to the Top Left";
+      "kwin"."Window Quick Tile Top Right" = "none,,Quick Tile Window to the Top Right";
+      "kwin"."Window Raise" = "none,,Raise Window";
+      "kwin"."Window Resize" = "none,,Resize Window";
+      "kwin"."Window Shade" = "none,,Shade Window";
+      "kwin"."Window Shrink Horizontal" = "none,,Shrink Window Horizontally";
+      "kwin"."Window Shrink Vertical" = "none,,Shrink Window Vertically";
+      "kwin"."Window to Desktop 1" = "Meta+!,,Window to Desktop 1";
+      "kwin"."Window to Desktop 10" = "none,,Window to Desktop 10";
+      "kwin"."Window to Desktop 11" = "none,,Window to Desktop 11";
+      "kwin"."Window to Desktop 12" = "none,,Window to Desktop 12";
+      "kwin"."Window to Desktop 13" = "none,,Window to Desktop 13";
+      "kwin"."Window to Desktop 14" = "none,,Window to Desktop 14";
+      "kwin"."Window to Desktop 15" = "none,,Window to Desktop 15";
+      "kwin"."Window to Desktop 16" = "none,,Window to Desktop 16";
+      "kwin"."Window to Desktop 17" = "none,,Window to Desktop 17";
+      "kwin"."Window to Desktop 18" = "none,,Window to Desktop 18";
+      "kwin"."Window to Desktop 19" = "none,,Window to Desktop 19";
+      "kwin"."Window to Desktop 2" = "Meta+@,,Window to Desktop 2";
+      "kwin"."Window to Desktop 20" = "none,,Window to Desktop 20";
+      "kwin"."Window to Desktop 3" = "Meta+#,,Window to Desktop 3";
+      "kwin"."Window to Desktop 4" = "Meta+$,,Window to Desktop 4";
+      "kwin"."Window to Desktop 5" = "Meta+%,,Window to Desktop 5";
+      "kwin"."Window to Desktop 6" = "none,,Window to Desktop 6";
+      "kwin"."Window to Desktop 7" = "none,,Window to Desktop 7";
+      "kwin"."Window to Desktop 8" = "none,,Window to Desktop 8";
+      "kwin"."Window to Desktop 9" = "none,,Window to Desktop 9";
+      "kwin"."Window to Next Desktop" = "none,,Window to Next Desktop";
+      "kwin"."Window to Next Screen" = "Meta+Shift+Right";
+      "kwin"."Window to Previous Desktop" = "none,,Window to Previous Desktop";
+      "kwin"."Window to Previous Screen" = "Meta+Shift+Left";
+      "kwin"."Window to Screen 0" = "none,,Move Window to Screen 0";
+      "kwin"."Window to Screen 1" = "none,,Move Window to Screen 1";
+      "kwin"."Window to Screen 2" = "none,,Move Window to Screen 2";
+      "kwin"."Window to Screen 3" = "none,,Move Window to Screen 3";
+      "kwin"."Window to Screen 4" = "none,,Move Window to Screen 4";
+      "kwin"."Window to Screen 5" = "none,,Move Window to Screen 5";
+      "kwin"."Window to Screen 6" = "none,,Move Window to Screen 6";
+      "kwin"."Window to Screen 7" = "none,,Move Window to Screen 7";
+      "kwin"."view_actual_size" = "Meta+0";
+      "kwin"."view_zoom_in" = ["Meta++" "Meta+=,Meta++" "Meta+=,Zoom In"];
+      "kwin"."view_zoom_out" = "Meta+-";
+      "mediacontrol"."mediavolumedown" = "none,,Media volume down";
+      "mediacontrol"."mediavolumeup" = "none,,Media volume up";
+      "mediacontrol"."nextmedia" = "Media Next";
+      "mediacontrol"."pausemedia" = "Media Pause";
+      "mediacontrol"."playmedia" = "none,,Play media playback";
+      "mediacontrol"."playpausemedia" = "Media Play";
+      "mediacontrol"."previousmedia" = "Media Previous";
+      "mediacontrol"."stopmedia" = "Media Stop";
+      "org_kde_powerdevil"."Decrease Keyboard Brightness" = "Keyboard Brightness Down";
+      "org_kde_powerdevil"."Decrease Screen Brightness" = "Monitor Brightness Down";
+      "org_kde_powerdevil"."Decrease Screen Brightness Small" = "Shift+Monitor Brightness Down";
+      "org_kde_powerdevil"."Hibernate" = "Hibernate";
+      "org_kde_powerdevil"."Increase Keyboard Brightness" = "Keyboard Brightness Up";
+      "org_kde_powerdevil"."Increase Screen Brightness" = "Monitor Brightness Up";
+      "org_kde_powerdevil"."Increase Screen Brightness Small" = "Shift+Monitor Brightness Up";
+      "org_kde_powerdevil"."PowerDown" = "Power Down";
+      "org_kde_powerdevil"."PowerOff" = "Power Off";
+      "org_kde_powerdevil"."Sleep" = "Sleep";
+      "org_kde_powerdevil"."Toggle Keyboard Backlight" = "Keyboard Light On/Off";
+      "org_kde_powerdevil"."Turn Off Screen" = [ ];
+      "org_kde_powerdevil"."powerProfile" = ["Battery" "Meta+B,Battery" "Meta+B,Switch Power Profile"];
+      "plasmashell"."activate application launcher" = ["Meta" "Alt+F1,Meta" "Alt+F1,Activate Application Launcher"];
+      "plasmashell"."activate task manager entry 1" = "none,Meta+1,Activate Task Manager Entry 1";
+      "plasmashell"."activate task manager entry 10" = "none,Meta+0,Activate Task Manager Entry 10";
+      "plasmashell"."activate task manager entry 2" = "none,Meta+2,Activate Task Manager Entry 2";
+      "plasmashell"."activate task manager entry 3" = "none,Meta+3,Activate Task Manager Entry 3";
+      "plasmashell"."activate task manager entry 4" = "none,Meta+4,Activate Task Manager Entry 4";
+      "plasmashell"."activate task manager entry 5" = "none,Meta+5,Activate Task Manager Entry 5";
+      "plasmashell"."activate task manager entry 6" = "Meta+6";
+      "plasmashell"."activate task manager entry 7" = "Meta+7";
+      "plasmashell"."activate task manager entry 8" = "Meta+8";
+      "plasmashell"."activate task manager entry 9" = "Meta+9";
+      "plasmashell"."clear-history" = "none,,Clear Clipboard History";
+      "plasmashell"."clipboard_action" = "Meta+Ctrl+X";
+      "plasmashell"."cycle-panels" = "Meta+Alt+P";
+      "plasmashell"."cycleNextAction" = "none,,Next History Item";
+      "plasmashell"."cyclePrevAction" = "none,,Previous History Item";
+      "plasmashell"."manage activities" = "Meta+Q";
+      "plasmashell"."next activity" = "Meta+A,none,Walk through activities";
+      "plasmashell"."previous activity" = "Meta+Shift+A,none,Walk through activities (Reverse)";
+      "plasmashell"."repeat_action" = "none,Meta+Ctrl+R,Manually Invoke Action on Current Clipboard";
+      "plasmashell"."show dashboard" = "Ctrl+F12";
+      "plasmashell"."show-barcode" = "none,,Show Barcode…";
+      "plasmashell"."show-on-mouse-pos" = "Meta+V";
+      "plasmashell"."stop current activity" = "Meta+S";
+      "plasmashell"."switch to next activity" = "none,,Switch to Next Activity";
+      "plasmashell"."switch to previous activity" = "none,,Switch to Previous Activity";
+      "plasmashell"."toggle do not disturb" = "none,,Toggle do not disturb";
+    };
+    configFile = {
+      "baloofilerc"."General"."dbVersion" = 2;
+      "baloofilerc"."General"."exclude filters" = "*~,*.part,*.o,*.la,*.lo,*.loT,*.moc,moc_*.cpp,qrc_*.cpp,ui_*.h,cmake_install.cmake,CMakeCache.txt,CTestTestfile.cmake,libtool,config.status,confdefs.h,autom4te,conftest,confstat,Makefile.am,*.gcode,.ninja_deps,.ninja_log,build.ninja,*.csproj,*.m4,*.rej,*.gmo,*.pc,*.omf,*.aux,*.tmp,*.po,*.vm*,*.nvram,*.rcore,*.swp,*.swap,lzo,litmain.sh,*.orig,.histfile.*,.xsession-errors*,*.map,*.so,*.a,*.db,*.qrc,*.ini,*.init,*.img,*.vdi,*.vbox*,vbox.log,*.qcow2,*.vmdk,*.vhd,*.vhdx,*.sql,*.sql.gz,*.ytdl,*.tfstate*,*.class,*.pyc,*.pyo,*.elc,*.qmlc,*.jsc,*.fastq,*.fq,*.gb,*.fasta,*.fna,*.gbff,*.faa,po,CVS,.svn,.git,_darcs,.bzr,.hg,CMakeFiles,CMakeTmp,CMakeTmpQmake,.moc,.obj,.pch,.uic,.npm,.yarn,.yarn-cache,__pycache__,node_modules,node_packages,nbproject,.terraform,.venv,venv,core-dumps,lost+found";
+      "baloofilerc"."General"."exclude filters version" = 9;
+      "dolphinrc"."KFileDialog Settings"."Places Icons Auto-resize" = false;
+      "dolphinrc"."KFileDialog Settings"."Places Icons Static Size" = 22;
+      "katerc"."General"."Days Meta Infos" = 30;
+      "katerc"."General"."Save Meta Infos" = true;
+      "katerc"."General"."Show Full Path in Title" = false;
+      "katerc"."General"."Show Menu Bar" = true;
+      "katerc"."General"."Show Status Bar" = true;
+      "katerc"."General"."Show Tab Bar" = true;
+      "katerc"."General"."Show Url Nav Bar" = true;
+      "katerc"."KTextEditor Renderer"."Animate Bracket Matching" = false;
+      "katerc"."KTextEditor Renderer"."Auto Color Theme Selection" = true;
+      "katerc"."KTextEditor Renderer"."Color Theme" = "Breeze Light";
+      "katerc"."KTextEditor Renderer"."Line Height Multiplier" = 1;
+      "katerc"."KTextEditor Renderer"."Show Indentation Lines" = false;
+      "katerc"."KTextEditor Renderer"."Show Whole Bracket Expression" = false;
+      "katerc"."KTextEditor Renderer"."Text Font" = "Hack,10,-1,7,400,0,0,0,0,0,0,0,0,0,0,1";
+      "katerc"."KTextEditor Renderer"."Word Wrap Marker" = false;
+      "katerc"."filetree"."editShade" = "183,220,246";
+      "katerc"."filetree"."listMode" = false;
+      "katerc"."filetree"."middleClickToClose" = false;
+      "katerc"."filetree"."shadingEnabled" = true;
+      "katerc"."filetree"."showCloseButton" = false;
+      "katerc"."filetree"."showFullPathOnRoots" = false;
+      "katerc"."filetree"."showToolbar" = true;
+      "katerc"."filetree"."sortRole" = 0;
+      "katerc"."filetree"."viewShade" = "211,190,222";
+      "kcminputrc"."Mouse"."X11LibInputXAccelProfileFlat" = true;
+      "kded5rc"."Module-browserintegrationreminder"."autoload" = false;
+      "kded5rc"."Module-device_automounter"."autoload" = false;
+      "kdeglobals"."KFileDialog Settings"."Allow Expansion" = false;
+      "kdeglobals"."KFileDialog Settings"."Automatically select filename extension" = true;
+      "kdeglobals"."KFileDialog Settings"."Breadcrumb Navigation" = true;
+      "kdeglobals"."KFileDialog Settings"."Decoration position" = 2;
+      "kdeglobals"."KFileDialog Settings"."LocationCombo Completionmode" = 5;
+      "kdeglobals"."KFileDialog Settings"."PathCombo Completionmode" = 5;
+      "kdeglobals"."KFileDialog Settings"."Show Bookmarks" = false;
+      "kdeglobals"."KFileDialog Settings"."Show Full Path" = false;
+      "kdeglobals"."KFileDialog Settings"."Show Inline Previews" = true;
+      "kdeglobals"."KFileDialog Settings"."Show Preview" = false;
+      "kdeglobals"."KFileDialog Settings"."Show Speedbar" = true;
+      "kdeglobals"."KFileDialog Settings"."Show hidden files" = false;
+      "kdeglobals"."KFileDialog Settings"."Sort by" = "Name";
+      "kdeglobals"."KFileDialog Settings"."Sort directories first" = true;
+      "kdeglobals"."KFileDialog Settings"."Sort hidden files last" = false;
+      "kdeglobals"."KFileDialog Settings"."Sort reversed" = false;
+      "kdeglobals"."KFileDialog Settings"."Speedbar Width" = 131;
+      "kdeglobals"."KFileDialog Settings"."View Style" = "DetailTree";
+      "kdeglobals"."WM"."activeBackground" = "227,229,231";
+      "kdeglobals"."WM"."activeBlend" = "227,229,231";
+      "kdeglobals"."WM"."activeForeground" = "35,38,41";
+      "kdeglobals"."WM"."inactiveBackground" = "239,240,241";
+      "kdeglobals"."WM"."inactiveBlend" = "239,240,241";
+      "kdeglobals"."WM"."inactiveForeground" = "112,125,138";
+      "kiorc"."Confirmations"."ConfirmDelete" = true;
+      "kscreenlockerrc"."Daemon"."LockOnResume" = false;
+      "kwalletrc"."Wallet"."First Use" = false;
+      "kwinrc"."Desktops"."Id_1" = "48e67529-9a58-4caa-bc27-a02ddf746389";
+      "kwinrc"."Desktops"."Id_2" = "da76cc12-2e22-4fb4-87aa-3c17d7be63b0";
+      "kwinrc"."Desktops"."Id_3" = "a6cb23ae-3d6a-4609-b593-d956f16f125c";
+      "kwinrc"."Desktops"."Id_4" = "6e61e508-b5f1-4053-a9d3-34b80a155a10";
+      "kwinrc"."Desktops"."Number" = 4;
+      "kwinrc"."Desktops"."Rows" = 1;
+      "kwinrc"."Plugins"."poloniumEnabled" = true;
+      "kwinrc"."Tiling"."padding" = 4;
+      "kwinrc"."Xwayland"."Scale" = 1.25;
+      "plasma-localerc"."Formats"."LANG" = "en_US.UTF-8";
+      "plasmarc"."Wallpapers"."usersWallpapers" = "";
+      "spectaclerc"."ImageSave"."translatedScreenshotsFolder" = "Screenshots";
+      "spectaclerc"."VideoSave"."translatedScreencastsFolder" = "Screencasts";
+    };
+    dataFile = {
+      "kate/anonymous.katesession"."Kate Plugins"."cmaketoolsplugin" = false;
+      "kate/anonymous.katesession"."Kate Plugins"."compilerexplorer" = false;
+      "kate/anonymous.katesession"."Kate Plugins"."eslintplugin" = false;
+      "kate/anonymous.katesession"."Kate Plugins"."externaltoolsplugin" = true;
+      "kate/anonymous.katesession"."Kate Plugins"."formatplugin" = false;
+      "kate/anonymous.katesession"."Kate Plugins"."katebacktracebrowserplugin" = false;
+      "kate/anonymous.katesession"."Kate Plugins"."katebuildplugin" = false;
+      "kate/anonymous.katesession"."Kate Plugins"."katecloseexceptplugin" = false;
+      "kate/anonymous.katesession"."Kate Plugins"."katecolorpickerplugin" = false;
+      "kate/anonymous.katesession"."Kate Plugins"."katectagsplugin" = false;
+      "kate/anonymous.katesession"."Kate Plugins"."katefilebrowserplugin" = false;
+      "kate/anonymous.katesession"."Kate Plugins"."katefiletreeplugin" = true;
+      "kate/anonymous.katesession"."Kate Plugins"."kategdbplugin" = false;
+      "kate/anonymous.katesession"."Kate Plugins"."kategitblameplugin" = false;
+      "kate/anonymous.katesession"."Kate Plugins"."katekonsoleplugin" = true;
+      "kate/anonymous.katesession"."Kate Plugins"."kateprojectplugin" = true;
+      "kate/anonymous.katesession"."Kate Plugins"."katereplicodeplugin" = false;
+      "kate/anonymous.katesession"."Kate Plugins"."katesearchplugin" = true;
+      "kate/anonymous.katesession"."Kate Plugins"."katesnippetsplugin" = false;
+      "kate/anonymous.katesession"."Kate Plugins"."katesymbolviewerplugin" = false;
+      "kate/anonymous.katesession"."Kate Plugins"."katexmlcheckplugin" = false;
+      "kate/anonymous.katesession"."Kate Plugins"."katexmltoolsplugin" = false;
+      "kate/anonymous.katesession"."Kate Plugins"."keyboardmacrosplugin" = false;
+      "kate/anonymous.katesession"."Kate Plugins"."ktexteditorpreviewplugin" = false;
+      "kate/anonymous.katesession"."Kate Plugins"."latexcompletionplugin" = false;
+      "kate/anonymous.katesession"."Kate Plugins"."lspclientplugin" = true;
+      "kate/anonymous.katesession"."Kate Plugins"."openlinkplugin" = false;
+      "kate/anonymous.katesession"."Kate Plugins"."rainbowparens" = false;
+      "kate/anonymous.katesession"."Kate Plugins"."rbqlplugin" = false;
+      "kate/anonymous.katesession"."Kate Plugins"."tabswitcherplugin" = true;
+      "kate/anonymous.katesession"."Kate Plugins"."textfilterplugin" = true;
+      "kate/anonymous.katesession"."MainWindow0"."Active ViewSpace" = 0;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-H-Splitter" = "0,594,0";
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-Bar-0-TvList" = "kate_private_plugin_katefiletreeplugin,kateproject,kateprojectgit,lspclient_symbol_outline";
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-LastSize" = 200;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-SectSizes" = 0;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-0-Splitter" = 371;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-Bar-0-TvList" = "";
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-LastSize" = 200;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-SectSizes" = 0;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-1-Splitter" = 371;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-Bar-0-TvList" = "";
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-LastSize" = 200;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-SectSizes" = 0;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-2-Splitter" = 594;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-Bar-0-TvList" = "output,diagnostics,kate_plugin_katesearch,kateprojectinfo,kate_private_plugin_katekonsoleplugin";
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-LastSize" = 200;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-SectSizes" = 0;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-3-Splitter" = 209;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-Style" = 2;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-Sidebar-Visible" = true;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-diagnostics-Position" = 3;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-diagnostics-Show-Button-In-Sidebar" = true;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-diagnostics-Visible" = false;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_plugin_katesearch-Position" = 3;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_plugin_katesearch-Show-Button-In-Sidebar" = true;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_plugin_katesearch-Visible" = false;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katefiletreeplugin-Position" = 0;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katefiletreeplugin-Show-Button-In-Sidebar" = true;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katefiletreeplugin-Visible" = false;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katekonsoleplugin-Position" = 3;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katekonsoleplugin-Show-Button-In-Sidebar" = true;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kate_private_plugin_katekonsoleplugin-Visible" = false;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateproject-Position" = 0;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateproject-Show-Button-In-Sidebar" = true;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateproject-Visible" = false;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectgit-Position" = 0;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectgit-Show-Button-In-Sidebar" = true;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectgit-Visible" = false;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectinfo-Position" = 3;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectinfo-Show-Button-In-Sidebar" = true;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-kateprojectinfo-Visible" = false;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-lspclient_symbol_outline-Position" = 0;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-lspclient_symbol_outline-Show-Button-In-Sidebar" = true;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-lspclient_symbol_outline-Visible" = false;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-output-Position" = 3;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-output-Show-Button-In-Sidebar" = true;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-ToolView-output-Visible" = false;
+      "kate/anonymous.katesession"."MainWindow0"."Kate-MDI-V-Splitter" = "0,369,0";
+      "kate/anonymous.katesession"."MainWindow0"."ToolBarsMovable" = "Disabled";
+      "kate/anonymous.katesession"."MainWindow0 Settings"."ToolBarsMovable" = "Disabled";
+      "kate/anonymous.katesession"."MainWindow0 Settings"."WindowState" = 8;
+      "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Children" = "MainWindow0-ViewSpace 0";
+      "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Orientation" = 1;
+      "kate/anonymous.katesession"."MainWindow0-Splitter 0"."Sizes" = 594;
+      "kate/anonymous.katesession"."Open Documents"."Count" = 1;
+      "kate/anonymous.katesession"."Open MainWindows"."Count" = 1;
+      "kate/anonymous.katesession"."Plugin:kateprojectplugin:"."projects" = "";
+      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."BinaryFiles" = false;
+      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."CurrentExcludeFilter" = "-1";
+      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."CurrentFilter" = "-1";
+      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."ExcludeFilters" = "";
+      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."ExpandSearchResults" = false;
+      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Filters" = "";
+      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."FollowSymLink" = false;
+      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."HiddenFiles" = false;
+      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."MatchCase" = false;
+      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Place" = 1;
+      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Recursive" = true;
+      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Replaces" = "";
+      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."Search" = "";
+      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeAllProjects" = true;
+      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeCurrentFile" = true;
+      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeFolder" = true;
+      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeOpenFiles" = true;
+      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchAsYouTypeProject" = true;
+      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchDiskFiles" = "";
+      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SearchDiskFiless" = "";
+      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."SizeLimit" = 128;
+      "kate/anonymous.katesession"."Plugin:katesearchplugin:MainWindow:0"."UseRegExp" = false;
+    };
+  };
+}

machines/boxy/configuration.nix

@@ -17,8 +17,9 @@ with lib;
     kodi = {
       enable = true;
       autologin = true;
-      wayland = false;
+      wayland = true;
     };
+    users.enable = true;
   };
 
   # Use the systemd-boot EFI boot loader.
@@ -29,7 +30,7 @@ with lib;
 
   hardware.graphics.enable = true;
 
-  #services.displayManager.enable = mkForce false;
+  services.displayManager.enable = mkForce false;
 
   # This option defines the first version of NixOS you have installed on this particular machine,
   # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.

machines/nix-book/configuration.nix

@@ -15,6 +15,7 @@
     desktop.enable = true;
     nfs-mounts.enable = true;
     printing.enable = true;
+    spotifyd.enable = true;
     users = {
       enable = true;
       extraGroups = [ "video" ];

machines/z790prors/hardware-configuration.nix

@@ -15,6 +15,10 @@
     "nvidia_uvm"
     "nvidia_drm"
   ];
+  boot.kernelParams = [
+    "nvidia_drm.fbdev=1"
+    "nvidia_drm.modeset=1"
+  ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
@@ -48,6 +52,14 @@
 
   swapDevices = [ ];
 
+  services.beesd.filesystems = {
+    root = {
+      spec = "LABEL=nixos";
+      hashTableSizeMB = 4096;
+      verbosity = "crit";
+    };
+  };
+
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

roles/default.nix

@@ -1,10 +1,7 @@
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 with lib;
 
-let
-  cfg = config.roles;
-in
 {
   imports = [
     ./audio
@@ -19,10 +16,6 @@ in
     ./virtualisation
   ];
 
-  options.roles = {
-    enable = mkEnableOption "Enable roles";
-  };
-
   config = {
     i18n.defaultLocale = "en_US.UTF-8";
     i18n.extraLocaleSettings = {
@@ -65,9 +58,6 @@ in
         substituters = [
           "https://hyprland.cachix.org"
         ];
-        trusted-public-keys = [
-          "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
-        ];
       };
     };
 

roles/desktop/default.nix

@@ -7,6 +7,8 @@ let
 
   basePackages = with pkgs; [
     brightnessctl
+    mangohud # Should probably get refactored with steam/gamescope out to a gaming role
+    polonium # auto tiling kwin addon
   ];
 
   x11BasePackages = with pkgs; [
@@ -37,7 +39,7 @@ in
     };
   };
 
-  config =
+  config = mkIf cfg.enable
     {
       services.xserver.xkb = {
         layout = "us";
@@ -71,10 +73,38 @@ in
 
       programs.kdeconnect.enable = true;
       programs.java.enable = true;
+      programs.gamemode = {
+        enable = true;
+
+      };
+      programs.gamescope = {
+        enable = true;
+        #capSysNice = true;
+        args = [
+          #"--adaptive-sync"
+          #"--nested-refresh 165"
+          #"--backend wayland"
+          "--hdr-enabled"
+          "--hdr-itm-enable"
+          "--hdr-debug-force-output"
+          "--mangoapp"
+          "--rt"
+          "--steam"
+          #"--xwayland-count 2"
+        ];
+        env = {
+          #PROTON_DISABLE_NVAPI = "1";
+          MANGOHUD = "1";
+          #MANGOHUD_CONFIG = "cpu_temp gpu_temp ram vram";
+        };
+      };
       programs.steam = {
         enable = true;
         remotePlay.openFirewall = true;
         localNetworkGameTransfers.openFirewall = true;
+        gamescopeSession = {
+          enable = true;
+        };
         #package = pkgs.steam.override {
         #withJava = true;
         #withPrimus = true;

roles/kodi/default.nix

@@ -25,39 +25,47 @@ in
       steam-library
       youtube
     ]);
-  in mkIf cfg.enable {
+  in mkIf cfg.enable
-    users.extraUsers.kodi.isNormalUser = true;
+    {
+      users.extraUsers.kodi.isNormalUser = true;
 
-    networking.firewall = {
+      networking.firewall = {
-      allowedTCPPorts = [ 8080 ];
+        allowedTCPPorts = [ 8080 ];
-      allowedUDPPorts = [ 8080 ];
+        allowedUDPPorts = [ 8080 ];
+      };
+
+      services = if cfg.autologin then mkMerge [
+        (mkIf cfg.wayland {
+          cage = mkIf cfg.wayland {
+            user = "kodi";
+            program = "${kodiPkg}/bin/kodi-standalone";
+            enable = true;
+          };
+          xserver = {
+            enable = false;
+            autorun = false;
+          };
+        })
+
+        (mkIf (!cfg.wayland) {
+          xserver = {
+            enable = true;
+            desktopManager.kodi = {
+              enable = true;
+              package = kodiPkg;
+            };
+            displayManager.lightdm = {
+              enable = true;
+              greeter.enable = false;
+            };
+          };
+          displayManager = {
+            autoLogin.enable = true;
+            autoLogin.user = "kodi";
+            defaultSession = "kodi";
+            sessionData.autologinSession = "kodi";
+          };
+        })
+      ] else {};
     };
-
-    services = mkIf cfg.autologin {
-      cage = mkIf cfg.wayland {
-        user = "kodi";
-        program = "${kodiPkg}/bin/kodi-standalone";
-        enable = true;
-      };
-
-      xserver = mkIf (!cfg.wayland) {
-        enable = true;
-        desktopManager.kodi = {
-          enable = true;
-          package = kodiPkg;
-        };
-        displayManager.lightdm = {
-          enable = true;
-          greeter.enable = false;
-        };
-        displayManager.sddm.enable = mkForce false;
-      };
-      displayManager = mkIf (!cfg.wayland) {
-        autoLogin.enable = true;
-        autoLogin.user = "kodi";
-        defaultSession = "kodi";
-        sessionData.autologinSession = "kodi";
-      };
-    };
-  };
 }