diff --git a/components/gui/steam.nix b/components/gui/steam.nix index 34f4925..527127b 100644 --- a/components/gui/steam.nix +++ b/components/gui/steam.nix @@ -30,8 +30,8 @@ with lib; # for steam # --------- - hardware.opengl.driSupport = true; - hardware.opengl.driSupport32Bit = true; + hardware.graphics.enable = true; + hardware.graphics.enable32Bit = true; security.sudo.extraConfig = '' ${config.users.extraUsers.mainUser.name} ALL=(steam) NOPASSWD: ALL diff --git a/components/network/sshd/known-hosts-manual.nix b/components/network/sshd/known-hosts-manual.nix index bb49d5c..542b6f2 100644 --- a/components/network/sshd/known-hosts-manual.nix +++ b/components/network/sshd/known-hosts-manual.nix @@ -12,6 +12,7 @@ in "git.ingolf-wagner.de" "95.216.66.212" ]; + publicKey = publicKey "orbi"; }; }; diff --git a/components/network/sshd/known-hosts-zerotier.nix b/components/network/sshd/known-hosts-zerotier.nix index e1bbeaf..66ac93d 100644 --- a/components/network/sshd/known-hosts-zerotier.nix +++ b/components/network/sshd/known-hosts-zerotier.nix @@ -1,4 +1,6 @@ { lib, config, clanLib, ... }: +with lib; +with types; let machines = clanLib.allMachineNames; publicKey = clanLib.readFact "ssh.id_ed25519.pub"; @@ -19,5 +21,15 @@ let ); in { - services.openssh.knownHosts = knownHosts; + + options.components.network.zerotier = { + enable = mkOption { + type = bool; + default = false; # todo : properly set this + }; + }; + + config = mkIf config.components.network.zerotier.enable { + services.openssh.knownHosts = knownHosts; + }; } diff --git a/flake.lock b/flake.lock index 2f0e944..063386b 100644 --- a/flake.lock +++ b/flake.lock @@ -129,11 +129,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1718795284, - "narHash": "sha256-08b8Yz5v9gU7rKincP5u4hAHIfWQFz8KCC73bypSLe8=", + "lastModified": 1719344602, + "narHash": "sha256-/9ZvW4uB0cHjHBSS+O5mnCuHZJE/fCKWLUi2w72ZsUM=", "ref": "refs/heads/main", - "rev": "9bbf7f668a721217d58e28621d0f76e24f68bbb1", - "revCount": 3159, + "rev": "09f7cd7e12f4e3fc29bd507d5f566fcf1535e76c", + "revCount": 3224, "type": "git", "url": "https://git.clan.lol/clan/clan-core" }, @@ -172,11 +172,11 @@ ] }, "locked": { - "lastModified": 1717915259, - "narHash": "sha256-VsGPboaleIlPELHY5cNTrXK4jHVmgUra8uC6h7KVC5c=", + "lastModified": 1718846788, + "narHash": "sha256-9dtXYtEkmXoUJV+PGLqscqF7qTn4AIhAKpFWRFU2NYs=", "owner": "nix-community", "repo": "disko", - "rev": "1bbdb06f14e2621290b250e631cf3d8948e4d19b", + "rev": "e1174d991944a01eaaa04bc59c6281edca4c0e6e", "type": "github" }, "original": { @@ -386,11 +386,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1718788307, - "narHash": "sha256-SqiOz0sljM0GjyQEVinPXQxaGcbOXw5OgpCWGPgh/vo=", + "lastModified": 1719180626, + "narHash": "sha256-vZAzm5KQpR6RGple1dzmSJw5kPivES2heCFM+ZWkt0I=", "owner": "nix-community", "repo": "home-manager", - "rev": "d7830d05421d0ced83a0f007900898bdcaf2a2ca", + "rev": "6b1f90a8ff92e81638ae6eb48cd62349c3e387bb", "type": "github" }, "original": { @@ -507,11 +507,11 @@ ] }, "locked": { - "lastModified": 1716210724, - "narHash": "sha256-iqQa3omRcHGpWb1ds75jS9ruA5R39FTmAkeR3J+ve1w=", + "lastModified": 1718025593, + "narHash": "sha256-WZ1gdKq/9u1Ns/oXuNsDm+W0salonVA0VY1amw8urJ4=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "d14b286322c7f4f897ca4b1726ce38cb68596c94", + "rev": "35c20ba421dfa5059e20e0ef2343c875372bdcf3", "type": "github" }, "original": { @@ -522,11 +522,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1718883385, - "narHash": "sha256-nLKMEZc6im82lfSdVPIBwff8OEYLlGVPpcZPvtpOFx4=", + "lastModified": 1719322773, + "narHash": "sha256-BqPxtFwXrpJQDh65NOIHX99pz2rtIMshG9Mt2xnnc5c=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "0307a32b553f81056edd6455168c635aeda6743b", + "rev": "caabc425565bbd5c8640630b0bf6974961a49242", "type": "github" }, "original": { @@ -546,11 +546,11 @@ ] }, "locked": { - "lastModified": 1717770332, - "narHash": "sha256-NQmFHj0hTCUgnMAsaNTu6sNTRyo0rFQEe+/lVgV5yxU=", + "lastModified": 1718845599, + "narHash": "sha256-HbQ0iKohKJC5grC95HNjLxGPdgsc/BJgoENDYNbzkLo=", "owner": "nix-community", "repo": "nixos-images", - "rev": "72771bd35f4e19e32d6f652528483b5e07fc317b", + "rev": "c1e6a5f7b08f1c9993de1cfc5f15f838bf783b88", "type": "github" }, "original": { @@ -634,11 +634,11 @@ }, "nixpkgs-legacy_2311": { "locked": { - "lastModified": 1718811006, - "narHash": "sha256-0Y8IrGhRmBmT7HHXlxxepg2t8j1X90++qRN3lukGaIk=", + "lastModified": 1719122173, + "narHash": "sha256-aEMsNUtqSPwn6l+LIZ/rX++nCgun3E9M3uSZs6Rwb7w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "03d771e513ce90147b65fe922d87d3a0356fc125", + "rev": "906320ae02f769d13a646eb3605a9821df0d6ea2", "type": "github" }, "original": { @@ -650,11 +650,11 @@ }, "nixpkgs-legacy_2405": { "locked": { - "lastModified": 1718717462, - "narHash": "sha256-qddfQLMaWR2gxfEzUM/zFZVK6H1kTv9WBQSBQxbP3MU=", + "lastModified": 1719253556, + "narHash": "sha256-A/76RFUVxZ/7Y8+OMVL1Lc8LRhBxZ8ZE2bpMnvZ1VpY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "938aa157bbd6e3c6fd7dcb77998b1f92c2ad1631", + "rev": "fc07dc3bdf2956ddd64f24612ea7fc894933eb2e", "type": "github" }, "original": { @@ -678,11 +678,11 @@ }, "nixpkgs-unstable-small": { "locked": { - "lastModified": 1718867149, - "narHash": "sha256-TIrMD+RvbmqnSimPbDlOB/TLt0PndKfpvcYVrIdW4LY=", + "lastModified": 1719327525, + "narHash": "sha256-fPWiFM4aYbK9zGTt3KJ9CwX//iyElRiNHWNj2hk3i0E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3c0a455c13e900d15888509ba2218484fa967929", + "rev": "191a3fd9786d09c8d82e89ed68c4463e7be09b3e", "type": "github" }, "original": { @@ -694,11 +694,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1718530797, - "narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=", + "lastModified": 1718895438, + "narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b60ebf54c15553b393d144357375ea956f89e9a9", + "rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3", "type": "github" }, "original": { @@ -741,11 +741,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1718714799, - "narHash": "sha256-FUZpz9rg3gL8NVPKbqU8ei1VkPLsTIfAJ2fdAf5qjak=", + "lastModified": 1719254875, + "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e", + "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", "type": "github" }, "original": { @@ -787,11 +787,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1718816291, - "narHash": "sha256-wqQUoA6AW3gifOfEeBQVZ3ulropw0iXwmZRT0Ef2Kls=", + "lastModified": 1719146883, + "narHash": "sha256-DAyIfQgyqalov0DcEKRvDOUin7axELasaP6NCPt7UQA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5b75ddc9a3e93465bc939dcbacb281879b64b9ed", + "rev": "084f8df2f3ff80cdec6f515931036f63c5d2f36c", "type": "github" }, "original": { @@ -963,11 +963,11 @@ ] }, "locked": { - "lastModified": 1717902109, - "narHash": "sha256-OQTjaEZcByyVmHwJlKp/8SE9ikC4w+mFd3X0jJs6wiA=", + "lastModified": 1719111739, + "narHash": "sha256-kr2QzRrplzlCP87ddayCZQS+dhGW98kw2zy7+jUXtF4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f0922ad001829b400f0160ba85b47d252fa3d925", + "rev": "5e2e9421e9ed2b918be0a441c4535cfa45e04811", "type": "github" }, "original": { @@ -981,11 +981,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1718844164, - "narHash": "sha256-QUXWv6llKIQ5To2N24d9dRI78Hqfm9iFyhvmvlOICNo=", + "lastModified": 1719189969, + "narHash": "sha256-6MSZrWvXSvUKIr0iC9eSbQ09NSm+j1Oh4o9Gentu1CU=", "owner": "nix-community", "repo": "srvos", - "rev": "557ff94aa1b48a723f8fa16eb9e7a2e6de991682", + "rev": "4f314be1307c8d5f1fb3d882a67e09dbdf285850", "type": "github" }, "original": { @@ -1013,11 +1013,11 @@ ] }, "locked": { - "lastModified": 1718789425, - "narHash": "sha256-YJvgBThIUPeywoTjnFk+F73c0l2oaAENIrz2uldqb5A=", + "lastModified": 1719235398, + "narHash": "sha256-yccyHeuMUdbG/89Yi1ZSqx0XlpIKb0WQI+mAnTf/GJw=", "owner": "danth", "repo": "stylix", - "rev": "7dcab0711bfc103a1fb05ba643ee7a3bd309fbe4", + "rev": "7cdbd128172d7c4ec63f5073d49da5d0e7d6396c", "type": "github" }, "original": { @@ -1085,11 +1085,11 @@ ] }, "locked": { - "lastModified": 1717850719, - "narHash": "sha256-npYqVg+Wk4oxnWrnVG7416fpfrlRhp/lQ6wQ4DHI8YE=", + "lastModified": 1718522839, + "narHash": "sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "4fc1c45a5f50169f9f29f6a98a438fb910b834ed", + "rev": "68eb1dc333ce82d0ab0c0357363ea17c31ea1f81", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e130304..7be992b 100644 --- a/flake.nix +++ b/flake.nix @@ -141,6 +141,7 @@ "python-2.7.18.7" "python-2.7.18.8" "electron-27.3.11" # for logseq + "electron-28.3.3" # for logseq ]; overlays = [ (_self: _super: { @@ -218,6 +219,7 @@ # manual configs { clan.static-hosts.topLevelDomain = "bear"; + components.network.zerotier.enable = true; environment.systemPackages = [ clan-core.packages.${pkgs.system}.clan-cli (pkgs.writers.writeBashBin "zerotier-script-nodeid" '' diff --git a/machines/cherry/configuration.nix b/machines/cherry/configuration.nix index 775e816..64be479 100644 --- a/machines/cherry/configuration.nix +++ b/machines/cherry/configuration.nix @@ -137,9 +137,7 @@ }; # for congress and streaming - hardware.opengl = { - enable = true; - }; + hardware.graphics.enable = true; system.stateVersion = "23.11"; diff --git a/machines/chungus/configuration.nix b/machines/chungus/configuration.nix index 1b046bd..dcb6b29 100644 --- a/machines/chungus/configuration.nix +++ b/machines/chungus/configuration.nix @@ -71,15 +71,15 @@ networking.hostName = "chungus"; - hardware.opengl = { - enable = true; - extraPackages = with pkgs; [ - intel-media-driver # LIBVA_DRIVER_NAME=iHD - vaapiIntel # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium) - vaapiVdpau - libvdpau-va-gl - ]; - }; + + hardware.graphics.enable = true; + hardware.graphics.enable32Bit = true; + hardware.graphics.extraPackages = with pkgs; [ + intel-media-driver # LIBVA_DRIVER_NAME=iHD + vaapiIntel # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium) + vaapiVdpau + libvdpau-va-gl + ]; # nix-shell -p speedtest_cli --run speedtest #configuration.fireqos = { diff --git a/machines/chungus/media-jellyfin.nix b/machines/chungus/media-jellyfin.nix index d07748f..055282e 100644 --- a/machines/chungus/media-jellyfin.nix +++ b/machines/chungus/media-jellyfin.nix @@ -6,11 +6,6 @@ group = "media"; user = "media"; }; - #hardware.opengl = { - # enable = true; - # driSupport = true; - # driSupport32Bit = true; - #}; services.nginx = { enable = true; diff --git a/machines/cream/configuration.nix b/machines/cream/configuration.nix index f2fb046..e08f6e1 100644 --- a/machines/cream/configuration.nix +++ b/machines/cream/configuration.nix @@ -131,9 +131,7 @@ }; # for congress and streaming - hardware.opengl = { - enable = true; - }; + hardware.graphics.enable = true; } diff --git a/machines/orbi/media-jellyfin.nix b/machines/orbi/media-jellyfin.nix index e5e47a3..63993a9 100644 --- a/machines/orbi/media-jellyfin.nix +++ b/machines/orbi/media-jellyfin.nix @@ -8,11 +8,8 @@ user = "media"; }; - hardware.opengl = { - enable = true; - driSupport = true; - driSupport32Bit = true; - }; + hardware.graphics.enable = true; + hardware.graphics.enable32Bit = true; services.nginx = let diff --git a/machines/sternchen/configuration.nix b/machines/sternchen/configuration.nix index be0f960..26dd070 100644 --- a/machines/sternchen/configuration.nix +++ b/machines/sternchen/configuration.nix @@ -61,13 +61,8 @@ #system.custom.suspend.enable = false; services.printing.enable = false; - # for congress and streaming - hardware.opengl = { - enable = true; - #extraPackages = [ pkgs.vaapiIntel ]; - driSupport = true; - driSupport32Bit = true; - }; + hardware.graphics.enable = true; + hardware.graphics.enable32Bit = true; services.displayManager.defaultSession = "plasma";