diff --git a/nixos/flake.lock b/nixos/flake.lock index 6dc5bf7..14ac12f 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -327,11 +327,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-rADqSJu492bURPi5fmvPyeG1B5bV3k2hfGR+VfHn1Ig=", - "path": "/nix/store/1wdk50abjwp8dcz1zjp0ax95312q723w-source/nixos/programs/shadps4", + "path": "/nix/store/s9ypyzhld942rdr1xawc4f643ab1jmdz-source/nixos/programs/shadps4", "type": "path" }, "original": { - "path": "/nix/store/1wdk50abjwp8dcz1zjp0ax95312q723w-source/nixos/programs/shadps4", + "path": "/nix/store/s9ypyzhld942rdr1xawc4f643ab1jmdz-source/nixos/programs/shadps4", "type": "path" } }, diff --git a/nixos/home-manager/nixos.nix b/nixos/home-manager/nixos.nix index e21e420..5ed8030 100644 --- a/nixos/home-manager/nixos.nix +++ b/nixos/home-manager/nixos.nix @@ -17,7 +17,6 @@ ./packages/game-extras.nix ./packages/emulation.nix ./packages/wine.nix - ./packages/virtualisation.nix ./packages/video-capture.nix ./packages/video-prod.nix diff --git a/nixos/home-manager/nixos/packages.nix b/nixos/home-manager/nixos/packages.nix index cdca625..9ba04ff 100644 --- a/nixos/home-manager/nixos/packages.nix +++ b/nixos/home-manager/nixos/packages.nix @@ -2,6 +2,7 @@ config, pkgs, unstable, + gsr-ui, inputs, ... }: diff --git a/nixos/home-manager/packages/common-desktop.nix b/nixos/home-manager/packages/common-desktop.nix index 8c02e3b..102b506 100644 --- a/nixos/home-manager/packages/common-desktop.nix +++ b/nixos/home-manager/packages/common-desktop.nix @@ -34,7 +34,6 @@ in # === Communication === pkgs.vesktop pkgs.discord-canary - pkgs.discord pkgs.signal-desktop pkgs.telegram-desktop # pkgs.thunderbird-latest-unwrapped @@ -50,7 +49,7 @@ in # === Editors/Office === # === Media === - # unstable.gimp + unstable.gimp unstable.krita unstable.mpv unstable.losslesscut-bin diff --git a/nixos/home-manager/packages/video-capture.nix b/nixos/home-manager/packages/video-capture.nix index 72cfae5..11b1fe8 100644 --- a/nixos/home-manager/packages/video-capture.nix +++ b/nixos/home-manager/packages/video-capture.nix @@ -4,7 +4,6 @@ unstable, inputs, lib, - gsr-ui, ... }: diff --git a/nixos/home-manager/packages/wine.nix b/nixos/home-manager/packages/wine.nix index e4f6e4d..b5709b7 100644 --- a/nixos/home-manager/packages/wine.nix +++ b/nixos/home-manager/packages/wine.nix @@ -17,12 +17,13 @@ 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 ]; diff --git a/nixos/hosts/nixos/hardware-configuration.nix b/nixos/hosts/nixos/hardware-configuration.nix index 98bd912..1eb57b7 100644 --- a/nixos/hosts/nixos/hardware-configuration.nix +++ b/nixos/hosts/nixos/hardware-configuration.nix @@ -189,20 +189,13 @@ # networking.interfaces.enp6s0.useDHCP = lib.mkDefault true; # networking.interfaces.wlp5s0.useDHCP = lib.mkDefault 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; + systemd.network.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 d82103f..cd01a2f 100644 --- a/nixos/hosts/nixos/services.nix +++ b/nixos/hosts/nixos/services.nix @@ -54,11 +54,7 @@ }; }; - tailscale = { - enable = true; - useRoutingFeatures = "both"; - package = unstable.tailscale; - }; + tailscale.enable = true; # tailscale.extraSetFlags = [ # "--advertise-exit-node" @@ -67,8 +63,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" @@ -76,6 +72,8 @@ dnsovertls = "true"; }; + + # blocky = { # enable = true; # settings = {