palo/nixos-config
palo/nixos-config
1
0
Fork 0
Code Issues Pull requests Actions Projects Releases Wiki Activity

upgrade

Browse source
This commit is contained in:
Ingolf Wagner 2024-06-26 03:00:17 +02:00
parent 6cd432662b
commit 159a1e2740
Signed by: palo
GPG key ID: 76BF5F1928B9618B
11 changed files with 82 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/gui/steam.nix
View file

@ -30,8 +30,8 @@ with lib;
# for steam # for steam
# --------- # ---------
hardware.opengl.driSupport = true; hardware.graphics.enable = true;
hardware.opengl.driSupport32Bit = true; hardware.graphics.enable32Bit = true;
security.sudo.extraConfig = '' security.sudo.extraConfig = ''
${config.users.extraUsers.mainUser.name} ALL=(steam) NOPASSWD: ALL ${config.users.extraUsers.mainUser.name} ALL=(steam) NOPASSWD: ALL

1
components/network/sshd/known-hosts-manual.nix
View file

@ -12,6 +12,7 @@ in
"git.ingolf-wagner.de" "git.ingolf-wagner.de"
"95.216.66.212" "95.216.66.212"
]; ];
publicKey = publicKey "orbi";
}; };
}; };

12
components/network/sshd/known-hosts-zerotier.nix
View file

@ -1,4 +1,6 @@
{ lib, config, clanLib, ... }: { lib, config, clanLib, ... }:
with lib;
with types;
let let
machines = clanLib.allMachineNames; machines = clanLib.allMachineNames;
publicKey = clanLib.readFact "ssh.id_ed25519.pub"; publicKey = clanLib.readFact "ssh.id_ed25519.pub";
@ -19,5 +21,15 @@ let
); );
in in
{ {
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; services.openssh.knownHosts = knownHosts;
};
} }

98
flake.lock
View file

