From 9c9cc992b8b1b940b6b96bbb6f71d4e74538e1f4 Mon Sep 17 00:00:00 2001
From: Andrea Ciceri <andrea.ciceri@autistici.org>
Date: Thu, 3 Oct 2024 21:52:16 +0200
Subject: [PATCH] Do not use `home-manager` on `sisko`

---
 hosts/default.nix                |  8 +++++++-
 hosts/sisko/default.nix          | 23 -----------------------
 modules/ssh-initrd/default.nix   |  7 ++++---
 modules/transmission/default.nix |  2 --
 4 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/hosts/default.nix b/hosts/default.nix
index 480c37d..0498e19 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -44,9 +44,11 @@
           inputs.disko.nixosModules.disko
           inputs.nixosHardware.nixosModules.lenovo-thinkpad-x1-7th-gen
           inputs.lix-module.nixosModules.default
+          inputs.catppuccin.nixosModules.catppuccin
         ];
         extraHmModules = [
           "${inputs.homeManagerGitWorkspace}/modules/services/git-workspace.nix"
+          inputs.catppuccin.homeManagerModules.catppuccin
         ];
         secrets = {
           "kirk-wireguard-private-key" = { };
@@ -90,6 +92,7 @@
 
       sisko = {
         system = "aarch64-linux";
+        enableHomeManager = false;
         vpn = {
           ip = "10.100.0.1";
           publicKey = "bc5giljukT1+ChbbyTLdOfejfR3c8RZ4XoXmQM54nTY=";
@@ -101,7 +104,6 @@
         ];
         secrets = {
           "sisko-wireguard-private-key" = { };
-          "cachix-personal-token".owner = "ccr";
           "home-planimetry".owner = "hass";
           "home-assistant-token".owner = "prometheus";
           "grafana-password".owner = "grafana";
@@ -123,6 +125,10 @@
         ip = "10.100.0.4";
         publicKey = "9ccx4C4xvPC6lPgTZAHDSfK4FS2BP2i4D57u9IZjw18=";
       };
+      macos-ventura = {
+        ip = "10.100.0.6";
+        publicKey = "/Eee1V0PsjZSzj7un1NxHKtFR+TpUIgJ7VAdIAzmvzQ=";
+      };
     };
   };
 }
diff --git a/hosts/sisko/default.nix b/hosts/sisko/default.nix
index 8341327..44277c3 100644
--- a/hosts/sisko/default.nix
+++ b/hosts/sisko/default.nix
@@ -1,7 +1,6 @@
 {
   fleetModules,
   pkgs,
-  config,
   ...
 }:
 {
@@ -9,7 +8,6 @@
     fleetModules [
       "common"
       "ssh"
-      "ccr"
       "wireguard-server"
       "mediatomb"
       "transmission"
@@ -35,32 +33,12 @@
       ./disko.nix
     ];
 
-  # boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_8;
   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";
 
   powerManagement.cpuFreqGovernor = "schedutil";
 
-  ccr.enable = true;
-
   nixpkgs.hostPlatform = "aarch64-linux";
 
   swapDevices = [ ];
@@ -98,7 +76,6 @@
       "/var/log"
       "/var/lib/containers"
       "/var/lib/postgresql"
-      "/home/${config.ccr.username}/.ssh"
     ];
     files = [
       "/etc/machine-id"
diff --git a/modules/ssh-initrd/default.nix b/modules/ssh-initrd/default.nix
index 79a936d..a67e1f3 100644
--- a/modules/ssh-initrd/default.nix
+++ b/modules/ssh-initrd/default.nix
@@ -14,9 +14,10 @@
         extraConfig = ''
           HostKey /ssh_initrd_host_ed25519_key
         '';
-        authorizedKeys = with (import ../../lib).keys.users; [
-          ccr-gpg
-          ccr-ssh
+        authorizedKeys = with (import ../../lib).keys; [
+          users.ccr-gpg
+          users.ccr-ssh
+          hosts.sisko
         ];
       };
     };
diff --git a/modules/transmission/default.nix b/modules/transmission/default.nix
index 2a1f3cb..2052b37 100644
--- a/modules/transmission/default.nix
+++ b/modules/transmission/default.nix
@@ -45,8 +45,6 @@
     "d /mnt/hd/torrent/.incomplete 770 transmission transmission"
   ];
 
-  ccr.extraGroups = [ "transmission" ];
-
   environment.persistence."/persist".directories = [
     config.services.transmission.home
   ];