Merge remote-tracking branch 'origin/main'

flake.lock

@@ -210,6 +210,22 @@
       }
     },
     "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1709677081,
+        "narHash": "sha256-tix36Y7u0rkn6mTm0lA45b45oab2cFLqAzDbJxeXS+c=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "880992dcc006a5e00dd0591446fdf723e6a51a64",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-23.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable_2": {
       "locked": {
         "lastModified": 1704874635,
         "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=",
@@ -265,7 +281,7 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "nixpkgs-stable": "nixpkgs-stable"
+        "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
         "lastModified": 1708018599,
@@ -289,6 +305,7 @@
         "helix": "helix",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs_2",
+        "nixpkgs-stable": "nixpkgs-stable",
         "nixpkgsForIosevka": "nixpkgsForIosevka",
         "pre-commit-hooks": "pre-commit-hooks",
         "sops-nix": "sops-nix",

flake.nix

@@ -2,7 +2,7 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
 
-    # nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11";
+    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11";
 
     # I have this as a separate input so I don't rebuild the font every time I
     # want to upgrade nixpkgs

modules/nixos/troubleshooting-tools.nix

@@ -2,6 +2,6 @@
   environment.systemPackages = with pkgs; [
     pciutils
     usbutils
-    # ls-all-the-things
+    nmap
   ];
 }

nixos/foxtrot.nix

@@ -25,17 +25,20 @@ in {
   services.xserver.enable = true;
 
   programs.steam.enable = true;
+  programs.steam.gamescopeSession.enable = true;
+  # programs.steam.package = inputs.nixpkgs-stable.legacyPackages.${pkgs.system}.steam;
   programs.steam.remotePlay.openFirewall = true;
+  services.udev.packages = with pkgs; [steam];
 
   environment = {
     systemPackages = with pkgs; [
+      steam
       spotify
       discord
       slack
       godot_4
       fractal
       prismlauncher
-      variety # wallpaper switcher that I use with GNOME
       radeontop
       sops
       obs-studio
@@ -48,7 +51,7 @@ in {
       sway
       pass
       firefox-no-tabs
-      wallpaper-manager
+      # wallpaper-manager
       # hyprland
     ];