improvement: git, hyprland, steam

added gitbutler, introduced maintenance for nixpkgs, cleaned up some files, keyring should now unlock ad login

modules/nixos/apps/steam/default.nix

@@ -1,18 +1,18 @@
 {
-  options,
   config,
   lib,
+  namespace,
+  options,
   pkgs,
   ...
 }:
-with lib;
-with lib.wyrdgard;
 let
-  cfg = config.wyrdgard.apps.steam;
+  inherit (lib) mkIf mkEnableOption;
+  cfg = config.${namespace}.apps.steam;
 in
 {
-  options.wyrdgard.apps.steam = with types; {
-    enable = mkBoolOpt false "Whether or not to enable support for Steam.";
+  options.${namespace}.apps.steam = {
+    enable = mkEnableOption "Whether or not to enable support for Steam.";
   };
 
   config = mkIf cfg.enable {
@@ -24,7 +24,6 @@ in
     };
 
     environment.systemPackages = with pkgs; [
-      steam
       protontricks
     ];
   };

modules/nixos/desktop/hyprland/default.nix

@@ -101,6 +101,12 @@ in
             {
               "$mod" = "SUPER";
 
+              env = [
+                "QT_AUTO_SCREEN_SCALE_FACTOR,1"
+                "QT_QPA_PLATFORM,wayland;xcb"
+                "QT_WAYLAND_DISABLE_WINDOWDECORATION,1"
+              ];
+
               exec-once = [
                 "waybar"
                 "dunst"
@@ -108,7 +114,6 @@ in
 
                 "[workspace 3 silent] steam"
                 "[workspace 2 silent] discord"
-                "[workspace 2 silent] noisetorch -i"
                 "[workspace 4 silent] 1password"
                 "[workspace 1 silent] zen"
               ];
@@ -264,6 +269,7 @@ in
 
                 # focus change on cursor move
                 follow_mouse = 2;
+                force_no_accel = 1;
                 accel_profile = "flat";
               };
 
@@ -285,6 +291,8 @@ in
       };
     };
 
-    environment.sessionVariables.NIXOS_OZONE_WL = "1";
+    environment.sessionVariables = {
+      NIXOS_OZONE_WL = "1";
+    };
   };
 }

modules/nixos/security/keyring/default.nix

@@ -6,7 +6,7 @@
   ...
 }:
 let
-  inherit (lib) mkIf types;
+  inherit (lib) mkIf;
   inherit (lib.wyrdgard) mkBoolOpt;
   cfg = config.${namespace}.security.keyring;
 in
@@ -17,5 +17,6 @@ in
 
   config = mkIf cfg.enable {
     services.gnome.gnome-keyring.enable = true;
+    security.pam.services.sddm.enableGnomeKeyring = true;
   };
 }

modules/nixos/system/boot/default.nix

@@ -16,7 +16,7 @@ in
 
   config = mkIf cfg.enable {
     boot = {
-      kernelPackages = pkgs.linuxPackages_latest;
+      kernelPackages = pkgs.linuxPackages_6_10;
       loader = {
         systemd-boot.enable = true;
         efi.canTouchEfiVariables = true;

modules/nixos/system/hardware/audio/default.nix

@@ -31,6 +31,7 @@ in
       alsa.enable = true;
       alsa.support32Bit = true;
       pulse.enable = true;
+
       wireplumber.configPackages = [
         (pkgs.writeTextDir "share/wireplumber/wireplumber.conf.d/11-bluetooth-policy.conf" ''
           wireplumber.settings = {	

modules/nixos/system/hardware/bluetooth/default.nix

@@ -25,6 +25,7 @@ in
         General = {
           Experimental = true;
           KernelExperimental = true;
+          Enable = "Source,Sink,Media,Socket";
         };
       };
     };

modules/nixos/system/hardware/gpu/nvidia/default.nix

@@ -1,15 +1,22 @@
-{ lib, config, ... }:
-with lib;
-with lib.wyrdgard;
+{
+  lib,
+  config,
+  pkgs,
+  namespace,
+  ...
+}:
 let
-  cfg = config.wyrdgard.system.hardware.gpu.nvidia;
+  inherit (lib) mkIf mkEnableOption;
+  cfg = config.${namespace}.system.hardware.gpu.nvidia;
 in
 {
-  options.wyrdgard.system.hardware.gpu.nvidia = with types; {
+  options.${namespace}.system.hardware.gpu.nvidia = {
     enable = mkEnableOption "Enable Nvidia GPU";
   };
 
   config = mkIf cfg.enable {
+    environment.systemPackages = [ pkgs.nvidia-vaapi-driver ];
+
     hardware.graphics = {
       enable = true;
       enable32Bit = true;

modules/nixos/tools/git/default.nix

@@ -23,6 +23,7 @@ in
     environment.systemPackages = with pkgs; [
       git
       gitAndTools.gh
+      gitbutler
     ];
 
     wyrdgard.home.extraOptions = {