From d8bb3a23107497ef636cfac058f983b027449972 Mon Sep 17 00:00:00 2001 From: BuyMyMojo Date: Sat, 5 Apr 2025 10:42:25 +1100 Subject: [PATCH 1/7] Fix wrong line location --- nixos/flake.lock | 4 ++-- nixos/home-manager/packages/wine.nix | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/nixos/flake.lock b/nixos/flake.lock index 14ac12f..33491cd 100644 --- a/nixos/flake.lock +++ b/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/x28k0pbv2f4nmx7d8dkisb0zi19vq6cl-source/nixos/programs/shadps4", "type": "path" }, "original": { - "path": "/nix/store/s9ypyzhld942rdr1xawc4f643ab1jmdz-source/nixos/programs/shadps4", + "path": "/nix/store/x28k0pbv2f4nmx7d8dkisb0zi19vq6cl-source/nixos/programs/shadps4", "type": "path" } }, diff --git a/nixos/home-manager/packages/wine.nix b/nixos/home-manager/packages/wine.nix index b5709b7..e4f6e4d 100644 --- a/nixos/home-manager/packages/wine.nix +++ b/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 ]; From b497dc790f9960a5aea791ab87ebcdec798113f7 Mon Sep 17 00:00:00 2001 From: BuyMyMojo Date: Sat, 5 Apr 2025 10:43:31 +1100 Subject: [PATCH 2/7] Fix missing gsr-ui input --- nixos/flake.lock | 4 ++-- nixos/home-manager/nixos/packages.nix | 1 - nixos/home-manager/packages/video-capture.nix | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/flake.lock b/nixos/flake.lock index 33491cd..56b24ab 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -327,11 +327,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-rADqSJu492bURPi5fmvPyeG1B5bV3k2hfGR+VfHn1Ig=", - "path": "/nix/store/x28k0pbv2f4nmx7d8dkisb0zi19vq6cl-source/nixos/programs/shadps4", + "path": "/nix/store/0ijaxggxca21kyv5qi8ndbmfnr8s40f7-source/nixos/programs/shadps4", "type": "path" }, "original": { - "path": "/nix/store/x28k0pbv2f4nmx7d8dkisb0zi19vq6cl-source/nixos/programs/shadps4", + "path": "/nix/store/0ijaxggxca21kyv5qi8ndbmfnr8s40f7-source/nixos/programs/shadps4", "type": "path" } }, diff --git a/nixos/home-manager/nixos/packages.nix b/nixos/home-manager/nixos/packages.nix index 9ba04ff..cdca625 100644 --- a/nixos/home-manager/nixos/packages.nix +++ b/nixos/home-manager/nixos/packages.nix @@ -2,7 +2,6 @@ config, pkgs, unstable, - gsr-ui, inputs, ... }: diff --git a/nixos/home-manager/packages/video-capture.nix b/nixos/home-manager/packages/video-capture.nix index 11b1fe8..72cfae5 100644 --- a/nixos/home-manager/packages/video-capture.nix +++ b/nixos/home-manager/packages/video-capture.nix @@ -4,6 +4,7 @@ unstable, inputs, lib, + gsr-ui, ... }: From 728f907bd2e56656e8f48f2386a313517d4f4808 Mon Sep 17 00:00:00 2001 From: BuyMyMojo Date: Sun, 6 Apr 2025 15:01:52 +1000 Subject: [PATCH 3/7] Fix missing virtualisation.nix import --- nixos/home-manager/nixos.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/home-manager/nixos.nix b/nixos/home-manager/nixos.nix index 5ed8030..e21e420 100644 --- a/nixos/home-manager/nixos.nix +++ b/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 From b63c98bde7a5aa4923ee7974ba3cf452590ead3a Mon Sep 17 00:00:00 2001 From: BuyMyMojo Date: Sun, 6 Apr 2025 15:02:14 +1000 Subject: [PATCH 4/7] Add base discord install for testing --- nixos/home-manager/packages/common-desktop.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/home-manager/packages/common-desktop.nix b/nixos/home-manager/packages/common-desktop.nix index 102b506..0c8ab63 100644 --- a/nixos/home-manager/packages/common-desktop.nix +++ b/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 From 855c05d027ef715a35a06baeaae37d2a3e96021f Mon Sep 17 00:00:00 2001 From: BuyMyMojo Date: Sun, 6 Apr 2025 15:02:28 +1000 Subject: [PATCH 5/7] Uninstall gimp, moving to flatpak to use 3.0.2 --- nixos/home-manager/packages/common-desktop.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/home-manager/packages/common-desktop.nix b/nixos/home-manager/packages/common-desktop.nix index 0c8ab63..8c02e3b 100644 --- a/nixos/home-manager/packages/common-desktop.nix +++ b/nixos/home-manager/packages/common-desktop.nix @@ -50,7 +50,7 @@ in # === Editors/Office === # === Media === - unstable.gimp + # unstable.gimp unstable.krita unstable.mpv unstable.losslesscut-bin From 31ccc723c834693d28a5ef7290a20250eb7819ac Mon Sep 17 00:00:00 2001 From: BuyMyMojo Date: Sun, 6 Apr 2025 15:03:04 +1000 Subject: [PATCH 6/7] Update networking to work with tailscale --- nixos/hosts/nixos/hardware-configuration.nix | 9 ++++++++- nixos/hosts/nixos/services.nix | 12 +++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/nixos/hosts/nixos/hardware-configuration.nix b/nixos/hosts/nixos/hardware-configuration.nix index 1eb57b7..98bd912 100644 --- a/nixos/hosts/nixos/hardware-configuration.nix +++ b/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"; diff --git a/nixos/hosts/nixos/services.nix b/nixos/hosts/nixos/services.nix index cd01a2f..d82103f 100644 --- a/nixos/hosts/nixos/services.nix +++ b/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 = { From d5eeaa2c78430699e60aaf29d6497bd0b4ca6c38 Mon Sep 17 00:00:00 2001 From: BuyMyMojo Date: Sun, 6 Apr 2025 15:03:10 +1000 Subject: [PATCH 7/7] bump flake.lock --- nixos/flake.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/flake.lock b/nixos/flake.lock index 56b24ab..6dc5bf7 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -327,11 +327,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-rADqSJu492bURPi5fmvPyeG1B5bV3k2hfGR+VfHn1Ig=", - "path": "/nix/store/0ijaxggxca21kyv5qi8ndbmfnr8s40f7-source/nixos/programs/shadps4", + "path": "/nix/store/1wdk50abjwp8dcz1zjp0ax95312q723w-source/nixos/programs/shadps4", "type": "path" }, "original": { - "path": "/nix/store/0ijaxggxca21kyv5qi8ndbmfnr8s40f7-source/nixos/programs/shadps4", + "path": "/nix/store/1wdk50abjwp8dcz1zjp0ax95312q723w-source/nixos/programs/shadps4", "type": "path" } },