aciceri/nixfleet
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Do not use home-manager on sisko

Browse source
This commit is contained in:
Andrea Ciceri 2024-10-03 21:52:16 +02:00
parent af395cafcb
commit 9c9cc992b8
Signed by: aciceri
SSH key fingerprint: SHA256:/AagBweyV4Hlfg9u092n8hbHwD5fcB6A3qhDiDA65Rg
4 changed files with 11 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
hosts/default.nix
View file

@ -44,9 +44,11 @@
inputs.disko.nixosModules.disko inputs.disko.nixosModules.disko
inputs.nixosHardware.nixosModules.lenovo-thinkpad-x1-7th-gen inputs.nixosHardware.nixosModules.lenovo-thinkpad-x1-7th-gen
inputs.lix-module.nixosModules.default inputs.lix-module.nixosModules.default
inputs.catppuccin.nixosModules.catppuccin
]; ];
extraHmModules = [ extraHmModules = [
"${inputs.homeManagerGitWorkspace}/modules/services/git-workspace.nix" "${inputs.homeManagerGitWorkspace}/modules/services/git-workspace.nix"
inputs.catppuccin.homeManagerModules.catppuccin
]; ];
secrets = { secrets = {
"kirk-wireguard-private-key" = { }; "kirk-wireguard-private-key" = { };
@ -90,6 +92,7 @@
sisko = { sisko = {
system = "aarch64-linux"; system = "aarch64-linux";
enableHomeManager = false;
vpn = { vpn = {
ip = "10.100.0.1"; ip = "10.100.0.1";
publicKey = "bc5giljukT1+ChbbyTLdOfejfR3c8RZ4XoXmQM54nTY="; publicKey = "bc5giljukT1+ChbbyTLdOfejfR3c8RZ4XoXmQM54nTY=";
@ -101,7 +104,6 @@
]; ];
secrets = { secrets = {
"sisko-wireguard-private-key" = { }; "sisko-wireguard-private-key" = { };
"cachix-personal-token".owner = "ccr";
"home-planimetry".owner = "hass"; "home-planimetry".owner = "hass";
"home-assistant-token".owner = "prometheus"; "home-assistant-token".owner = "prometheus";
"grafana-password".owner = "grafana"; "grafana-password".owner = "grafana";
@ -123,6 +125,10 @@
ip = "10.100.0.4"; ip = "10.100.0.4";
publicKey = "9ccx4C4xvPC6lPgTZAHDSfK4FS2BP2i4D57u9IZjw18="; publicKey = "9ccx4C4xvPC6lPgTZAHDSfK4FS2BP2i4D57u9IZjw18=";
}; };
macos-ventura = {
ip = "10.100.0.6";
publicKey = "/Eee1V0PsjZSzj7un1NxHKtFR+TpUIgJ7VAdIAzmvzQ=";
};
}; };
}; };
} }

23
hosts/sisko/default.nix
View file

@ -1,7 +1,6 @@
{ {
fleetModules, fleetModules,
pkgs, pkgs,
config,
... ...
}: }:
{ {
@ -9,7 +8,6 @@
fleetModules [ fleetModules [
"common" "common"
"ssh" "ssh"
"ccr"
"wireguard-server" "wireguard-server"
"mediatomb" "mediatomb"
"transmission" "transmission"
@ -35,32 +33,12 @@
./disko.nix ./disko.nix
]; ];
# boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_8;
boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_10; boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_6_10;
# boot.kernelPackages = let
# pkgs = fleetFlake.inputs.nixpkgsForSisko.legacyPackages.aarch64-linux;
# in
# pkgs.linuxPackagesFor pkgs.linux_testing;
# boot.kernelPackages = pkgs.linuxPackagesFor (pkgs.linux_6_9.override {
# argsOverride = {
# src = pkgs.fetchFromGitLab {
# domain = "gitlab.collabora.com";
# owner = "hardware-enablement/rockchip-3588";
# repo = "linux";
# rev = "23bb9c65a88c114bbe945b7ef5366bb02d3d9b80";
# sha256 = "sha256-6TygOl5r7/N2jlcPznWlvJfVVeXKSR8yMoGuTDbIdTA=";
# };
# version = "6.9";
# modDirVersion = "6.9.0";
# };
# });
system.stateVersion = "24.05"; system.stateVersion = "24.05";
powerManagement.cpuFreqGovernor = "schedutil"; powerManagement.cpuFreqGovernor = "schedutil";
ccr.enable = true;
nixpkgs.hostPlatform = "aarch64-linux"; nixpkgs.hostPlatform = "aarch64-linux";
swapDevices = [ ]; swapDevices = [ ];
@ -98,7 +76,6 @@
"/var/log" "/var/log"
"/var/lib/containers" "/var/lib/containers"
"/var/lib/postgresql" "/var/lib/postgresql"
"/home/${config.ccr.username}/.ssh"
]; ];
files = [ files = [
"/etc/machine-id" "/etc/machine-id"

7
modules/ssh-initrd/default.nix
View file

@ -14,9 +14,10 @@
extraConfig = '' extraConfig = ''
HostKey /ssh_initrd_host_ed25519_key HostKey /ssh_initrd_host_ed25519_key
''; '';
authorizedKeys = with (import ../../lib).keys.users; [ authorizedKeys = with (import ../../lib).keys; [
ccr-gpg users.ccr-gpg
ccr-ssh users.ccr-ssh
hosts.sisko
]; ];
}; };
}; };

2
modules/transmission/default.nix
View file

@ -45,8 +45,6 @@
"d /mnt/hd/torrent/.incomplete 770 transmission transmission" "d /mnt/hd/torrent/.incomplete 770 transmission transmission"
]; ];
ccr.extraGroups = [ "transmission" ];
environment.persistence."/persist".directories = [ environment.persistence."/persist".directories = [
config.services.transmission.home config.services.transmission.home
]; ];