flake.lock

@@ -675,15 +675,16 @@
         "osx-kvm": "osx-kvm"
       },
       "locked": {
-        "lastModified": 1727105240,
+        "lastModified": 1708168451,
-        "narHash": "sha256-FEuqbcZ4TDUMwCpTA/E3J5L7pLD4U+zXPnZbmXSmaJo=",
+        "narHash": "sha256-loWlwexnfQGFsEHeJbXpWbnmeDFkBwZB38+4BkUcGhM=",
-        "owner": "MatthewCroughan",
+        "owner": "aciceri",
         "repo": "NixThePlanet",
-        "rev": "2f622af217807da78e44a5a15f620743dac57f46",
+        "rev": "e8c91035d01f5082ccf30e351dcd993a5b480a72",
         "type": "github"
       },
       "original": {
-        "owner": "MatthewCroughan",
+        "owner": "aciceri",
+        "ref": "nix-in-darwin",
         "repo": "NixThePlanet",
         "type": "github"
       }

flake.nix

@@ -30,7 +30,7 @@
     };
     dream2nix.url = "github:nix-community/dream2nix";
     nixThePlanet = {
-      url = "github:MatthewCroughan/NixThePlanet/";
+      url = "github:aciceri/NixThePlanet/nix-in-darwin";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nixDarwin = {

hmModules/catppuccin/default.nix

@@ -10,4 +10,30 @@
     platformTheme.name = lib.mkForce "kvantum";
     style.name = lib.mkForce "kvantum";
   };
+
+  # TODO move away
+  programs.alacritty = {
+    enable = true;
+    settings = {
+      font = {
+        normal = {
+          family = "Fira Code";
+          style = "Regular";
+        };
+        bold = {
+          family = "Fira Code";
+          style = "Bold";
+        };
+        italic = {
+          family = "Cascadia Code";
+          style = "Italic";
+        };
+        bold_italic = {
+          family = "Fira Code";
+          style = "Bold Italic";
+        };
+        size = 13;
+      };
+    };
+  };
 }

hmModules/email/default.nix

@@ -1,8 +1,6 @@
 {
   pkgs,
   secrets,
-  fleetFlake,
-  lib,
   ...
 }:
 {
@@ -177,6 +175,9 @@
       compose = {
         no-attachment-warning = "^[^>]*attach(ed|ment)";
       };
+      triggers = {
+        email-received = ''exec notify-send "New email from %n" "%s"'';
+      };
       filters = {
         "text/plain" = "colorize";
         "text/html" = "html";
@@ -187,18 +188,6 @@
       };
     };
   };
-
-  systemd.user.services.emails-watcher = {
-    Unit.Description = "Send notifications when new emails arrive";
-    Install = {
-      WantedBy = [ "default.target" ];
-    };
-    Service = {
-      ExecStart = "${lib.getExe fleetFlake.packages.${pkgs.system}.emails-watcher}";
-      Environment = [ "INBOX_NEW=~/Maildir/autistici/Inbox/new" ];
-    };
-  };
-
   accounts.email = {
     accounts.autistici = {
       aerc.enable = true;

hmModules/zmkbatx/default.nix

@@ -16,9 +16,7 @@
     };
 
     Service = {
-      ExecStart = ''
+      ExecStart = "sleep 5 && ${lib.getExe pkgs.zmkBATx}";
-        ${pkgs.runtimeShell} -l -c "${lib.getExe' pkgs.busybox "sleep"} 5 && ${lib.getExe pkgs.zmkBATx}"
-      '';
       Restart = "on-failure";
       RestartSec = 3;
     };

hosts/default.nix

@@ -44,11 +44,9 @@
           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" = { };
@@ -92,7 +90,6 @@
 
       sisko = {
         system = "aarch64-linux";
-        enableHomeManager = false;
         vpn = {
           ip = "10.100.0.1";
           publicKey = "bc5giljukT1+ChbbyTLdOfejfR3c8RZ4XoXmQM54nTY=";
@@ -104,6 +101,7 @@
         ];
         secrets = {
           "sisko-wireguard-private-key" = { };
+          "cachix-personal-token".owner = "ccr";
           "home-planimetry".owner = "hass";
           "home-assistant-token".owner = "prometheus";
           "grafana-password".owner = "grafana";
@@ -125,10 +123,6 @@
         ip = "10.100.0.4";
         publicKey = "9ccx4C4xvPC6lPgTZAHDSfK4FS2BP2i4D57u9IZjw18=";
       };
-      macos-ventura = {
-        ip = "10.100.0.6";
-        publicKey = "/Eee1V0PsjZSzj7un1NxHKtFR+TpUIgJ7VAdIAzmvzQ=";
-      };
     };
   };
 }

