bump flake.lock

nixos/flake.lock

@@ -327,11 +327,11 @@
       "locked": {
         "lastModified": 1,
         "narHash": "sha256-rADqSJu492bURPi5fmvPyeG1B5bV3k2hfGR+VfHn1Ig=",
-        "path": "/nix/store/s9ypyzhld942rdr1xawc4f643ab1jmdz-source/nixos/programs/shadps4",
+        "path": "/nix/store/1wdk50abjwp8dcz1zjp0ax95312q723w-source/nixos/programs/shadps4",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/s9ypyzhld942rdr1xawc4f643ab1jmdz-source/nixos/programs/shadps4",
+        "path": "/nix/store/1wdk50abjwp8dcz1zjp0ax95312q723w-source/nixos/programs/shadps4",
         "type": "path"
       }
     },

nixos/home-manager/nixos.nix

@@ -17,6 +17,7 @@
     ./packages/game-extras.nix
     ./packages/emulation.nix
     ./packages/wine.nix
+    ./packages/virtualisation.nix
     ./packages/video-capture.nix
     ./packages/video-prod.nix
 

nixos/home-manager/nixos/packages.nix

@@ -2,7 +2,6 @@
   config,
   pkgs,
   unstable,
-  gsr-ui,
   inputs,
   ...
 }:

nixos/home-manager/packages/common-desktop.nix

@@ -34,6 +34,7 @@ in
       # === Communication ===
       pkgs.vesktop
       pkgs.discord-canary
+      pkgs.discord
       pkgs.signal-desktop
       pkgs.telegram-desktop
       # pkgs.thunderbird-latest-unwrapped
@@ -49,7 +50,7 @@ in
       # === Editors/Office ===
 
       # === Media ===
-      unstable.gimp
+      # unstable.gimp
       unstable.krita
       unstable.mpv
       unstable.losslesscut-bin

nixos/home-manager/packages/video-capture.nix

@@ -4,6 +4,7 @@
   unstable,
   inputs,
   lib,
+  gsr-ui,
   ...
 }:
 

nixos/home-manager/packages/wine.nix

@@ -17,13 +17,12 @@ let
     '';
 in
 {
+  home.file."bin/wine".source = unstable.wineWowPackages.waylandFull;
 
   home.packages =
     with unstable;
     with inputs;
     [
-      home.file."bin/wine".source = unstable.wineWowPackages.waylandFull;
-      
       unstable.wineWowPackages.waylandFull
       unstable.winetricks
     ];

nixos/hosts/nixos/hardware-configuration.nix

@@ -189,13 +189,20 @@
   # networking.interfaces.enp6s0.useDHCP = lib.mkDefault true;
   # networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true;
 
-  systemd.network.enable = true;
+
+  networking.useNetworkd = true;
+  networking.useDHCP = false;
+  networking.interfaces.enp4s0.useDHCP = true;
+  networking.interfaces.enp6s0.useDHCP = true;
+  networking.interfaces.tailscale0.useDHCP = false;
+  networking.nftables.enable = true;
 
   networking.nameservers = [
     "1.1.1.1#one.one.one.one"
     "1.0.0.1#one.one.one.one"
   ];
 
+  # systemd.network.enable = false;
   systemd.network.networks."10-wan" = {
     # match the interface by name
     matchConfig.Name = "enp4s0";

nixos/hosts/nixos/services.nix

@@ -54,7 +54,11 @@
       };
     };
 
-    tailscale.enable = true;
+    tailscale = {
+      enable = true;
+      useRoutingFeatures = "both";
+      package = unstable.tailscale;
+    };
 
     # tailscale.extraSetFlags = [
     #   "--advertise-exit-node"
@@ -63,8 +67,8 @@
 
     resolved = {
       enable = true;
-      dnssec = "true";
-      domains = [ "~." ];
+      # dnssec = "true";
+      # domains = [ "~." ];
       fallbackDns = [
         "1.1.1.1#one.one.one.one"
         "1.0.0.1#one.one.one.one"
@@ -72,8 +76,6 @@
       dnsovertls = "true";
     };
 
-
-
     # blocky = {
     #   enable = true;
     #   settings = {