(wip) Run kodi in gamescope

This is an attempt to get spotifyd running as a system user working

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728041527,
-        "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=",
+        "lastModified": 1729459288,
+        "narHash": "sha256-gBOVJv+q6Mx8jGvwX7cE6J8+sZmi1uxpRVsO7WxvVuQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e",
+        "rev": "1e27f213d77fc842603628bcf2df6681d7d08f7e",
         "type": "github"
       },
       "original": {
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1727802920,
-        "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=",
+        "lastModified": 1729256560,
+        "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515",
+        "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1725762081,
-        "narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=",
+        "lastModified": 1729357638,
+        "narHash": "sha256-66RHecx+zohbZwJVEPF7uuwHeqf8rykZTMCTqIrOew4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05",
+        "rev": "bb8c2cf7ea0dd2e18a52746b2c3a5b0c73b93c22",
         "type": "github"
       },
       "original": {
@@ -52,10 +52,34 @@
         "type": "github"
       }
     },
+    "plasma-manager": {
+      "inputs": {
+        "home-manager": [
+          "home-manager"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1729372184,
+        "narHash": "sha256-Tb2/jJ74pt0nmfprkOW1g5zZphJTNbzLnyDENM+c5+I=",
+        "owner": "nix-community",
+        "repo": "plasma-manager",
+        "rev": "9390dadadc58ffda8e494b31ef66a4ae041f6dd1",
+        "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"
       }
     },
@@ -67,11 +91,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1727423009,
-        "narHash": "sha256-+4B/dQm2EnORIk0k2wV3aHGaE0WXTBjColXjj7qWh10=",
+        "lastModified": 1729394972,
+        "narHash": "sha256-fADlzOzcSaGsrO+THUZ8SgckMMc7bMQftztKFCLVcFI=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "127a96f49ddc377be6ba76964411bab11ae27803",
+        "rev": "c504fd7ac946d7a1b17944d73b261ca0a0b226a5",
         "type": "github"
       },
       "original": {

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 {

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,163 @@
+{ 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;
+    overrideConfig = true;
+
+    kwin = {
+      scripts.polonium.enable = true;
+    };
+
+    hotkeys.commands."launch-konsole" = {
+      name = "Launch Konsole";
+      key = "Meta+Return";
+      command = "konsole";
+    };
+
+    shortcuts = {
+      kmix = {
+        "decrease_microphone_volume" = "Microphone Volume Down";
+        "decrease_volume" = "Volume Down";
+        "decrease_volume_small" = "Shift+Volume Down";
+        "increase_microphone_volume" = "Microphone Volume Up";
+        "increase_volume" = "Volume Up";
+        "increase_volume_small" = "Shift+Volume Up";
+        "mic_mute" = ["Microphone Mute" "Meta+Volume Mute,Microphone Mute" "Meta+Volume Mute,Mute Microphone"];
+        "mute" = "Volume Mute";
+      };
+
+      mediacontrol = {
+        "mediavolumedown" = "none,,Media volume down";
+        "mediavolumeup" = "none,,Media volume up";
+        "nextmedia" = "Media Next";
+        "pausemedia" = "Media Pause";
+        "playmedia" = "none,,Play media playback";
+        "playpausemedia" = "Media Play";
+        "previousmedia" = "Media Previous";
+        "stopmedia" = "Media Stop";
+      };
+
+      ksmserver = {
+        "Lock Session" = ["Meta+Ctrl+Q" "Screensaver" "Screensaver,Lock Session"];
+      };
+
+      kwin = {
+        "Window Close" = "Meta+Shift+Q";
+        "Kill Window" = "Meta+Ctrl+Esc";
+        "Window Operations Menu" = "Alt+F3";
+        "Window Resize" = "Meta+R,,Resize Window";
+
+        "Overview" = "Meta+W";
+        "Grid View" = "Meta+G";
+        "Edit Tiles" = "Meta+T";
+
+        "Activate Window Demanding Attention" = "Meta+Ctrl+A";
+
+        "PoloniumCycleEngine" = "Meta+|,none,Polonium: Cycle Engine";
+        "PoloniumFocusAbove" = "Meta+K,none,Polonium: Focus Above";
+        "PoloniumFocusBelow" = "Meta+J,none,Polonium: Focus Below";
+        "PoloniumFocusLeft" = "Meta+H,none,Polonium: Focus Left";
+        "PoloniumFocusRight" = "Meta+L,none,Polonium: Focus Right";
+        "PoloniumInsertAbove" = "Meta+Shift+K,none,Polonium: Insert Above";
+        "PoloniumInsertBelow" = "Meta+Shift+J,none,Polonium: Insert Below";
+        "PoloniumInsertLeft" = "Meta+Shift+H,none,Polonium: Insert Left";
+        "PoloniumInsertRight" = "Meta+Shift+L,none,Polonium: Insert Right";
+        "PoloniumOpenSettings" = "Meta+\\\\,none,Polonium: Open Settings Dialog";
+        "PoloniumResizeAbove" = "Meta+Ctrl+K,none,Polonium: Resize Above";
+        "PoloniumResizeBelow" = "Meta+Ctrl+J,none,Polonium: Resize Below";
+        "PoloniumResizeLeft" = "Meta+Ctrl+H,none,Polonium: Resize Left";
+        "PoloniumResizeRight" = "Meta+Ctrl+L,none,Polonium: Resize Right";
+        "PoloniumRetileWindow" = "Meta+Shift+Space,none,Polonium: Retile Window";
+        "PoloniumSwitchBTree" = [ ];
+        "PoloniumSwitchHalf" = [ ];
+        "PoloniumSwitchKwin" = [ ];
+        "PoloniumSwitchMonocle" = [ ];
+        "PoloniumSwitchThreeColumn" = [ ];
+
+        "Show Desktop" = "Meta+D";
+        "Switch to Desktop 1" = "Meta+1,,Switch to Desktop 1";
+        "Switch to Desktop 2" = "Meta+2,,Switch to Desktop 2";
+        "Switch to Desktop 3" = "Meta+3,,Switch to Desktop 3";
+        "Switch to Desktop 4" = "Meta+4,,Switch to Desktop 4";
+        "Switch to Desktop 5" = "Meta+5,,Switch to Desktop 5";
+        "Switch to Desktop 6" = "none,,Switch to Desktop 6";
+        "Switch to Desktop 7" = "none,,Switch to Desktop 7";
+        "Switch to Desktop 8" = "none,,Switch to Desktop 8";
+        "Switch to Desktop 9" = "none,,Switch to Desktop 9";
+        "Window to Desktop 1" = "Meta+!,,Window to Desktop 1";
+        "Window to Desktop 2" = "Meta+@,,Window to Desktop 2";
+        "Window to Desktop 3" = "Meta+#,,Window to Desktop 3";
+        "Window to Desktop 4" = "Meta+$,,Window to Desktop 4";
+        "Window to Desktop 5" = "Meta+%,,Window to Desktop 5";
+        "Window to Desktop 6" = "none,,Window to Desktop 6";
+        "Window to Desktop 7" = "none,,Window to Desktop 7";
+        "Window to Desktop 8" = "none,,Window to Desktop 8";
+        "Window to Desktop 9" = "none,,Window to Desktop 9";
+
+        "Walk Through Windows" = "Alt+Tab";
+        "Walk Through Windows (Reverse)" = "Alt+Shift+Tab";
+        "Walk Through Windows of Current Application" = "Alt+`";
+        "Walk Through Windows of Current Application (Reverse)" = "Alt+~";
+        "Window Fullscreen" = "Meta+Shift+F,,Make Window Fullscreen";
+
+        "Window Quick Tile Bottom" = "Meta+Down";
+        "Window Quick Tile Left" = "Meta+Left";
+        "Window Quick Tile Right" = "Meta+Right";
+        "Window Quick Tile Top" = "Meta+Up";
+
+        "view_actual_size" = "Meta+0";
+        "view_zoom_in" = ["Meta++" "Meta+=,Meta++" "Meta+=,Zoom In"];
+        "view_zoom_out" = "Meta+-";
+      };
+      "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"];
+        "activate task manager entry 1" = "none,,";
+        "activate task manager entry 2" = "none,,";
+        "activate task manager entry 3" = "none,,";
+        "activate task manager entry 4" = "none,,";
+        "activate task manager entry 5" = "none,,";
+        "activate task manager entry 6" = "none,,";
+        "activate task manager entry 7" = "none,,";
+        "activate task manager entry 8" = "none,,";
+        "activate task manager entry 9" = "none,,";
+        "activate task manager entry 10" = "none,,";
+        "show activity switcher" = "none,,";
+      };
+    };
+
+    configFile = {
+      kwinrc.Desktops.Number = {
+        value = 9;
+        immutable = true;
+      };
+    };
+  };
+}

