[desktop] Add protonup

I had to boot into emergency mode and use systemd runtime masking:

```
systemd mask --runtime arch.mount
```

This allowed the system to boot so that I could remove this entry and
run nixos-rebuild

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728041527,
-        "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=",
+        "lastModified": 1730633670,
+        "narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e",
+        "rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661",
         "type": "github"
       },
       "original": {
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1727802920,
-        "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=",
+        "lastModified": 1730531603,
+        "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515",
+        "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1725762081,
-        "narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=",
+        "lastModified": 1730602179,
+        "narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05",
+        "rev": "3c2f1c4ca372622cb2f9de8016c9a0b1cbd0f37c",
         "type": "github"
       },
       "original": {
@@ -52,10 +52,34 @@
         "type": "github"
       }
     },
+    "plasma-manager": {
+      "inputs": {
+        "home-manager": [
+          "home-manager"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1730635861,
+        "narHash": "sha256-Npp3pl9aeAiq+wZPDbw2ZxybNuZWyuN7AY6fik56DCo=",
+        "owner": "nix-community",
+        "repo": "plasma-manager",
+        "rev": "293668587937daae1df085ee36d2b2d0792b7a0f",
+        "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": 1730605784,
+        "narHash": "sha256-1NveNAMLHbxOg0BpBMSVuZ2yW2PpDnZLbZ25wV50PMc=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "127a96f49ddc377be6ba76964411bab11ae27803",
+        "rev": "e9b5eef9b51cdf966c76143e13a9476725b2f760",
         "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 {
@@ -55,13 +62,12 @@
       system = "x86_64-linux";
       modules = baseModules ++ [
         ./machines/boxy/configuration.nix
-        # inputs.home-manager.nixosModules.home-manager
-        # {
-        #   home-manager.users.johno = import ./home/home-default.nix;
-        #   home-manager.extraSpecialArgs.customPkgs =
-        #     nixpkgs.legacyPackages."${system}".callPackage ./packages {};
-        #     customPkgs = nixpkgs.legacyPackages."${system}".callPackage ./packages {};
-        # }
+        inputs.home-manager.nixosModules.home-manager
+        {
+          home-manager.users.johno = import ./home/home-default.nix;
+          home-manager.extraSpecialArgs.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/emacs/default.nix

@@ -32,7 +32,7 @@ in {
         source = fetchGit {
           url = "https://github.com/doomemacs/doomemacs.git";
           # When updating me, remember to run `doom sync`
-          rev = "5ad99220b86ae1bf421861dfad24492d768ac4d9";
+          rev = "f425f2ff3da584cfe2676f6b9cf1d81a690a75e5";
         };
         # We need to use recursive mode here or else doom fails to sync for
         # some reason related to the permissions on the synced path. I'm not

home/modules/emacs/doom/init.el

@@ -149,7 +149,7 @@
        ;;lua               ; one-based indices? one-based indices
        markdown          ; writing docs for people to ignore
        ;;nim               ; python + lisp at the speed of c
-       (nix +tree-sitter +lsp)               ; I hereby declare "nix geht mehr!"
+       (nix +tree-sitter)               ; I hereby declare "nix geht mehr!"
        ;;ocaml             ; an objective camel
        (org +roam2)               ; organize your plain life in plain text
        ;;php               ; perl's insecure younger brother

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,127 @@
+{ config, lib, pkgs, ... }:
+
+
+# The current KDE config can be output with the command:
+# nix run github:nix-community/plasma-manager
+#
+# Plasma-manager options documentation
+# https://nix-community.github.io/plasma-manager/options.xhtml
+#
+# TODO: (ambitious) Add Kmail support to plasma-manager
+{
+  programs.plasma = {
+    enable = true;
+    overrideConfig = 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";
+
+        "Show Desktop" = "Meta+D";
+
+        "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 = 10;
+        immutable = true;
+      };
+
+      kcminputrc.Libinput = {
+        AccelerationProfile = "adaptive";
+        PointerAcceleration = 0.5;
+      };
+
+      kcminputrc.Mouse = {
+        X11LibInputXAccelProfileFlat = false;
+        XLbInptAccelProfileFlat = false;
+      };
+
+      kdeglobals.KDE.LookAndFeelPackage = "org.kde.breezedark.desktop";
+    };
+  };
+}

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 = [ ];
 
@@ -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."/" =
@@ -41,13 +57,16 @@
       fsType = "vfat";
     };
 
-  fileSystems."/arch" =
-    { device = "/dev/disk/by-label/endeavouros";
-      fsType = "btrfs";
-    };
-
   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 = {
@@ -38,16 +31,25 @@ in
     };
     time.timeZone = "America/Los_Angeles";
 
+    # Don't go to emergency mode if we aren't able to mount filesystems.
+    # This is silly if you have multiple hard drives or partitions
+    # configured on a machine and then one goes away intentionally or
+    # unintentionally. If the system is already booting, let it continue
+    # to try and boot.
+    systemd.enableEmergencyMode = false;
+
     # Enable the OpenSSH daemon.
     services.openssh.enable = true;
 
     environment.systemPackages = with pkgs; [
-      vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
       git
+      pciutils
+      vim
+      usbutils
     ];
 
     nix = {
-      package = pkgs.nixFlakes;
+      package = pkgs.nix;
       distributedBuilds = true;
       buildMachines = [{
         hostName = "z790prors.oglehome";
@@ -65,9 +67,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
+    protonup-qt
   ];
 
   x11BasePackages = with pkgs; [
@@ -37,7 +39,7 @@ in
     };
   };
 
-  config =
+  config = mkIf cfg.enable
     {
       services.xserver.xkb = {
         layout = "us";
@@ -71,10 +73,41 @@ 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;
+        };
+	extraCompatPackages = with pkgs; [
+	  proton-ge-bin
+	];
         #package = pkgs.steam.override {
         #withJava = true;
         #withPrimus = true;

roles/kodi/default.nix

@@ -25,39 +25,47 @@ in
       steam-library
       youtube
     ]);
-  in mkIf cfg.enable {
-    users.extraUsers.kodi.isNormalUser = true;
+  in mkIf cfg.enable
+    {
+      users.extraUsers.kodi.isNormalUser = true;
 
-    networking.firewall = {
-      allowedTCPPorts = [ 8080 ];
-      allowedUDPPorts = [ 8080 ];
+      networking.firewall = {
+        allowedTCPPorts = [ 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";
-      };
-    };
-  };
 }