finally on flake parts

just need to remove fup now
This commit is contained in:
Callum Leslie 2024-09-05 09:50:37 +01:00 committed by Callum Leslie
parent 3b4057b366
commit fdafb67215
20 changed files with 206 additions and 123 deletions

View file

@ -2,10 +2,12 @@
config,
pkgs,
inputs,
self,
...
}: let
inherit (inputs.self.nixosModules) keys;
#inherit (self.nixosModules) keys;
in {
nixpkgs.hostPlatform = "x86_64-linux";
c.services.mesh = {
enable = true;
exitNode = false;
@ -13,7 +15,7 @@ in {
};
c.services.remote-deploy = {
enable = false;
keys = keys.c;
keys = config.keys.c;
};
time.timeZone = "Europe/London";
@ -22,7 +24,7 @@ in {
users.users.c = {
isNormalUser = true;
extraGroups = ["wheel" "networkmanager" "libvirtd" "dialout"];
openssh.authorizedKeys.keys = keys.c;
openssh.authorizedKeys.keys = config.keys.c;
shell = pkgs.fish;
packages = with pkgs; [];
};

View file

@ -1,4 +1,4 @@
{
{...}: {
virtualisation = {
libvirtd.enable = true;
podman = {

View file

@ -1,5 +1,5 @@
{inputs}: {
modules = [
{inputs, ...}: {
imports = [
./hardware-configuration.nix
./configuration.nix
./containers.nix
@ -9,7 +9,4 @@
./home.nix
./styling.nix
];
extraArgs = {};
specialArgs = {};
system = "x86_64-linux";
}

View file

@ -1,4 +1,4 @@
{
{...}: {
services.openssh = {
enable = true;
settings = {

View file

@ -1,13 +1,13 @@
{
inputs,
utils,
mods,
self,
...
}: let
# TODO: function to do this
artemis = import ./artemis {inherit inputs;};
hermes = import ./hermes {inherit inputs;};
sharedModules = [inputs.home-manager.nixosModules.home-manager inputs.stylix.nixosModules.stylix inputs.agenix.nixosModules.default] ++ mods.sharedModules;
artemis = import ./artemis {inherit inputs sharedModules;};
hermes = import ./hermes {inherit inputs sharedModules;};
in {
hosts = {
inherit artemis;
inherit hermes;
};
hosts = [artemis hermes];
}

View file

@ -3,10 +3,12 @@
lib,
pkgs,
inputs,
self,
...
}: let
inherit (inputs.self.nixosModules) keys;
#inherit (self.nixosModules) keys;
in {
nixpkgs.hostPlatform = "x86_64-linux";
c.services.mesh = {
enable = true;
exitNode = true;
@ -17,7 +19,7 @@ in {
enable = true;
host = "media.cleslie.uk";
port = 62480;
keys = keys.c;
keys = config.keys.c;
buildOn = "local";
};
@ -26,7 +28,7 @@ in {
users.users.media = {
isNormalUser = true;
extraGroups = ["wheel" "multimedia"];
openssh.authorizedKeys.keys = keys.c;
openssh.authorizedKeys.keys = config.keys.c;
packages = with pkgs; [
tree
nixvim

View file

@ -1,4 +1,4 @@
{
{...}: {
virtualisation = {
podman.enable = true;
podman.dockerCompat = true;

View file

@ -1,5 +1,5 @@
{inputs}: {
modules = [
{inputs, ...}: {
imports = [
./hardware-configuration.nix
./configuration.nix
./fail2ban.nix
@ -9,8 +9,4 @@
./media.nix
./headscale.nix
];
extraArgs = {};
specialArgs = {};
system = "x86_64-linux";
channelName = "unstable";
}

View file

@ -32,11 +32,11 @@ in {
"d /var/lib/tdarr/logs 0775 - multimedia - "
];
nixpkgs.config.packageOverrides = pkgs: {
vaapiIntel = pkgs.vaapiIntel.override {enableHybridCodec = true;};
};
# nixpkgs.config.packageOverrides = pkgs: {
# vaapiIntel = pkgs.vaapiIntel.override {enableHybridCodec = true;};
# };
hardware.graphics = {
hardware.opengl = {
enable = true;
extraPackages = with pkgs; [
intel-media-driver
@ -44,7 +44,7 @@ in {
vaapiVdpau
libvdpau-va-gl
intel-compute-runtime # OpenCL filter support (hardware tonemapping and subtitle burn-in)
vpl-gpu-rt # QSV on 11th gen or newer
unstable.vpl-gpu-rt # QSV on 11th gen or newer
#intel-media-sdk # QSV up to 11th gen
];
};

View file

@ -1,4 +1,4 @@
{
{...}: {
services = {
openssh = {
enable = true;