hosts/sisko/default.nix

@@ -1,6 +1,7 @@
 {
   fleetModules,
   pkgs,
+  config,
   ...
 }:
 {
@@ -8,6 +9,7 @@
     fleetModules [
       "common"
       "ssh"
+      "ccr"
       "wireguard-server"
       "mediatomb"
       "transmission"
@@ -33,12 +35,32 @@
       ./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 = [ ];
@@ -76,6 +98,7 @@
       "/var/log"
       "/var/lib/containers"
       "/var/lib/postgresql"
+      "/home/${config.ccr.username}/.ssh"
     ];
     files = [
       "/etc/machine-id"

modules/macos-ventura/default.nix

@@ -1,24 +1,15 @@
-{ lib, ... }:
+{ fleetFlake, ... }:
 {
   services.macos-ventura = {
     enable = true;
     cores = 8;
     threads = 8;
-    mem = "16G";
+    mem = "8G";
     vncListenAddr = "0.0.0.0";
-    sshListenAddr = "127.0.0.1";
     extraQemuFlags = [ "-nographic" ];
-    sshPort = 2022;
+    sshPort = 2021;
-    vncDisplayNumber = 1; # means port 59001
+    installNix = true;
-    stateless = false;
+    stateless = true;
-    openFirewall = true;
+    darwinConfig = fleetFlake.darwinConfigurations.archer;
-    autoStart = false;
   };
-
-  programs.ssh.extraConfig = lib.mkAfter ''
-    Host macos-ventura
-    Hostname localhost
-    Port 2022
-    Compression yes
-  '';
 }

modules/ssh-initrd/default.nix

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

modules/transmission/default.nix

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

packages/emails-watcher/default.nix

@@ -1,12 +0,0 @@
-{
-  writers,
-  python3Packages,
-  ...
-}:
-writers.writePython3Bin "emails-watcher" {
-  libraries = with python3Packages; [
-    watchdog
-    desktop-notifier
-  ];
-  flakeIgnore = [ ];
-} (builtins.readFile ./emails-watcher.py)

packages/emails-watcher/emails-watcher.py

@@ -1,43 +0,0 @@
-import os
-from watchdog.observers import Observer
-from watchdog.events import FileSystemEventHandler
-from email import message_from_file
-from desktop_notifier import DesktopNotifierSync, DEFAULT_SOUND, Icon
-
-
-class MaildirHandler(FileSystemEventHandler):
-    def __init__(self, notifier):
-        super().__init__()
-        self.notifier = notifier
-
-    def on_created(self, event):
-        if not event.is_directory:
-            print(f"New email found: {event.src_path}")
-            with open(event.src_path, 'r') as email_file:
-                msg = message_from_file(email_file)
-                print(f'{msg["From"]}: {msg["Subject"]}')
-                self.notifier.send(
-                  title=msg["From"],
-                  message=msg["Subject"],
-                  sound=DEFAULT_SOUND,
-                  icon=Icon(name="mail-message-new"),
-                  timeout=20
-                )
-
-
-if __name__ == "__main__":
-    maildir_new = os.path.expanduser(os.environ.get("INBOX_NEW"))
-    notifier = DesktopNotifierSync(
-        app_name="Mails",
-        notification_limit=10
-    )
-
-    event_handler = MaildirHandler(notifier)
-    observer = Observer()
-
-    observer.schedule(event_handler, maildir_new, recursive=False)
-
-    print(f"Monitoring {maildir_new} for new emails...")
-
-    observer.start()
-    observer.join()