steam changes

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/flake.lock

@@ -303,16 +303,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1728888510,
-        "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
+        "lastModified": 1729251725,
+        "narHash": "sha256-KmIA2i7s3jcVQWgUt6wqY9/5DkIp9uxsVhcwUxSnKHY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
+        "rev": "babe2c97edf3750d3924c1c5eaa1fe94ac94e8d8",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "master",
         "repo": "nixpkgs",
         "type": "github"
       }

etcnixos/flake.nix

@@ -2,7 +2,9 @@
   description = "A simple NixOS flake";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs/master";
+
     lanzaboote = {
       url = "github:nix-community/lanzaboote";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -38,16 +40,12 @@
       hostname = nixpkgs.lib.strings.removeSuffix "\n" (builtins.readFile /etc/hostname);
       system = "x86_64-linux";
 
-      # pkgs = import nixpkgs {
-      #   config.replaceStdenv = { pkgs }: pkgs.clangStdenv;
-      # };
       pkgs = import nixpkgs {
         config.allowUnfreePredicate =
           pkg:
           builtins.elem (nixpkgs.lib.getName pkg) [
+            "steam-unwrapped"
             "steam"
-            "steam-original"
-            "steam-run"
           ];
       };
     in

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

@@ -72,11 +72,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1729174520,
-        "narHash": "sha256-QxCAdgQdeIOaCiE0Sr23s9lD0+T1b/wuz5pSiGwNrCQ=",
+        "lastModified": 1729260213,
+        "narHash": "sha256-jAvHoU/1y/yCuXzr2fNF+q6uKmr8Jj2xgAisK4QB9to=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e78cbb20276f09c1802e62d2f77fc93ec32da268",
+        "rev": "09a0c0c02953318bf94425738c7061ffdc4cba75",
         "type": "github"
       },
       "original": {
@@ -98,11 +98,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1729189676,
-        "narHash": "sha256-oTvN+vxzOW+zzkmSnRUtItzismkOL+Z5kAU26Tf2HSE=",
+        "lastModified": 1729237583,
+        "narHash": "sha256-DmbzRBqTP+LIzyPkle92bN83GOjO02pPxW0OAL6yTsI=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "c547a861a5f968b0b783de5dbfad159303c6c19a",
+        "rev": "1ca158ad24664a2608d9fe5f6627274bb7c6e939",
         "type": "github"
       },
       "original": {
@@ -131,11 +131,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1729144746,
-        "narHash": "sha256-Ocq+8Kc4gp8PLPziHkMZN0F+HuCS9mbxusJHtFdKoP8=",
+        "lastModified": 1729235169,
+        "narHash": "sha256-SPlS9YtGRWUjZZZRXlimHbSho+0hfrqGycErlI9XVXk=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "8d08782eba427a46607a478d088744d023a292c3",
+        "rev": "dd8b2be044c6c67a1c9bf07f287b3967e958b8aa",
         "type": "github"
       },
       "original": {
@@ -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/borg.nix

@@ -7,7 +7,6 @@
         map (f: "${homeDirectory}/${f}") [
           ".zen"
           ".local/share/fish"
-          ".config/Signal"
           ".wallpaper.png"
           ".ssh"
 
@@ -17,6 +16,19 @@
           "school"
           "justfile"
         ]
+        ++ (map (f: ".config/Signal/${f}") [
+          "stickers.noindex"
+          "attachments.noindex"
+          "downloads.noindex"
+          "drafts.noindex"
+          "sql"
+          "IndexedDB"
+          "Local Storage"
+          "SharedStorage"
+          "config.json"
+          "ephemeral.json"
+          "Preferences"
+        ])
       );
 
       excludeHomeManagerSymlinks = true;

home-manager/progs/niri.nix

@@ -2,10 +2,18 @@
   config,
   pkgs,
   homeDirectory,
+  ...
 }:
 {
+  programs.niri = {
+    package = pkgs.niri-unstable;
+    settings = {
       prefer-no-csd = true;
 
+      environment = {
+        DISPLAY = ":0";
+      };
+
       spawn-at-startup = [
         # waybar
         { command = [ "${pkgs.waybar}/bin/waybar" ]; }
@@ -20,6 +28,13 @@
             "${homeDirectory}/.wallpaper.png"
           ];
         }
+
+        {
+          command = [
+            "${pkgs.xwayland-satellite-unstable}/bin/xwayland-satellite"
+            (builtins.toString config.programs.niri.settings.environment.DISPLAY)
+          ];
+        }
       ];
 
       window-rules = [
@@ -164,4 +179,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,8 @@
     # manage bluetooth devices
     blueman
 
-    niri
+    # used by /etc/nixos logic to launch niri
+    config.programs.niri.package
   ];
 
   # bluetooth manager
@@ -28,11 +32,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;