Merge branch 'framework/master' into alpine/master

nixos/default.nix

@@ -22,10 +22,16 @@ in {
     enable = true;
     device = "nodev";
     efiSupport = true;
+    configurationLimit = 50;
   };
   boot.loader.efi.canTouchEfiVariables = true;
+  boot.tmp.useTmpfs = true;
 
   networking.networkmanager.enable = true;
+  programs.nm-applet = {
+    enable = true;
+    indicator = true;
+  };
 
   # fix nixos-containers
   networking.nat.enable = true;
@@ -83,6 +89,7 @@ in {
   services.gvfs.enable = true;
 
   environment.systemPackages = with pkgs; [
+    networkmanagerapplet
     tealdeer
     alsa-utils
     trash-cli

nixos/programs/gamer.nix

@@ -17,7 +17,11 @@
     dedicatedServer.openFirewall = true;
     gamescopeSession = {
       enable = true;
-      args = ["-r" "144" "-O" "DP-1" "--rt"];
+      args = ["-r" "120" "-W" "3840" "-H" "2160" "-O" "HDMI-A-1" "--rt" "--hdr-enabled" "--adaptive-sync"];
+      env = {
+        ENABLE_HDR_WSI = "1";
+        DXVK_HDR = "1";
+      };
     };
   };
   programs.gamescope = {

nixos/programs/hyprland.nix

@@ -1,5 +1,8 @@
 {config, ...}: {
-  programs.hyprland.enable = true;
+  programs.hyprland = {
+    enable = true;
+    withUWSM = true;
+  };
   security.pam.services.hyprlock = {};
 
   imports = [

nixos/programs/pipewire.nix

@@ -1,5 +1,4 @@
 {pkgs, ...}: {
-  hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
     enable = true;

nixos/services/musnix.nix

@@ -4,7 +4,6 @@
   musnix = {
     enable = true;
     rtcqs.enable = true;
-    kernel.realtime = true;
   };
   environment.systemPackages = with pkgs; [
     ardour

nixos/workstation.nix

@@ -35,6 +35,7 @@
     enable = true;
     image = ../images/nix-soft.png;
     base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml";
+    polarity = "dark";
     opacity = {
       terminal = 0.9;
       applications = 0.9;
@@ -46,14 +47,11 @@
       package = pkgs.vanilla-dmz;
       size = 24;
     };
+    # autoEnable = true;
     targets = {
-      gtk.enable = false; # fails to switch with cosmic overriding it (grr)
-      gnome.enable = false;
+      qt.enable = true;
       grub = {
-        useImage = true;
-      };
-      nixvim = {
-        enable = false;
+        useWallpaper = true;
       };
     };
   };