machines/boxy/configuration.nix

@@ -19,6 +19,10 @@ with lib;
       autologin = true;
       wayland = true;
     };
+    spotifyd = {
+      enable = true;
+      deviceType = "t_v";
+    };
     users.enable = true;
   };
 

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 = [ ];
 
@@ -29,6 +33,18 @@
     open = false;
     nvidiaSettings = true;
     package = config.boot.kernelPackages.nvidiaPackages.production;
+    #package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
+      #version = "555.58";
+
+      #sha256_64bit = "sha256-bXvcXkg2kQZuCNKRZM5QoTaTjF4l2TtrsKUvyicj5ew=";
+      #sha256_aarch64 = lib.fakeSha256;
+      #openSha256 = lib.fakeSha256;
+      #settingsSha256 = "sha256-vWnrXlBCb3K5uVkDFmJDVq51wrCoqgPF03lSjZOuU8M=";
+      #persistencedSha256 = lib.fakeSha256;
+    #};
+  };
+  environment.sessionVariables = {
+    KWIN_DRM_ALLOW_NVIDIA_COLORSPACE = "1";
   };
 
   fileSystems."/" =
@@ -48,6 +64,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/audio/default.nix

@@ -13,16 +13,15 @@ in
   config = mkIf cfg.enable
     {
       environment.systemPackages = with pkgs; [
+        alsa-utils
         paprefs
         pavucontrol
         pulsemixer
       ];
 
-      services.pipewire = {
-        enable = true;
-        pulse.enable = true;
-      };
+      hardware.pulseaudio.enable = true;
       hardware.pulseaudio.package = pkgs.pulseaudioFull;
+      hardware.pulseaudio.support32Bit = true;
       hardware.pulseaudio.extraConfig = "
         load-module module-combine-sink
         load-module module-switch-on-connect

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,12 @@ in
         substituters = [
           "https://hyprland.cachix.org"
         ];
-        trusted-public-keys = [
-          "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
-        ];
+      };
+
+      gc = {
+        automatic = true;
+        randomizedDelaySec = "14m";
+        options = "--delete-older-than 10d";
       };
     };
 

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; [
@@ -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

@@ -38,7 +38,18 @@ in
         (mkIf cfg.wayland {
           cage = mkIf cfg.wayland {
             user = "kodi";
-            program = "${kodiPkg}/bin/kodi-standalone";
+            #program = "gamescope -f --hdr-enabled ${kodiPkg}/bin/kodi-standalone";
+	    program =
+	      let
+	        kodiGamescope = pkgs.writeShellApplication {
+		  name = "kodi-gamescope";
+		  runtimeInputs = [ kodiPkg pkgs.gamescope ];
+		  text = ''
+		    ${pkgs.gamescope}/bin/gamescope --hdr-enabled -f -- ${kodiPkg}/bin/kodi-standalone
+		  '';
+		};
+	      in
+	      "${lib.getExe kodiGamescope}";
             enable = true;
           };
           xserver = {

roles/spotifyd/default.nix

@@ -8,29 +8,38 @@ in
 {
   options.roles.spotifyd = {
     enable = mkEnableOption "Enable the spotifyd role";
+    deviceType = mkOption {
+      default = "computer";
+    };
   };
 
   config = mkIf cfg.enable
     {
       roles.audio.enable = true;
+      hardware.pulseaudio.enable = true;
+      hardware.pulseaudio.extraConfig = ''
+        unload-module module-native-protocol-unix
+        load-module module-native-protocol-unix auth-anonymous=1
+      '';
+      hardware.pulseaudio.systemWide = true;
 
       services.spotifyd = {
         enable = true;
         settings = {
           global = {
             use_mpris = false;
-            backend = "alsa";
-            device = "sysdefault";
+            backend = "pulseaudio";
             bitrate = 320;
             cache_path = "";
-            zeroconf_port = 1234;
+            zeroconf_port = 5354;
             autoplay = false;
+            device_type = cfg.deviceType;
           };
         };
       };
 
       networking.firewall.allowedTCPPorts = [
-        1234
+        5354
         57621
       ];
       networking.firewall.allowedUDPPorts = [