diff --git a/flake.lock b/flake.lock index a333df7..1f3d076 100644 --- a/flake.lock +++ b/flake.lock @@ -154,11 +154,11 @@ ] }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "type": "github" }, "original": { @@ -250,11 +250,11 @@ ] }, "locked": { - "lastModified": 1712390667, - "narHash": "sha256-ebq+fJZfobqpsAdGDGpxNWSySbQejRwW9cdiil6krCo=", + "lastModified": 1712759992, + "narHash": "sha256-2APpO3ZW4idlgtlb8hB04u/rmIcKA8O7pYqxF66xbNY=", "owner": "nix-community", "repo": "home-manager", - "rev": "b787726a8413e11b074cde42704b4af32d95545c", + "rev": "31357486b0ef6f4e161e002b6893eeb4fafc3ca9", "type": "github" }, "original": { @@ -271,11 +271,11 @@ ] }, "locked": { - "lastModified": 1711625603, - "narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=", + "lastModified": 1712645849, + "narHash": "sha256-67v20E0gH7nvAaMsah2oRIocnxGO25fATUyzQHIywxQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2", + "rev": "40a99619da804a78a0b166e5c6911108c059c3a8", "type": "github" }, "original": { @@ -350,11 +350,11 @@ }, "nixlib": { "locked": { - "lastModified": 1711846064, - "narHash": "sha256-cqfX0QJNEnge3a77VnytM0Q6QZZ0DziFXt6tSCV8ZSc=", + "lastModified": 1712450863, + "narHash": "sha256-K6IkdtMtq9xktmYPj0uaYc8NsIqHuaAoRBaMgu9Fvrw=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "90b1a963ff84dc532db92f678296ff2499a60a87", + "rev": "3c62b6a12571c9a7f65ab037173ee153d539905f", "type": "github" }, "original": { @@ -369,11 +369,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1712191720, - "narHash": "sha256-xXtSSnVHURHsxLQO30dzCKW5NJVGV/umdQPmFjPFMVA=", + "lastModified": 1712537332, + "narHash": "sha256-yYlxv1sg/TNl6hghjAe0ct+/p5PwXiT1mpuaExjhR88=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "0c15e76bed5432d7775a22e8d22059511f59d23a", + "rev": "d942db8df8ee860556a38754f15b8d03bf7e6933", "type": "github" }, "original": { @@ -436,11 +436,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1712310679, - "narHash": "sha256-XgC/a/giEeNkhme/AV1ToipoZ/IVm1MV2ntiK4Tm+pw=", + "lastModified": 1712588820, + "narHash": "sha256-y31s5idk3jMJMAVE4Ud9AdI7HT3CgTAeMTJ0StqKN7Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "72da83d9515b43550436891f538ff41d68eecc7f", + "rev": "d272ca50d1f7424fbfcd1e6f1c9e01d92f6da167", "type": "github" }, "original": { @@ -452,11 +452,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1711819797, - "narHash": "sha256-tNeB6emxj74Y6ctwmsjtMlzUMn458sBmwnD35U5KIM4=", + "lastModified": 1712437997, + "narHash": "sha256-g0whLLwRvgO2FsyhY8fNk+TWenS3jg5UdlWL4uqgFeo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2b4e3ca0091049c6fbb4908c66b05b77eaef9f0c", + "rev": "e38d7cb66ea4f7a0eb6681920615dfcc30fc2920", "type": "github" }, "original": { @@ -468,11 +468,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1712163089, - "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", + "lastModified": 1712608508, + "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", + "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6", "type": "github" }, "original": { @@ -484,11 +484,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1712090461, - "narHash": "sha256-PAfFp+YEKpkzwz6ruXQMvTa1puO4ySSu2G4Sp/jkCc8=", + "lastModified": 1712482522, + "narHash": "sha256-Ai/xNgZpbwGcw0TSXwEPwwbPi8Iu906sB9M9z3o6UgA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e976fa8f49c35cf28496301a1ef2aa23ad576b56", + "rev": "efe8ce06ca261f370d672def5b1e0be300c726e1", "type": "github" }, "original": { @@ -500,11 +500,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1712163089, - "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", + "lastModified": 1712608508, + "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", + "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6", "type": "github" }, "original": { @@ -516,11 +516,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1711715736, - "narHash": "sha256-9slQ609YqT9bT/MNX9+5k5jltL9zgpn36DpFB7TkttM=", + "lastModified": 1712420723, + "narHash": "sha256-VnG0Eu394Ga2FCe8Q66m6OEQF8iAqjDYsjmtl+N2omk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "807c549feabce7eddbf259dbdcec9e0600a0660d", + "rev": "9e7f26f82acb057498335362905fde6fea4ca50a", "type": "github" }, "original": { @@ -543,11 +543,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1712299511, - "narHash": "sha256-yrBK6Jq0UuJjP+nc01OFNoKRRJgPNkbmwPpE4mD2Bis=", + "lastModified": 1712741888, + "narHash": "sha256-G4HDgs27bwy6/snFHIhU4OZKWdFBHFuxDyCkYj2L9bw=", "owner": "nix-community", "repo": "nixvim", - "rev": "f285a958c089ccbca9c5710d4a075683fa1af654", + "rev": "ffa3020522e210fcae934f10440c24ea1d46f6ea", "type": "github" }, "original": { @@ -592,11 +592,11 @@ ] }, "locked": { - "lastModified": 1711760932, - "narHash": "sha256-DqUTQ2iAAqSDwMhKBqvi24v0Oc7pD3LCK/0FCG//TdA=", + "lastModified": 1712579741, + "narHash": "sha256-igpsH+pa6yFwYOdah3cFciCk8gw+ytniG9quf5f/q84=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "c11e43aed6f17336c25cd120eac886b96c455731", + "rev": "70f504012f0a132ac33e56988e1028d88a48855c", "type": "github" }, "original": { @@ -645,11 +645,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1711855048, - "narHash": "sha256-HxegAPnQJSC4cbEbF4Iq3YTlFHZKLiNTk8147EbLdGg=", + "lastModified": 1712617241, + "narHash": "sha256-a4hbls4vlLRMciv62YrYT/Xs/3Cubce8WFHPUDWwzf8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "99b1e37f9fc0960d064a7862eb7adfb92e64fa10", + "rev": "538c114cfdf1f0458f507087b1dcf018ce1c0c4c", "type": "github" }, "original": { @@ -695,11 +695,11 @@ ] }, "locked": { - "lastModified": 1712441665, - "narHash": "sha256-LHlzU7yQEkFEtPdV/sRe7mlM84noI+YBz7JHq1IG+/I=", + "lastModified": 1712462518, + "narHash": "sha256-JNG3Vt/IppoosOwfrq/Tj6MiFaCLtcfsvGRZQFI3zGk=", "ref": "refs/heads/main", - "rev": "cd9e41d4078a4afc13c6bccfad17d4e4a961d881", - "revCount": 10, + "rev": "cdd37dcf28f57073c8dd17be918b191da8c3864b", + "revCount": 11, "type": "git", "url": "https://git.sapphic.engineer/noe/tachikoma" }, diff --git a/nixos/features/nvidia-no-vrr.nix b/nixos/features/nvidia-no-vrr.nix new file mode 100644 index 0000000..8082209 --- /dev/null +++ b/nixos/features/nvidia-no-vrr.nix @@ -0,0 +1,23 @@ +{ pkgs, lib, ... }: +let + nvidia = config.hardware.nvidia.package; + vrr-off = pkgs.writeScriptBin "vrr-off" '' + #!/bin/sh + ${nvidia}/bin/nvidia-settings -a AllowVRR=0 + ''; +in { + config = { + systemd.user.services.vrr-off = { + description = "vrr-off"; + serviceConfig = { + ExecStart = "${vrr-off}/bin/vrr-off"; + Type = "oneshot"; + }; + wantedBy = [ "graphical-session.target" ]; + }; + }; + + services.xserver.displayManager.setupCommands = '' + ${vrr-off}/bin/vrr-off + ''; +} diff --git a/nixos/hosts/aerial/default.nix b/nixos/hosts/aerial/default.nix index 15eeb46..8384e76 100644 --- a/nixos/hosts/aerial/default.nix +++ b/nixos/hosts/aerial/default.nix @@ -7,6 +7,7 @@ ../../features/tailscale.nix ../../features/sound ../../features/nvidia.nix + ../../features/nvidia-no-vrr.nix ../../features/steam.nix ../../features/dns-cache.nix ../../features/podman.nix @@ -37,7 +38,7 @@ networking.firewall.allowedTCPPorts = [ 42069 8000 ]; networking.firewall.allowedUDPPorts = [ 42069 ]; - services.xserver.displayManager.setupCommands = '' - nvidia-settings -a AllowVRR=0 - ''; + # services.xserver.displayManager.setupCommands = '' + # nvidia-settings -a AllowVRR=0 + # ''; } diff --git a/nixos/hosts/nas0/default.nix b/nixos/hosts/nas0/default.nix index 63c4e5f..7d60bb7 100644 --- a/nixos/hosts/nas0/default.nix +++ b/nixos/hosts/nas0/default.nix @@ -14,8 +14,11 @@ networking.firewall.allowPing = true; networking.firewall.extraCommands = ''iptables -t raw -A OUTPUT -p udp -m udp --dport 137 -j CT --helper netbios-ns''; - users.groups.data = {}; + users.groups.data = { + gid = 994; + }; users.users.data = { + uid = 1001; isNormalUser = true; group = "data"; }; @@ -87,9 +90,10 @@ user = "data"; group = "data"; settings = { + server.listen = [ "0.0.0.0:4918" "[::]:4918" ]; location = [ { - route = [ "/public/*path" ]; + route = [ "/public(/*path)" ]; directory = "/mnt/storage/main/public"; handler = "filesystem"; methods = [ "webdav-ro" ]; @@ -99,4 +103,6 @@ ]; }; }; + + networking.firewall.allowedTCPPorts = [ 4918 ]; }