@ -129,11 +129,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1718795284, "lastModified": 1719344602,
"narHash": "sha256-08b8Yz5v9gU7rKincP5u4hAHIfWQFz8KCC73bypSLe8=", "narHash": "sha256-/9ZvW4uB0cHjHBSS+O5mnCuHZJE/fCKWLUi2w72ZsUM=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "9bbf7f668a721217d58e28621d0f76e24f68bbb1", "rev": "09f7cd7e12f4e3fc29bd507d5f566fcf1535e76c",
"revCount": 3159, "revCount": 3224,
"type": "git", "type": "git",
"url": "https://git.clan.lol/clan/clan-core" "url": "https://git.clan.lol/clan/clan-core"
}, },
@ -172,11 +172,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717915259, "lastModified": 1718846788,
"narHash": "sha256-VsGPboaleIlPELHY5cNTrXK4jHVmgUra8uC6h7KVC5c=", "narHash": "sha256-9dtXYtEkmXoUJV+PGLqscqF7qTn4AIhAKpFWRFU2NYs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "1bbdb06f14e2621290b250e631cf3d8948e4d19b", "rev": "e1174d991944a01eaaa04bc59c6281edca4c0e6e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -386,11 +386,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1718788307, "lastModified": 1719180626,
"narHash": "sha256-SqiOz0sljM0GjyQEVinPXQxaGcbOXw5OgpCWGPgh/vo=", "narHash": "sha256-vZAzm5KQpR6RGple1dzmSJw5kPivES2heCFM+ZWkt0I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d7830d05421d0ced83a0f007900898bdcaf2a2ca", "rev": "6b1f90a8ff92e81638ae6eb48cd62349c3e387bb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -507,11 +507,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716210724, "lastModified": 1718025593,
"narHash": "sha256-iqQa3omRcHGpWb1ds75jS9ruA5R39FTmAkeR3J+ve1w=", "narHash": "sha256-WZ1gdKq/9u1Ns/oXuNsDm+W0salonVA0VY1amw8urJ4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "d14b286322c7f4f897ca4b1726ce38cb68596c94", "rev": "35c20ba421dfa5059e20e0ef2343c875372bdcf3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -522,11 +522,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1718883385, "lastModified": 1719322773,
"narHash": "sha256-nLKMEZc6im82lfSdVPIBwff8OEYLlGVPpcZPvtpOFx4=", "narHash": "sha256-BqPxtFwXrpJQDh65NOIHX99pz2rtIMshG9Mt2xnnc5c=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "0307a32b553f81056edd6455168c635aeda6743b", "rev": "caabc425565bbd5c8640630b0bf6974961a49242",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -546,11 +546,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717770332, "lastModified": 1718845599,
"narHash": "sha256-NQmFHj0hTCUgnMAsaNTu6sNTRyo0rFQEe+/lVgV5yxU=", "narHash": "sha256-HbQ0iKohKJC5grC95HNjLxGPdgsc/BJgoENDYNbzkLo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-images", "repo": "nixos-images",
"rev": "72771bd35f4e19e32d6f652528483b5e07fc317b", "rev": "c1e6a5f7b08f1c9993de1cfc5f15f838bf783b88",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -634,11 +634,11 @@
}, },
"nixpkgs-legacy_2311": { "nixpkgs-legacy_2311": {
"locked": { "locked": {
"lastModified": 1718811006, "lastModified": 1719122173,
"narHash": "sha256-0Y8IrGhRmBmT7HHXlxxepg2t8j1X90++qRN3lukGaIk=", "narHash": "sha256-aEMsNUtqSPwn6l+LIZ/rX++nCgun3E9M3uSZs6Rwb7w=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "03d771e513ce90147b65fe922d87d3a0356fc125", "rev": "906320ae02f769d13a646eb3605a9821df0d6ea2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -650,11 +650,11 @@
}, },
"nixpkgs-legacy_2405": { "nixpkgs-legacy_2405": {
"locked": { "locked": {
"lastModified": 1718717462, "lastModified": 1719253556,
"narHash": "sha256-qddfQLMaWR2gxfEzUM/zFZVK6H1kTv9WBQSBQxbP3MU=", "narHash": "sha256-A/76RFUVxZ/7Y8+OMVL1Lc8LRhBxZ8ZE2bpMnvZ1VpY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "938aa157bbd6e3c6fd7dcb77998b1f92c2ad1631", "rev": "fc07dc3bdf2956ddd64f24612ea7fc894933eb2e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -678,11 +678,11 @@
}, },
"nixpkgs-unstable-small": { "nixpkgs-unstable-small": {
"locked": { "locked": {
"lastModified": 1718867149, "lastModified": 1719327525,
"narHash": "sha256-TIrMD+RvbmqnSimPbDlOB/TLt0PndKfpvcYVrIdW4LY=", "narHash": "sha256-fPWiFM4aYbK9zGTt3KJ9CwX//iyElRiNHWNj2hk3i0E=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3c0a455c13e900d15888509ba2218484fa967929", "rev": "191a3fd9786d09c8d82e89ed68c4463e7be09b3e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -694,11 +694,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1718530797, "lastModified": 1718895438,
"narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=", "narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b60ebf54c15553b393d144357375ea956f89e9a9", "rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -741,11 +741,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1718714799, "lastModified": 1719254875,
"narHash": "sha256-FUZpz9rg3gL8NVPKbqU8ei1VkPLsTIfAJ2fdAf5qjak=", "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e", "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -787,11 +787,11 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1718816291, "lastModified": 1719146883,
"narHash": "sha256-wqQUoA6AW3gifOfEeBQVZ3ulropw0iXwmZRT0Ef2Kls=", "narHash": "sha256-DAyIfQgyqalov0DcEKRvDOUin7axELasaP6NCPt7UQA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5b75ddc9a3e93465bc939dcbacb281879b64b9ed", "rev": "084f8df2f3ff80cdec6f515931036f63c5d2f36c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -963,11 +963,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717902109, "lastModified": 1719111739,
"narHash": "sha256-OQTjaEZcByyVmHwJlKp/8SE9ikC4w+mFd3X0jJs6wiA=", "narHash": "sha256-kr2QzRrplzlCP87ddayCZQS+dhGW98kw2zy7+jUXtF4=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "f0922ad001829b400f0160ba85b47d252fa3d925", "rev": "5e2e9421e9ed2b918be0a441c4535cfa45e04811",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -981,11 +981,11 @@
"nixpkgs": "nixpkgs_8" "nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
"lastModified": 1718844164, "lastModified": 1719189969,
"narHash": "sha256-QUXWv6llKIQ5To2N24d9dRI78Hqfm9iFyhvmvlOICNo=", "narHash": "sha256-6MSZrWvXSvUKIr0iC9eSbQ09NSm+j1Oh4o9Gentu1CU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "srvos", "repo": "srvos",
"rev": "557ff94aa1b48a723f8fa16eb9e7a2e6de991682", "rev": "4f314be1307c8d5f1fb3d882a67e09dbdf285850",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1013,11 +1013,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718789425, "lastModified": 1719235398,
"narHash": "sha256-YJvgBThIUPeywoTjnFk+F73c0l2oaAENIrz2uldqb5A=", "narHash": "sha256-yccyHeuMUdbG/89Yi1ZSqx0XlpIKb0WQI+mAnTf/GJw=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "7dcab0711bfc103a1fb05ba643ee7a3bd309fbe4", "rev": "7cdbd128172d7c4ec63f5073d49da5d0e7d6396c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1085,11 +1085,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717850719, "lastModified": 1718522839,
"narHash": "sha256-npYqVg+Wk4oxnWrnVG7416fpfrlRhp/lQ6wQ4DHI8YE=", "narHash": "sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "4fc1c45a5f50169f9f29f6a98a438fb910b834ed", "rev": "68eb1dc333ce82d0ab0c0357363ea17c31ea1f81",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View file

@ -141,6 +141,7 @@
"python-2.7.18.7" "python-2.7.18.7"
"python-2.7.18.8" "python-2.7.18.8"
"electron-27.3.11" # for logseq "electron-27.3.11" # for logseq
"electron-28.3.3" # for logseq
]; ];
overlays = [ overlays = [
(_self: _super: { (_self: _super: {
@ -218,6 +219,7 @@
# manual configs # manual configs
{ {
clan.static-hosts.topLevelDomain = "bear"; clan.static-hosts.topLevelDomain = "bear";
components.network.zerotier.enable = true;
environment.systemPackages = [ environment.systemPackages = [
clan-core.packages.${pkgs.system}.clan-cli clan-core.packages.${pkgs.system}.clan-cli
(pkgs.writers.writeBashBin "zerotier-script-nodeid" '' (pkgs.writers.writeBashBin "zerotier-script-nodeid" ''

4
machines/cherry/configuration.nix
View file

@ -137,9 +137,7 @@
}; };
# for congress and streaming # for congress and streaming
hardware.opengl = { hardware.graphics.enable = true;
enable = true;
};
system.stateVersion = "23.11"; system.stateVersion = "23.11";

8
machines/chungus/configuration.nix
View file

@ -71,15 +71,15 @@
networking.hostName = "chungus"; networking.hostName = "chungus";
hardware.opengl = {
enable = true; hardware.graphics.enable = true;
extraPackages = with pkgs; [ hardware.graphics.enable32Bit = true;
hardware.graphics.extraPackages = with pkgs; [
intel-media-driver # LIBVA_DRIVER_NAME=iHD intel-media-driver # LIBVA_DRIVER_NAME=iHD
vaapiIntel # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium) vaapiIntel # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
vaapiVdpau vaapiVdpau
libvdpau-va-gl libvdpau-va-gl
]; ];
};
# nix-shell -p speedtest_cli --run speedtest # nix-shell -p speedtest_cli --run speedtest
#configuration.fireqos = { #configuration.fireqos = {

5
machines/chungus/media-jellyfin.nix
View file

@ -6,11 +6,6 @@
group = "media"; group = "media";
user = "media"; user = "media";
}; };
#hardware.opengl = {
# enable = true;
# driSupport = true;
# driSupport32Bit = true;
#};
services.nginx = { services.nginx = {
enable = true; enable = true;

4
machines/cream/configuration.nix
View file

@ -131,9 +131,7 @@
}; };
# for congress and streaming # for congress and streaming
hardware.opengl = { hardware.graphics.enable = true;
enable = true;
};
} }

7
machines/orbi/media-jellyfin.nix
View file

@ -8,11 +8,8 @@
user = "media"; user = "media";
}; };
hardware.opengl = { hardware.graphics.enable = true;
enable = true; hardware.graphics.enable32Bit = true;
driSupport = true;
driSupport32Bit = true;
};
services.nginx = services.nginx =
let let

9
machines/sternchen/configuration.nix
View file

@ -61,13 +61,8 @@
#system.custom.suspend.enable = false; #system.custom.suspend.enable = false;
services.printing.enable = false; services.printing.enable = false;
# for congress and streaming hardware.graphics.enable = true;
hardware.opengl = { hardware.graphics.enable32Bit = true;
enable = true;
#extraPackages = [ pkgs.vaapiIntel ];
driSupport = true;
driSupport32Bit = true;
};
services.displayManager.defaultSession = "plasma"; services.displayManager.defaultSession = "plasma";