factorio prep and reorg

etcnixos/common.nix

@@ -181,6 +181,11 @@
     enableSSHSupport = false;
   };
 
+  programs.steam = {
+    enable = true;
+    localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
+  };
+
   #System packages
   environment.systemPackages = with pkgs; [
     mullvad-vpn

etcnixos/system-nixos.nix

@@ -107,10 +107,7 @@
   };
 
   programs.steam = {
-    enable = true;
     remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
-    # dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
-    localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
   };
 
   # services.ollama = {

home-manager/flake.lock

@@ -205,11 +205,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1729184663,
-        "narHash": "sha256-uNyi5vQrzaLkt4jj6ZEOs4+4UqOAwP6jFG2s7LIDwIk=",
+        "lastModified": 1729218602,
+        "narHash": "sha256-KDmYxpkFWa0Go0WnOpkgQOypVaQxbwgpEutET5ey1VQ=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "16fb78d443c1970dda9a0bbb93070c9d8598a925",
+        "rev": "9051466c82b9b3a6ba9e06be99621ad25423ec94",
         "type": "github"
       },
       "original": {

home-manager/flake.nix

@@ -73,6 +73,7 @@
             optimizeWithFlags
             ;
         };
+
         modules = [
           ./system-${hostname}.nix
           niri.homeModules.config
@@ -83,6 +84,7 @@
             {
               nixpkgs.overlays = [
                 rust-overlay.overlays.default
+                inputs.niri.overlays.niri
               ];
 
               # home-manager stuff

home-manager/progs/niri.nix

@@ -2,8 +2,12 @@
   config,
   pkgs,
   homeDirectory,
+  ...
 }:
 {
+  programs.niri = {
+    package = pkgs.niri-unstable;
+    settings = {
       prefer-no-csd = true;
 
       spawn-at-startup = [
@@ -20,6 +24,8 @@
             "${homeDirectory}/.wallpaper.png"
           ];
         }
+
+        { command = [ "${pkgs.xwayland-satellite-unstable}/bin/xwayland-satellite" ]; }
       ];
 
       window-rules = [
@@ -164,4 +170,6 @@
         "Mod+Shift+F".action = fullscreen-window;
         "Mod+C".action = center-column;
       };
+    };
+  };
 }

home-manager/system-mreow.nix

@@ -6,7 +6,10 @@
   ...
 }:
 {
-  imports = [ ./gui.nix ];
+  imports = [
+    ./gui.nix
+    ./progs/niri.nix
+  ];
 
   home.packages = with pkgs; [
     wdisplays
@@ -16,7 +19,7 @@
     # manage bluetooth devices
     blueman
 
-    niri
+    xwayland-satellite-unstable
   ];
 
   # bluetooth manager
@@ -28,11 +31,6 @@
     package = pkgs.dunst;
   };
 
-  # window manager
-  programs.niri = {
-    settings = import ./progs/niri.nix { inherit config pkgs homeDirectory; };
-  };
-
   programs.swaylock = {
     enable = true;
     settings = import ./progs/swaylock.nix;