Updated linux-firmware to latest main with updated amd drivers working

Reorder GNOME configuration and disable gnome.gcr-ssh-agent
Replace 'discord' with 'discord-krisp'; update monitors for haze
2025-06-25 17:03:26 -04:00 · 2025-06-25 16:06:15 -04:00 · 2025-06-25 16:05:25 -04:00 · 2025-06-25 15:59:27 -04:00 · 2025-06-25 15:58:00 -04:00 · 2025-06-22 19:54:38 -04:00
10 changed files with 193 additions and 158 deletions
--- a/flake.lock
+++ b/flake.lock
@ -76,11 +76,11 @@
        "rust-overlay": "rust-overlay"
      },
      "locked": {
-        "lastModified": 1750195929,
-        "narHash": "sha256-5gaf/9wuxtfKqAFnNlX74Vz2VMURa/UzyfuEyYv4tZw=",
+        "lastModified": 1750851678,
+        "narHash": "sha256-vZRqRdZH5SegK8qn1VMI0Fjnsh9uTc6Y4EaYcrBDTzs=",
        "owner": "chaotic-cx",
        "repo": "nyx",
-        "rev": "419a1cfaf34100008ff5fa97ce9ef3b194472f71",
+        "rev": "1e8d69811b5d6cd53f71a34e19a00746c94a830d",
        "type": "github"
      },
      "original": {
@ -158,11 +158,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1748821116,
-        "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=",
+        "lastModified": 1749398372,
+        "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1",
+        "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
        "type": "github"
      },
      "original": {
@ -380,11 +380,11 @@
    },
    "hardware": {
      "locked": {
-        "lastModified": 1749832440,
-        "narHash": "sha256-lfxhuxAaHlYFGr8yOrAXZqdMt8PrFLzjVqH9v3lQaoY=",
+        "lastModified": 1750837715,
+        "narHash": "sha256-2m1ceZjbmgrJCZ2PuQZaK4in3gcg3o6rZ7WK6dr5vAA=",
        "owner": "nixos",
        "repo": "nixos-hardware",
-        "rev": "db030f62a449568345372bd62ed8c5be4824fa49",
+        "rev": "98236410ea0fe204d0447149537a924fb71a6d4f",
        "type": "github"
      },
      "original": {
@ -401,11 +401,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1748182899,
-        "narHash": "sha256-r6MHSalDFydlUmjorVTSsyhLjIt8VWNtGc5+mffXvFQ=",
+        "lastModified": 1750730235,
+        "narHash": "sha256-rZErlxiV7ssvI8t7sPrKU+fRigNc2KvoKZG3gtUtK50=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "901f8fef7f349cf8a8e97b3230b22fd592df9160",
+        "rev": "d07e9cceb4994ed64a22b9b36f8b76923e87ac38",
        "type": "github"
      },
      "original": {
@ -421,11 +421,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1749935160,
-        "narHash": "sha256-lTLR7AyrrIS/b4frHKb5pw/gcPM0GgoGCURqeiOX9k8=",
+        "lastModified": 1750798083,
+        "narHash": "sha256-DTCCcp6WCFaYXWKFRA6fiI2zlvOLCf5Vwx8+/0R8Wc4=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "8fabeb9c142a303e02270c3a3a0d8e00af9d0dfe",
+        "rev": "ff31a4677c1a8ae506aa7e003a3dba08cb203f82",
        "type": "github"
      },
      "original": {
@ -486,11 +486,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1747990026,
-        "narHash": "sha256-sG5VbID+x5+xUC+jjgHibnzg8IllVcH+K2TLmYHLPME=",
+        "lastModified": 1750403547,
+        "narHash": "sha256-XDDINMbHTtKQeSRpX5mwq20z23Wg/I/G4JUinA3V8Xg=",
        "owner": "Jovian-Experiments",
        "repo": "Jovian-NixOS",
-        "rev": "e2f4ced874406541a7957f7e2b8f05a0d59a0f00",
+        "rev": "52b86b86d925ec00c836ecc6d36f9c947bb15736",
        "type": "github"
      },
      "original": {
@ -507,11 +507,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1749847109,
-        "narHash": "sha256-9i/A5yrjyYT63YZ6wOxOFru/kzQPIKZVSVWS1Clerr4=",
+        "lastModified": 1750816932,
+        "narHash": "sha256-93dN5ieDQ1VTUCbTCf2WHogjUu3pPk9iLmCQpdQk6R0=",
        "owner": "fufexan",
        "repo": "nix-gaming",
-        "rev": "9a9f441bb894ee929e93596f0dc0f23c3d9a7532",
+        "rev": "b630fd69c213f3a92ef799ba8169ed2926731c0f",
        "type": "github"
      },
      "original": {
@ -545,11 +545,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1748190013,
-        "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=",
+        "lastModified": 1750741721,
+        "narHash": "sha256-Z0djmTa1YmnGMfE9jEe05oO4zggjDmxOGKwt844bUhE=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "62b852f6c6742134ade1abdd2a21685fd617a291",
+        "rev": "4b1164c3215f018c4442463a27689d973cffd750",
        "type": "github"
      },
      "original": {
@ -576,11 +576,11 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1749727998,
-        "narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=",
+        "lastModified": 1750622754,
+        "narHash": "sha256-kMhs+YzV4vPGfuTpD3mwzibWUE6jotw5Al2wczI0Pv8=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd",
+        "rev": "c7ab75210cb8cb16ddd8f290755d9558edde7ee1",
        "type": "github"
      },
      "original": {
@ -592,11 +592,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1749794982,
-        "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=",
+        "lastModified": 1750741721,
+        "narHash": "sha256-Z0djmTa1YmnGMfE9jEe05oO4zggjDmxOGKwt844bUhE=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81",
+        "rev": "4b1164c3215f018c4442463a27689d973cffd750",
        "type": "github"
      },
      "original": {
@ -608,11 +608,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1749794982,
-        "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=",
+        "lastModified": 1750741721,
+        "narHash": "sha256-Z0djmTa1YmnGMfE9jEe05oO4zggjDmxOGKwt844bUhE=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81",
+        "rev": "4b1164c3215f018c4442463a27689d973cffd750",
        "type": "github"
      },
      "original": {
@ -746,11 +746,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1750214276,
-        "narHash": "sha256-1kniuhH70q4TAC/xIvjFYH46aHiLrbIlcr6fdrRwO1A=",
+        "lastModified": 1750732748,
+        "narHash": "sha256-HR2b3RHsPeJm+Fb+1ui8nXibgniVj7hBNvUbXEyz0DU=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "f9b2b2b1327ff6beab4662b8ea41689e0a57b8d4",
+        "rev": "4b4494b2ba7e8a8041b2e28320b2ee02c115c75f",
        "type": "github"
      },
      "original": {
@ -866,11 +866,11 @@
        "tinted-zed": "tinted-zed"
      },
      "locked": {
-        "lastModified": 1749905587,
-        "narHash": "sha256-sZpQM+InPCYwJQiTxs/PCCupwbYNaSCFi2Hvpl1/pOo=",
+        "lastModified": 1750810405,
+        "narHash": "sha256-7Aa6jLbbltPVBCz34UXjIXkmrV1qq+6TYhJ37fErQhg=",
        "owner": "danth",
        "repo": "stylix",
-        "rev": "77a8b26520f48305f3b1bacffaa8740dde8afa2a",
+        "rev": "1fc22894545f5adf915e245b3c3e92639fd70f64",
        "type": "github"
      },
      "original": {
@ -1113,11 +1113,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1729422940,
-        "narHash": "sha256-DlvJv33ml5UTKgu4b0HauOfFIoDx6QXtbqUF3vWeRCY=",
+        "lastModified": 1750353031,
+        "narHash": "sha256-Bx7DOPLhkr8Z60U9Qw4l0OidzHoqLDKQH5rDV5ef59A=",
        "owner": "nix-community",
        "repo": "nixos-vscode-server",
-        "rev": "8b6db451de46ecf9b4ab3d01ef76e59957ff549f",
+        "rev": "4ec4859b12129c0436b0a471ed1ea6dd8a317993",
        "type": "github"
      },
      "original": {
@ -1134,11 +1134,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1748932406,
-        "narHash": "sha256-KcZKPfLL7Bcjps60+JJEsiJLkOkes3wdR+bJxR27I3s=",
+        "lastModified": 1750129774,
+        "narHash": "sha256-3r/9KDvmciXiM12xBTPoC2YqIMJX7XlkrNSa6lNvfrc=",
        "ref": "refs/heads/main",
-        "rev": "71ffb0166eaa71df9149fe9a293cf75d238bbe30",
-        "revCount": 14,
+        "rev": "eb39f490a252ac063746d093ac71e73327c5de27",
+        "revCount": 15,
        "type": "git",
        "url": "https://git.ryot.foo/toph/yay.nix.git"
      },
@ -1154,11 +1154,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1749874024,
-        "narHash": "sha256-bFNesH4+qRcsA/bL+HT4ep1rNkn1A1AZ2RmlZlETwlw=",
+        "lastModified": 1750219862,
+        "narHash": "sha256-wce+erYDBm6wpLJm6IJh85KYqy/NtdKp6DZQCn4YP1Q=",
        "owner": "youwen5",
        "repo": "zen-browser-flake",
-        "rev": "d3d3c12550f1d4196bd7f2971c65ffde2bd92a07",
+        "rev": "18d6cd2f5a9cd1527d478d4f716e9b9ee6fb6cbb",
        "type": "github"
      },
      "original": {
--- a/home/global/common/gaming/gamescope.nix
+++ b/home/global/common/gaming/gamescope.nix
@ -130,7 +130,7 @@ let
    # This script wraps the original steam command to launch it
    # with gamescope-run in a big picture mode.
    # All arguments passed to this script are forwarded.
-    exec ${lib.getExe gamescope-run} -x "-e" ${lib.getExe pkgs.steam} -tenfoot -steamdeck -gamepadui $argv
+    exec ${lib.getExe gamescope-run} -x "-e" ${lib.getExe pkgs.steam} -tenfoot $argv
  '';

  ## Ensures that all Lutris game launches go through Gamescope
@ -150,76 +150,76 @@ in
    lutris-wrapper
  ];

