Merge branch 'zenix/master' into nixbook/master

nixos/programs/cosmic.nix

@@ -0,0 +1,11 @@
+{inputs, ...}: {
+  imports = [
+    inputs.nixos-cosmic.nixosModules.default
+  ];
+  nix.settings = {
+    substituters = [ "https://cosmic.cachix.org/" ];
+    trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
+  };
+  services.desktopManager.cosmic.enable = true;
+  services.displayManager.cosmic-greeter.enable = true;
+}

nixos/programs/gamer.nix

@@ -1,4 +1,4 @@
-{lib, ...}: {
+{lib, pkgs, ...}: {
   nixpkgs.config.allowUnfreePredicate = pkg:
     builtins.elem (lib.getName pkg) [
       "steam"
@@ -6,9 +6,12 @@
       "steam-original"
       "osu-lazer"
     ];
-
   programs.steam = {
     enable = true;
+    extest.enable = true;
+    extraCompatPackages = with pkgs; [
+      proton-ge-bin
+    ];
     remotePlay.openFirewall = true;
     dedicatedServer.openFirewall = true;
   };

nixos/workstation.nix

@@ -6,16 +6,11 @@
 }: {
   imports = [
     inputs.stylix.nixosModules.stylix
-    inputs.nixos-cosmic.nixosModules.default
   ];
   nixpkgs.config.permittedInsecurePackages = [
     "electron-27.3.11"
   ];
 
-  programs.hyprland = {
-    enable = true;
-  };
-
   # use pipewire
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
@@ -53,7 +48,10 @@
 
   services.printing.enable = true;
 
-  services.dbus.enable = true;
+  services.dbus = {
+    enable = true;
+    packages = [pkgs.gcr];
+  };
   programs.light.enable = true;
   programs.dconf.enable = true;