-  xdg.desktopEntries =
-    let
-      steamBigPictureCmd = ''${lib.getExe gamescope-run} -x "-e" ${lib.getExe pkgs.steam} -tenfoot -steamdeck'';
-      heroicGamescopeCmd = ''${lib.getExe gamescope-run} -x "--force-windows-fullscreen" ${lib.getExe pkgs.heroic}'';
-    in
-    {
-      steam = {
-        name = "Steam";
-        comment = "Steam Big Picture in Gamescope Session";
-        exec = steamBigPictureCmd;
-        icon = "steam";
-        type = "Application";
-        terminal = false;
-        categories = [ "Game" ];
-        mimeType = [
-          "x-scheme-handler/steam"
-          "x-scheme-handler/steamlink"
-        ];
-        settings = {
-          StartupNotify = "true";
-          StartupWMClass = "Steam";
-          PrefersNonDefaultGPU = "true";
-          X-KDE-RunOnDiscreteGpu = "true";
-          Keywords = "gaming;";
-        };
-        actions = {
-          bigpicture = {
-            name = "Steam Client (No Gamescope)";
-            exec = "${lib.getExe pkgs.steam}";
-          };
-        };
+  xdg.desktopEntries = {
+    steam = {
+      name = "Steam";
+      comment = "Steam Big Picture in Gamescope Session";
+      exec = "${lib.getExe steam-wrapper}";
+      icon = "steam";
+      type = "Application";
+      terminal = false;
+      categories = [ "Game" ];
+      mimeType = [
+        "x-scheme-handler/steam"
+        "x-scheme-handler/steamlink"
+      ];
+      settings = {
+        StartupNotify = "true";
+        StartupWMClass = "Steam";
+        PrefersNonDefaultGPU = "true";
+        X-KDE-RunOnDiscreteGpu = "true";
+        Keywords = "gaming;";
      };
-
-      "com.heroicgameslauncher.hgl" = {
-        name = "Heroic Games Launcher";
-        comment = "Heroic in Gamescope Session";
-        exec = heroicGamescopeCmd;
-        icon = "com.heroicgameslauncher.hgl";
-        type = "Application";
-        terminal = false;
-        categories = [ "Game" ];
-        actions = {
-          regular = {
-            name = "Heroic (No Gamescope)";
-            exec = "${lib.getExe pkgs.heroic}";
-          };
-        };
-      };
-
-      "net.lutris.Lutris" = {
-        name = "Lutris";
-        comment = "Video Game Preservation Platform";
-        exec = "${lib.getExe pkgs.lutris} %U";
-        icon = "net.lutris.Lutris";
-        type = "Application";
-        terminal = false;
-        categories = [ "Game" ];
-        mimeType = [ "x-scheme-handler/lutris" ];
-        settings = {
-          StartupNotify = "true";
-          StartupWMClass = "Lutris";
-          Keywords = "gaming;wine;emulator;";
-          X-GNOME-UsesNotifications = "true";
-        };
-        actions = {
-          regular = {
-            name = "Lutris (Gamescope BROKEN)";
-            exec = ''${lib.getExe gamescope-run} -x "--force-windows-fullscreen --expose-wayland" ${lib.getExe pkgs.lutris} %U'';
-          };
+      actions = {
+        bigpicture = {
+          name = "Steam Client (No Gamescope)";
+          exec = "${lib.getExe pkgs.steam}";
        };
      };
    };
+
+    "com.heroicgameslauncher.hgl" = {
+      name = "Heroic Games Launcher";
+      comment = "Heroic in Gamescope Session";
+      exec = ''${lib.getExe gamescope-run} -x "--force-windows-fullscreen" ${lib.getExe pkgs.heroic}'';
+      icon = "com.heroicgameslauncher.hgl";
+      type = "Application";
+      terminal = false;
+      categories = [ "Game" ];
+      actions = {
+        regular = {
+          name = "Heroic (No Gamescope)";
+          exec = "${lib.getExe pkgs.heroic}";
+        };
+      };
+    };
+
+    "net.lutris.Lutris" = {
+      name = "Lutris";
+      comment = "Video Game Preservation Platform";
+      exec = "${lib.getExe pkgs.lutris} %U";
+      icon = "net.lutris.Lutris";
+      type = "Application";
+      terminal = false;
+      categories = [ "Game" ];
+      mimeType = [ "x-scheme-handler/lutris" ];
+      settings = {
+        StartupNotify = "true";
+        StartupWMClass = "Lutris";
+        Keywords = "gaming;wine;emulator;";
+        X-GNOME-UsesNotifications = "true";
+      };
+      actions = {
+        broken = {
+          name = "Lutris (Gamescope BROKEN)";
+          exec = ''${lib.getExe gamescope-run} -x "--force-windows-fullscreen" ${lib.getExe pkgs.lutris}'';
+        };
+
+        broken-exposed = {
+          name = "Lutris (Gamescope BROKEN; Exposed Wayland)";
+          exec = ''${lib.getExe gamescope-run} -x "--force-windows-fullscreen --expose-wayland" ${lib.getExe pkgs.lutris}'';
+        };
+      };
+    };
+  };
 }
--- a/home/hosts/gojo/default.nix
+++ b/home/hosts/gojo/default.nix
@ -34,7 +34,7 @@

      ## Social ##
      betterdiscordctl
-      discord
+      discord-krisp
      telegram-desktop

      ## Tools ##
--- a/home/hosts/haze/config/default.nix
+++ b/home/hosts/haze/config/default.nix
@ -2,11 +2,28 @@
 {
  imports = lib.custom.scanPaths ./.;

-  # home.file.".config/monitors_source" = {
-  #   source = ./monitors.xml;
-  #   onChange = ''
-  #     cp $HOME/.config/monitors_source $HOME/.config/monitors.xml
-  #     chmod 755 $HOME/.config/monitors.xml
-  #   '';
-  # };
+  monitors = [
+    {
+      name = "DP-2";
+      primary = true;
+      width = 2560;
+      height = 1440;
+      refreshRate = 160;
+      x = 0;
+      y = 0;
+      scale = 1.0;
+      transform = 0;
+      enabled = true;
+      hdr = true;
+      vrr = true;
+    }
+  ];
+
+  home.file.".config/monitors_source" = {
+    source = ./monitors.xml;
+    onChange = ''
+      cp $HOME/.config/monitors_source $HOME/.config/monitors.xml
+      chmod 755 $HOME/.config/monitors.xml
+    '';
+  };
 }
--- a/home/hosts/haze/default.nix
+++ b/home/hosts/haze/default.nix
@ -28,7 +28,7 @@

      ## Social ##
      telegram-desktop
-      discord
+      discord-krisp
      betterdiscordctl

      ## Tools ##
--- a/home/hosts/rune/config/default.nix
+++ b/home/hosts/rune/config/default.nix
@ -36,7 +36,7 @@
      primary = true;
      width = 3840;
      height = 2160;
-      refreshRate = 60;
+      refreshRate = 120;
      x = 0;
      y = 0;
      scale = 1.0;
--- a/home/hosts/rune/default.nix
+++ b/home/hosts/rune/default.nix
@ -30,7 +30,7 @@

      ## Social ##
      telegram-desktop
-      discord
+      discord-krisp
      betterdiscordctl

      ## Tools ##
--- a/hosts/global/common/gnome.nix
+++ b/hosts/global/common/gnome.nix
@ -6,44 +6,50 @@
 }:
 {
  ## DE ##
-  services.desktopManager.gnome = {
-    enable = true;
-    extraGSettingsOverridePackages = [ pkgs.mutter ];
-    extraGSettingsOverrides = ''
-      [org.gnome.mutter]
-      experimental-features=['scale-monitor-framebuffer']
-    '';
-  };
-
-  services.displayManager = {
-    gdm = {
+  services = {
+    desktopManager.gnome = {
      enable = true;
-      wayland = true;
+      extraGSettingsOverridePackages = [ pkgs.mutter ];
+      extraGSettingsOverrides = ''
+        [org.gnome.mutter]
+        experimental-features=['scale-monitor-framebuffer']
+      '';
    };

-    # Set the custom session as default
-    defaultSession = lib.mkForce "gnome";
+    # hosts/global/core/ssh.nix handles this
+    gnome.gcr-ssh-agent.enable = false;

-    autoLogin = {
-      enable = true;
-      user = config.hostSpec.username;
-    };
-  };
+    displayManager = {
+      gdm = {
+        enable = true;
+        wayland = true;
+      };

-  # Configure keyboard layout for Wayland
-  services.xserver = {
-    enable = false;
-    xkb = {
-      layout = "us";
-      variant = "";
+      # Set the custom session as default
+      defaultSession = lib.mkForce "gnome";
+
+      autoLogin = {
+        enable = true;
+        user = config.hostSpec.username;
+      };
    };
+
+    # Configure keyboard layout for Wayland
+    xserver = {
+      enable = false;
+      xkb = {
+        layout = "us";
+        variant = "";
+      };
+    };
+
+    udev.packages = with pkgs; [ gnome-settings-daemon ];
  };

  #INFO: Fix for autoLogin
  systemd.services."getty@tty1".enable = false;
  systemd.services."autovt@tty1".enable = false;

-  services.udev.packages = with pkgs; [ gnome-settings-daemon ];
  environment.systemPackages = with pkgs; [
    gnome-tweaks
    gnomeExtensions.alphabetical-app-grid
--- a/hosts/x86/rune/hardware.nix
+++ b/hosts/x86/rune/hardware.nix
@ -43,6 +43,11 @@
      ];
      kernelModules = [ ];
    };
+
+    # Workaround for boot issues
+    kernelParams = [
+      "amdgpu.dcdebugmask=0x10"
+    ];
    kernelModules = [
      "kvm-amd"
      "amdgpu"
--- a/overlays/default.nix
+++ b/overlays/default.nix
@ -16,9 +16,16 @@ let
  linuxModifications = final: prev: prev.lib.mkIf final.stdenv.isLinux { };

  modifications = final: prev: {
-    # example = prev.example.overrideAttrs (oldAttrs: let ... in {
-    # ...
-    # });
+    ## FIXME: Workaround, amd drivers are borked on current nixpkgs-unstable
+    linux-firmware = prev.linux-firmware.overrideAttrs (old: rec {
+      version = "20250625";
+      src = prev.fetchFromGitLab {
+        owner = "kernel-firmware";
+        repo = "linux-firmware";
+        rev = "b05fabcd6f2a16d50b5f86c389dde7a33f00bb81";
+        hash = "sha256-AvSsyfKP57Uhb3qMrf6PpNHKbXhD9IvFT1kcz5J7khM=";
+      };
+    });
  };

  stable-packages = final: _prev: {
Author	SHA1	Message	Date
Chris Toph	3a9f295e43	Updated linux-firmware to latest main with updated amd drivers working Some checks failed Build NixOS ISOs (x86 only) / build-iso (x86, desktop) (push) Has been cancelled Details Build NixOS ISOs (x86 only) / build-iso (x86, server) (push) Has been cancelled Details Build NixOS ISOs (x86 only) / create-release (push) Has been cancelled Details	2025-06-25 17:03:26 -04:00
Chris Toph	56469c6e9c	Reorder GNOME configuration and disable gnome.gcr-ssh-agent	2025-06-25 16:06:15 -04:00
Chris Toph	e45982f91e	Replace 'discord' with 'discord-krisp'; update monitors for haze	2025-06-25 16:05:25 -04:00
Chris Toph	328d5f782e	Add kernel workarounds for amd boot issues	2025-06-25 15:59:27 -04:00
Chris Toph	38e3eccf22	flake update	2025-06-25 15:58:00 -04:00
Chris Toph	59e9543f3f	Removed -steamdeck flag in steam; Small code refactors/cleaning	2025-06-22 19:54:38 -04:00