hydra: add even more power

config/common/default.nix

@@ -5,7 +5,7 @@ in {
     ./kernel.nix
     ./networking.nix
     ./openssh.nix
-    ./users
+    ./users.nix
     ../../modules
     inputs.lix-module.nixosModules.default
   ];

config/common/users.nix

@@ -1,5 +1,5 @@
 { ... }: {
   imports = [
-    ./emily
+    ../users/emily
   ];
 }

config/hosts/crime/configuration.nix

@@ -1,12 +1,14 @@
-{ ... }: {
+{ inputs, ... }: {
   imports = [
     ../../common
+    ../../users/lucy
     ../../profiles/headless.nix
     ../../profiles/kartoffel.nix
     ../../profiles/lxc.nix
     ../../services/arrs
     ../../services/jellyfin.nix
     ../../services/nginx.nix
+    inputs.oth.nixosModules.default
   ];
   networking.hostName = "crime";
   systemd.network.networks."98-eth-default" = {
@@ -23,6 +25,7 @@
       "/var/lib/radarr"
       "/var/lib/sonarr"
       "/var/lib/private/prowlarr"
+      "/home"
     ];
   };
 }

config/hosts/seras/configuration.nix

@@ -1,6 +1,7 @@
 { pkgs, ... }: {
   imports = [
     ../../common
+    ../../users/nil
     ../../profiles/builder.nix
     ../../profiles/headless.nix
     ../../profiles/kartoffel.nix
@@ -18,16 +19,6 @@
     ];
   };
 
-  users.users.nil = {
-    isNormalUser = true;
-    shell = pkgs.fish;
-    ignoreShellProgramCheck = true;
-    extraGroups = [ "wheel" ];
-    openssh.authorizedKeys.keys = [
-      "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAICczPHRwY9MAwDGlcB0QgMOJjcpLJhVU3covrW9RBS62AAAABHNzaDo="
-    ];
-  };
-
   services.postgresql.settings = {
     max_connections = 200;
     shared_buffers = "24GB";

config/services/akkoma/default.nix

@@ -13,34 +13,79 @@
 
   services.akkoma = {
     enable = true;
-    extraPackages = with pkgs; [ exiftool ffmpeg-headless imagemagick ];
-    extraStatic."emoji/blobs.gg" = pkgs.akkoma-emoji.blobs_gg;
+    extraPackages = let
+      imagemagick = pkgs.imagemagick.override {
+        libheif = pkgs.libheif.overrideAttrs (prevAttrs: {
+          buildInputs = prevAttrs.buildInputs or [ ] ++ [ pkgs.svt-av1 ];
+          cmakeFlags = prevAttrs.cmakeFlags or [ ] ++ [ "-DWITH_SvtEnc=ON" ];
+        });
+      };
+    in with pkgs; [ exiftool ffmpeg-headless imagemagick ];
 
-    extraStatic."emoji/florp" = pkgs.runCommandNoCC "florp" {
-      src = inputs.florp-branding.packages.${config.nixpkgs.hostPlatform.system}.favicon;
-    } ''
-      mkdir $out
-      cp $src $out/florp.png
-    '';
+    extraStatic = let
+      actualFetchzip =
+      {
+        url,
+        hash
+      }: pkgs.runCommandNoCC "${lib.last (lib.splitString "/" url)}" {
+        src = pkgs.fetchurl {
+          inherit url hash;
+        };
+      } ''
+        ${lib.getExe pkgs.unzip} $src -d $out
+        for f in $out/*_256.png; do
+          mv -- "$f" "''${f/_256}"
+        done
+      '';
+    in {
+      "emoji/blobs.gg" = pkgs.akkoma-emoji.blobs_gg;
 
-    extraStatic."static/styles.json" = pkgs.writeText "styles.json" (builtins.toJSON (
-      builtins.fromJSON (builtins.readFile "${pkgs.akkoma-fe-domi}/static/styles.json") // {
-        elly-mod = "/static/themes/elly-mod.json";
-      }
-    ));
+      "emoji/custom" = pkgs.runCommandNoCC "florp" {
+        src = inputs.florp-branding.packages.${config.nixpkgs.hostPlatform.system}.favicon;
+      } ''
+        mkdir $out
+        cp $src $out/florp.png
+      '';
 
-    extraStatic."static/themes/elly-mod.json" = pkgs.writeText "elly-mod.json" (builtins.readFile ./elly-mod.json);
+      "emoji/neodog" = actualFetchzip {
+        url = "https://git.gay/moonrabbits/neodog/raw/commit/6f9eb283b6dcbe507fde1110abab267cb2d73b70/neodog.zip";
+        hash = "sha256-ISyzpRyjHf+4jKrOtHHqH0Qn7CQu5RQSLH/HL/YSdT4=";
+      };
 
-    extraStatic."static/custom.css" = pkgs.writeText "custom.css" ''
-      .tos-content img, .terms-of-service img { 
-        max-width: 100%;
-      }
-    '';
+      "emoji/neocat" = actualFetchzip {
+        url = "https://volpeon.ink/emojis/neocat/neocat.zip";
+        hash = "sha256-DZDuk0Djlax504flNWdpqAw+ROLOOVGj0ZvJLyouo7A=";
+      };
 
-    extraStatic."static/terms-of-service.html" = inputs.florp-about.packages.${pkgs.system}.default;
-    extraStatic."images/sylvia-ritter-15012323.avif" = inputs.florp-branding.packages.${pkgs.system}.wallpaper;
-    extraStatic."images/florp_banner.avif" = inputs.florp-branding.packages.${pkgs.system}.banner;
-    extraStatic."favicon.png" = inputs.florp-branding.packages.${pkgs.system}.favicon;
+      "emoji/neofox" = actualFetchzip {
+        url = "https://volpeon.ink/emojis/neofox/neofox.zip";
+        hash = "sha256-rZUPA7ZvrO8q/lx8XK3IxJ1URLgq0PSh752eWzG+uos=";
+      };
+
+      "emoji/blobhaj" = actualFetchzip {
+        url = "https://web.archive.org/web/20240829143703/https://heatherhorns.com/wp-content/uploads/2022/12/Blobhaj-12-13-2022.zip";
+        hash = "sha256-5l8ozTivCSOomPq+zDD4FWhK5mA/H2qkGs8beuDnp9s=";
+      };
+
+      "static/styles.json" = pkgs.writeText "styles.json" (builtins.toJSON (
+        builtins.fromJSON (builtins.readFile "${pkgs.akkoma-fe-domi}/static/styles.json") // {
+          elly-mod = "/static/themes/elly-mod.json";
+        }
+      ));
+
+      "static/themes/elly-mod.json" = pkgs.writeText "elly-mod.json" (builtins.readFile ./elly-mod.json);
+
+      "static/custom.css" = pkgs.writeText "custom.css" ''
+        .tos-content img, .terms-of-service img {
+          max-width: 100%;
+        }
+      '';
+
+      "static/terms-of-service.html" = inputs.florp-about.packages.${pkgs.system}.default;
+      "images/sylvia-ritter-15012323.avif" = inputs.florp-branding.packages.${pkgs.system}.wallpaper;
+      "images/florp_banner.avif" = inputs.florp-branding.packages.${pkgs.system}.banner;
+      "favicon.png" = inputs.florp-branding.packages.${pkgs.system}.favicon;
+    };
 
     frontends = {
       primary = {
@@ -110,6 +155,21 @@
         ];
       };
 
+      ":emoji".groups = {
+        blobs = "/emoji/blobs.gg/*.png";
+        blobhaj = "/emoji/blobhaj/512w/*.png";
+        neodog = "/emoji/neodog/*.png";
+        neocat = [
+          "/emoji/neocat/*.png"
+          "/emoji/neodog/additional_neocat/*.png"
+        ];
+        neofox = [
+          "/emoji/neofox/*.png"
+          "/emoji/neodog/additional_neofox/*.png"
+        ];
+        Custom = "/emoji/custom/*.png";
+      };
+
       "Pleroma.Captcha".method = mkRaw "Pleroma.Captcha.Kocaptcha";
 
       "Pleroma.Web.Endpoint".url.host = "florp.social";

config/services/hydra/nix-config.nix

@@ -25,20 +25,11 @@
       maxJobs = 0;
       speedFactor = 20;
       systems = [ "riscv64-linux" ];
-      supportedFeatures = base ++ [ "gccarch-rv64imac" "gccarch-rv64imacfd" ];
+      supportedFeatures = base ++ [ "gccarch-rv64imac" "gccarch-rv64imacfd" "gccarch-rv64gc" ];
       sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path;
     }
-    {
-      hostName = "machine-0008.cloud-v.co";
-      sshUser = "root";
-      maxJobs = 2;
-      speedFactor = 4;
-      systems = [ "riscv64-linux" ];
-      supportedFeatures = base ++ [ "gccarch-rv64imac" "gccarch-rv64imacfd" ];
-      sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path;
-    }
-  ] ++ lib.forEach (lib.genList (i: i + 1) 8) (num: {
-      hostName = "build-worker-0${toString num}";
+  ] ++ lib.forEach (lib.range 0 10) (num: {
+      hostName = "build-worker-${lib.fixedWidthNumber 2 num}";
       sshUser = "root";
       maxJobs = 2;
       speedFactor = 20;
@@ -63,9 +54,9 @@
       "build-worker-04.nyantec.com".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICOq+5I+nlAN2lJoOtoXrYEDuZ/TMPMa43pIlablYigK";
       "integra.kyouma.net".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIBwEQiSfaDrUAwgul4mktusBPcIVxI4pLNDh9DPopVU";
       "schrodinger.kyouma.net".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKo7vZ6lS1wx76YsbAdhOsGcc20YMAW52ep8SZ/FCHDp";
-      "[machine.cloud-v.co]:20008".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK6Kri0cjPKEXXDEl2GwfwzPO9wuPZEgJS0M6lKRHCqH";
       "lab.nyantec.com".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIUePtVPtBK+CYosufbaGiMT4EVanti4V5t2Wg0g/Fy4";
       "localhost".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPNVavo3YHVsrYwXRVISu7kDoknn+5inFGySn4azlB8P";
+      "[build-worker-kyoumanet.fly.dev]:2200".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJUGzlilikAUfUGKXVCoTeDvPRoWUgDDkNU5WaRUBzls";
       "[build-worker-kyoumanet.fly.dev]:2201".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDL2M97UBHg9aUfjDUxzmzg1r0ga0m3/stummBVwuEAB";
       "[build-worker-kyoumanet.fly.dev]:2202".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOTwVKL0P0chPM2Gz23rbT94844+w1CGJdCaZdzfjThz";
       "[build-worker-kyoumanet.fly.dev]:2203".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAjy2eZGJQeAYy0+fLgW9jiS0jVY2LInY0NDMnzCvvKp";
@@ -74,15 +65,17 @@
       "[build-worker-kyoumanet.fly.dev]:2206".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGf0kxGgwOG9KhUhvxxTSiQC5YikrzZXKDgSpBw33qN4";
       "[build-worker-kyoumanet.fly.dev]:2207".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL9z95a6Fn/dB+iNigEYpuJdBnBwCkIZYaKHcFbGP+RY";
       "[build-worker-kyoumanet.fly.dev]:2208".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAk+FNMhTfAVqk3MfLp4QiG/i5ti53DlpnC0q+sOvU9O";
+      "[build-worker-kyoumanet-cdg.fly.dev]:2209".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJGlQD/3fLn/Kyb7v0RIycHRcArGi75jURj803EMpW0S";
+      "[build-worker-kyoumanet-cdg.fly.dev]:2210".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMQm1FSGBGdCR5f8MvBvdKM0M4yIQVnH1po7hHO5T1qz";
     }; 
     extraConfig = ''
       Host machine-0008.cloud-v.co
         Hostname machine.cloud-v.co
         Port 20008
-    '' + lib.concatLines (lib.genList (i: ''
-      Host build-worker-0${toString (i + 1)}
-        Hostname build-worker-kyoumanet.fly.dev
-        Port 220${toString (i + 1)}
-    '') 8);
+    '' + lib.concatLines (lib.forEach (lib.range 0 10) (num: ''
+      Host build-worker-${lib.fixedWidthNumber 2 num}
+        Hostname build-worker-kyoumanet${lib.optionalString (num > 8) "-cdg"}.fly.dev
+        Port 22${lib.fixedWidthNumber 2 num}
+    ''));
   };
 }

config/users/emily/default.nix

@@ -37,6 +37,9 @@
       pavucontrol
       signal-desktop
       element-desktop
+      firefox
+      # currently broken
+      #inputs.firefox.packages.${pkgs.system}.firefox
       
       nixfmt-classic
       wl-clipboard

config/users/lucy/default.nix

@@ -0,0 +1,78 @@
+{ inputs, pkgs, ... }: {
+  imports = [
+    inputs.home-manager.nixosModules.home-manager
+  ];
+
+  users.users.lucy = {
+    isNormalUser = true;
+    shell = pkgs.fish;
+    ignoreShellProgramCheck = true;
+    extraGroups = [ "wheel" ];
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIId7XvwEHtC9KdGg4Bn+XE+yyBp7/dRToJX9T56mM7ln kosaki@kosaki"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAZH8HwE1OxVAArRpc3+c7foYJ/WYjp4BqUyuab9yQyl emilia@emilia"
+    ];
+  };
+
+  home-manager.useGlobalPkgs = true;
+  home-manager.users.lucy = {
+    home.stateVersion = "24.11";
+
+    home.packages = with pkgs; [
+      whois
+      htop
+      restic
+      fend
+    ];
+    fonts.fontconfig.enable = true;
+
+    programs.bat.enable = true;
+    programs.gpg.enable = true;
+    programs.ripgrep.enable = true;
+
+    programs.tmux = {
+      enable = true;
+      prefix = "M-w";
+      clock24 = true;
+      extraConfig = ''
+        # unbind keys
+        unbind-key C-b
+
+        # new prefix
+        bind-key M-w send-prefix
+
+        # selection via vim keys
+        bind-key -r	h select-pane -L
+        bind-key -r	j select-pane -D
+        bind-key -r	k select-pane -U
+        bind-key -r	l select-pane -R
+
+        # resize aswell
+        bind-key -r	C-h resize-pane -L 5
+        bind-key -r	C-j resize-pane -D 5
+        bind-key -r	C-k resize-pane -U 5
+        bind-key -r	C-l resize-pane -R 5
+
+        bind-key	g split-window
+        bind-key	v split-window -h
+      '';
+    };
+
+    programs.eza = {
+      enable = true;
+      icons = "auto";
+      git = true;
+      extraOptions = [
+        "--color-scale=all"
+        "--color-scale-mode=gradient"
+        "--group-directories-first"
+      ];
+    };
+    programs.fish = {
+      enable = true;
+      interactiveShellInit = ''
+        set -U fish_greeting
+      '';
+    };
+  };
+}

config/users/nil/default.nix

@@ -0,0 +1,49 @@
+{ inputs, pkgs, ... }: {
+  imports = [
+    inputs.home-manager.nixosModules.home-manager 
+  ];
+
+  users.users.nil = {
+    isNormalUser = true;
+    shell = pkgs.fish;
+    ignoreShellProgramCheck = true;
+    extraGroups = [ "wheel" ];
+    openssh.authorizedKeys.keys = [
+      "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAICczPHRwY9MAwDGlcB0QgMOJjcpLJhVU3covrW9RBS62AAAABHNzaDo="
+    ];
+  };
+
+  home-manager.useGlobalPkgs = true;
+  home-manager.users.nil = {
+    home.stateVersion = "24.11";
+
+    home.packages = with pkgs; [
+      whois
+      htop
+      restic
+      fend
+    ];
+    fonts.fontconfig.enable = true;
+
+    programs.bat.enable = true;
+    programs.gpg.enable = true;
+    programs.ripgrep.enable = true;
+
+    programs.eza = {
+      enable = true;
+      icons = "auto";
+      git = true;
+      extraOptions = [
+        "--color-scale=all"
+        "--color-scale-mode=gradient"
+        "--group-directories-first"
+      ];
+    };
+    programs.fish = {
+      enable = true;
+      interactiveShellInit = ''
+        set -U fish_greeting
+      '';
+    };
+  };
+}

flake.lock

@@ -214,6 +214,27 @@
         "type": "github"
       }
     },
+    "firefox": {
+      "inputs": {
+        "neoidiosyn": "neoidiosyn",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1731867603,
+        "narHash": "sha256-07612Ws2V4iFQAGLEoZVIefA3rM9JP3B/qo/z4tu1Kg=",
+        "ref": "refs/heads/main",
+        "rev": "022ec0becb1ca7b96ddb9bdd046617075357c2cb",
+        "revCount": 3,
+        "type": "git",
+        "url": "https://woof.rip/mikael/firefox.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://woof.rip/mikael/firefox.git"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -344,6 +365,24 @@
       "inputs": {
         "systems": "systems"
       },
+      "locked": {
+        "lastModified": 1726560853,
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
       "locked": {
         "lastModified": 1731533236,
         "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
@@ -358,9 +397,9 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
+    "flake-utils_3": {
       "inputs": {
-        "systems": "systems_2"
+        "systems": "systems_3"
       },
       "locked": {
         "lastModified": 1710146030,
@@ -376,9 +415,9 @@
         "type": "github"
       }
     },
-    "flake-utils_3": {
+    "flake-utils_4": {
       "inputs": {
-        "systems": "systems_3"
+        "systems": "systems_4"
       },
       "locked": {
         "lastModified": 1726560853,
@@ -394,7 +433,7 @@
         "type": "github"
       }
     },
-    "flake-utils_4": {
+    "flake-utils_5": {
       "inputs": {
         "systems": [
           "stylix",
@@ -430,6 +469,21 @@
         "type": "github"
       }
     },
+    "flakey-profile_2": {
+      "locked": {
+        "lastModified": 1712898590,
+        "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
+        "owner": "lf-",
+        "repo": "flakey-profile",
+        "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lf-",
+        "repo": "flakey-profile",
+        "type": "github"
+      }
+    },
     "florp-about": {
       "inputs": {
         "nixpkgs": [
@@ -671,6 +725,68 @@
       }
     },
     "lix": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1731683711,
+        "narHash": "sha256-bq21I1EjXJa/s5Rra9J9ot2NkPCnI0F5uNPurwYLdpE=",
+        "rev": "c859d03013712b349d82ee6223948d6d03e63a8d",
+        "type": "tarball",
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/c859d03013712b349d82ee6223948d6d03e63a8d.tar.gz?rev=c859d03013712b349d82ee6223948d6d03e63a8d"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"
+      }
+    },
+    "lix-module": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "flakey-profile": "flakey-profile",
+        "lix": [
+          "firefox",
+          "neoidiosyn",
+          "lix"
+        ],
+        "nixpkgs": [
+          "firefox",
+          "neoidiosyn",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1731185731,
+        "narHash": "sha256-RNaIu43b9PoXEhW4OqXUNZKY/jezQyCYWwdv1M0VjsA=",
+        "rev": "691193879d96bdfd1e6ab5ebcca2fadc7604cf34",
+        "type": "tarball",
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/691193879d96bdfd1e6ab5ebcca2fadc7604cf34.tar.gz?rev=691193879d96bdfd1e6ab5ebcca2fadc7604cf34"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"
+      }
+    },
+    "lix-module_2": {
+      "inputs": {
+        "flake-utils": "flake-utils_3",
+        "flakey-profile": "flakey-profile_2",
+        "lix": "lix_3",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1723510904,
+        "narHash": "sha256-zNW/rqNJwhq2lYmQf19wJerRuNimjhxHKmzrWWFJYts=",
+        "rev": "622a2253a071a1fb97a4d3c8103a91114acc1140",
+        "type": "tarball",
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/622a2253a071a1fb97a4d3c8103a91114acc1140.tar.gz?rev=622a2253a071a1fb97a4d3c8103a91114acc1140"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz"
+      }
+    },
+    "lix_2": {
       "inputs": {
         "flake-compat": "flake-compat_2",
         "nix2container": "nix2container",
@@ -690,28 +806,7 @@
         "url": "https://git.lix.systems/lix-project/lix/archive/2.91.0.tar.gz"
       }
     },
-    "lix-module": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "flakey-profile": "flakey-profile",
-        "lix": "lix_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1723510904,
-        "narHash": "sha256-zNW/rqNJwhq2lYmQf19wJerRuNimjhxHKmzrWWFJYts=",
-        "rev": "622a2253a071a1fb97a4d3c8103a91114acc1140",
-        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/622a2253a071a1fb97a4d3c8103a91114acc1140.tar.gz?rev=622a2253a071a1fb97a4d3c8103a91114acc1140"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz"
-      }
-    },
-    "lix_2": {
+    "lix_3": {
       "flake": false,
       "locked": {
         "lastModified": 1723503926,
@@ -725,6 +820,29 @@
         "url": "https://git.lix.systems/lix-project/lix/archive/2.91.0.tar.gz"
       }
     },
+    "neoidiosyn": {
+      "inputs": {
+        "lix": "lix",
+        "lix-module": "lix-module",
+        "nixpkgs": [
+          "firefox",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1731867586,
+        "narHash": "sha256-6anSWv1Vw83RKMAFMHOCv/9pp23ExzscEKFAe+GbAmU=",
+        "ref": "refs/heads/main",
+        "rev": "86605e5489fb5045f4dee48de2a69082e17c033b",
+        "revCount": 1,
+        "type": "git",
+        "url": "https://woof.rip/mikael/neoidiosyn.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://woof.rip/mikael/neoidiosyn.git"
+      }
+    },
     "nix-darwin": {
       "inputs": {
         "nixpkgs": [
@@ -1012,7 +1130,7 @@
     },
     "nuschtosSearch": {
       "inputs": {
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_4",
         "ixx": "ixx",
         "nixpkgs": [
           "nixvim",
@@ -1033,6 +1151,29 @@
         "type": "github"
       }
     },
+    "oth": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1732215904,
+        "narHash": "sha256-bXXoyQcVMULYOj1KlzbquUyMTyByzmLatIgm0ra/7sk=",
+        "ref": "refs/heads/main",
+        "rev": "847cc8493f7f44bd5ada0283d6b96457f4ee5a9b",
+        "revCount": 1,
+        "type": "git",
+        "url": "ssh://forgejo@woof.rip/emily/oth.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "ssh://forgejo@woof.rip/emily/oth.git"
+      }
+    },
     "pre-commit-hooks": {
       "flake": false,
       "locked": {
@@ -1055,19 +1196,21 @@
         "disko": "disko",
         "dns": "dns",
         "fernglas": "fernglas",
-        "flake-utils": "flake-utils",
+        "firefox": "firefox",
+        "flake-utils": "flake-utils_2",
         "florp-about": "florp-about",
         "florp-branding": "florp-branding",
         "florp-moderation": "florp-moderation",
         "home-manager": "home-manager",
         "hydra": "hydra",
         "kyouma-www": "kyouma-www",
-        "lix": "lix",
-        "lix-module": "lix-module",
+        "lix": "lix_2",
+        "lix-module": "lix-module_2",
         "nixos-hardware": "nixos-hardware",
         "nixos-needsreboot": "nixos-needsreboot",
         "nixpkgs": "nixpkgs_4",
         "nixvim": "nixvim",
+        "oth": "oth",
         "sops-nix": "sops-nix",
         "stylix": "stylix"
       }
@@ -1100,7 +1243,7 @@
         "base16-helix": "base16-helix",
         "base16-vim": "base16-vim",
         "flake-compat": "flake-compat_4",
-        "flake-utils": "flake-utils_4",
+        "flake-utils": "flake-utils_5",
         "gnome-shell": "gnome-shell",
         "home-manager": [
           "home-manager"
@@ -1108,7 +1251,7 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "systems": "systems_4",
+        "systems": "systems_5",
         "tinted-foot": "tinted-foot",
         "tinted-kitty": "tinted-kitty",
         "tinted-tmux": "tinted-tmux"
@@ -1187,6 +1330,21 @@
         "type": "github"
       }
     },
+    "systems_5": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "tinted-foot": {
       "flake": false,
       "locked": {

flake.nix

@@ -21,6 +21,10 @@
       url = "github:wobcom/fernglas";
       inputs.flake-utils.follows = "flake-utils";
     };
+    firefox = {
+      url = "git+https://woof.rip/mikael/firefox.git";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     florp-about = {
       url = "git+https://woof.rip/florp/about.git";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -60,6 +64,11 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.home-manager.follows = "home-manager";
     };
+    oth = {
+      url = "git+ssh://forgejo@woof.rip/emily/oth.git";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-utils.follows = "flake-utils";
+    };
     sops-nix = {
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";

modules/graphical/hyprland.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }: {
+{ config, inputs, lib, pkgs, ... }: {
   config.home-manager.users.emily = lib.mkIf (config.kyouma.graphical.compositor == "hyprland") {
     wayland.windowManager.hyprland = {
       enable = true;
@@ -9,6 +9,8 @@
         notifysend = "${pkgs.libnotify}/bin/notify-send";
         dolphin = "${pkgs.libsForQt5.dolphin}/bin/dolphin";
         firefox = "${pkgs.firefox}/bin/firefox";
+        # currently broken
+        #firefox = "${inputs.firefox.packages.${pkgs.system}.firefox}/bin/firefox";
         brightnessctl = "${pkgs.brightnessctl}/bin/brightnessctl";
         screenshot = "~/.local/bin/hypr/screenshot.sh";
         rofi = "${pkgs.rofi-wayland}/bin/rofi";

pkgs/build-worker-oci/ams/fly.toml

@@ -5,6 +5,7 @@ primary_region = 'ams'
   image = 'registry.fly.io/build-worker-kyoumanet:latest'
 
 [processes]
+  bw-00 = '/entrypoint.sh'
   bw-01 = '/entrypoint.sh'
   bw-02 = '/entrypoint.sh'
   bw-03 = '/entrypoint.sh'
@@ -14,28 +15,34 @@ primary_region = 'ams'
   bw-07 = '/entrypoint.sh'
   bw-08 = '/entrypoint.sh'
 
+[[mounts]]
+  source = 'bw00'
+  destination = '/mnt/data'
+  initial_size = '256GB'
+  processes = ['bw-00']
+
 [[mounts]]
   source = 'bw01'
   destination = '/mnt/data'
-  initial_size = '128GB'
+  initial_size = '256GB'
   processes = ['bw-01']
 
 [[mounts]]
   source = 'bw02'
   destination = '/mnt/data'
-  initial_size = '128GB'
+  initial_size = '256GB'
   processes = ['bw-02']
 
 [[mounts]]
   source = 'bw03'
   destination = '/mnt/data'
-  initial_size = '128GB'
+  initial_size = '256GB'
   processes = ['bw-03']
 
 [[mounts]]
   source = 'bw04'
   destination = '/mnt/data'
-  initial_size = '128GB'
+  initial_size = '256GB'
   processes = ['bw-04']
 
 [[mounts]]
@@ -62,6 +69,15 @@ primary_region = 'ams'
   initial_size = '256GB'
   processes = ['bw-08']
 
+[[services]]
+  protocol = 'tcp'
+  internal_port = 2222
+  auto_stop_machines = 'off'
+  processes = ['bw-00']
+
+  [[services.ports]]
+    port = 2200
+
 [[services]]
   protocol = 'tcp'
   internal_port = 2222

pkgs/build-worker-oci/cdg/fly.toml

@@ -0,0 +1,67 @@
+# fly.toml app configuration file generated for build-worker-kyoumanet-cdg on 2024-11-21T00:31:54+01:00
+#
+# See https://fly.io/docs/reference/configuration/ for information about how to use this file.
+#
+
+app = 'build-worker-kyoumanet-cdg'
+primary_region = 'cdg'
+
+[build]
+  image = 'registry.fly.io/build-worker-kyoumanet:latest'
+
+[processes]
+  bw-09 = '/entrypoint.sh'
+  bw-10 = '/entrypoint.sh'
+  bw-11 = '/entrypoint.sh'
+
+[[mounts]]
+  source = 'bw09'
+  destination = '/mnt/data'
+  initial_size = '256GB'
+  processes = ['bw-09']
+
+[[mounts]]
+  source = 'bw10'
+  destination = '/mnt/data'
+  initial_size = '256GB'
+  processes = ['bw-10']
+
+[[mounts]]
+  source = 'bw11'
+  destination = '/mnt/data'
+  initial_size = '256GB'
+  processes = ['bw-11']
+
+[[services]]
+  protocol = 'tcp'
+  internal_port = 2222
+  auto_stop_machines = 'off'
+  processes = ['bw-09']
+
+  [[services.ports]]
+    port = 2209
+
+[[services]]
+  protocol = 'tcp'
+  internal_port = 2222
+  auto_stop_machines = 'off'
+  processes = ['bw-10']
+
+  [[services.ports]]
+    port = 2210
+
+[[services]]
+  protocol = 'tcp'
+  internal_port = 2222
+  auto_stop_machines = 'off'
+  processes = ['bw-11']
+
+  [[services.ports]]
+    port = 2211
+
+[[restart]]
+  policy = 'never'
+
+[[vm]]
+  size = 'performance-16x'
+  memory = '96GB'

pkgs/build-worker-oci/default.nix

@@ -51,6 +51,9 @@ dockerTools.buildLayeredImage {
     ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOpyVefbZLkNVNzdSIlO6x6JohHE1snoHiUB3Qdvl5I2 aprl@idk
     ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDVNo871p97NTefP52KYiwuch+FaVScxvcFd9fg0yykySTq7Y5JsxrJQgTnox/oDa0O87OyHD/GHQljAXkqiHpDkExbiGjDmGXJSKReKH061F4FqBnDIwYRzUu9Cxjl4MNqsU0RqLaz4+F42c/L7GROQwjEPUb8JHThRiI5FJnDvvB+oBLBxeyQA4v3O4i8DaDQayTr/XB+aSlhNwKrb6cjjL93AHT1uE53yY5jn4kZX+RiPQhH7rvt9N6E4Yr3CG6nUgRCUS0L66d9yfrq0XAbAVk9F+viV7Nk9qy4MWHtXZ4h0qUlzrGALPgGsCGiLGd4NvEgeCcV4nvxdmevxTSdKlJP75xlmlLVXGyhqCZkTsxm/png2UvDl+p0pLyrgNaNoXPdE0Jbv7C28WX36Nast1QFSMUhexzuOx8OgaOioeXVfK98AouqWb58iPBCvgreUIH/gJhZcnlB/Foo1KSO+fJNH8hAsLH7w0mnKyHhJjkrjjwUqsnpepB3SOLfZTE= aprl@meow
     ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQD0v3tUBNEUxfoOQBFb+N2DUBQDay0iFggUWa9Nd+BtFLOKkz+RRto3eBF0ZiJZVUxv/hLb8m2s45hcMw8agwuPrXMe5085T1fzkvPdKAPZdsT/cCmBi1OsoLjAKBFIdM4lcV0A2cca8hip+/ZPpjFPUWx73/672gAPHU7co7fP8+8CSf9dx+WIeLx3yaYHYZ/th3dB5auX3VjOazS8MojsAorwTUeBoPamHQ5dFeNafhFUL/hhtGkUI1cNHUn3bJd2V7AKTW3UglK7hVgMJPrzVS31OlpcJEf6S5XgKTWdOSwubn1bs5Lt6YYRDU24NV6CGrwKgCJSRxzNMLwpnFKiSXpO8FzkqWHYWyju141hQcFF31aZIV+7YcwEt5ZukLjFOpVtpbSXvJYigOUzGi34P3/OAGshDXjTQjvM8GIir49gx3b2Nwhg0z4UHBkAKZvDDFPHDMJoclvnhITojaAojfC9zmMCO5ZaEsk8yv7c/lWQumzRpfldWF4mwHvhD5kTADbhRdO7WTdX7AaiAYINooToeWKjFe2wn3rFubPUppptqtP03mmvs7vhhgnEVBbGZRJK3GTVk1XcsfF9rDKzewSa+wb4LsBoZtFRhc8cJqHGlKWSNk7dQ04B1atPyNLKGpGoo/UIPxyZ6bSqFVxY3nhz46VZ6z8XWI48z0/fRQ== aprl@uwu
+    ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAAl3/krXJeCcDEJXRuzOdCOrJLG7b6MRqC+a9Xux3mW vika@hydrangea
+    ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHQjTy9qqHcs5vgTz+iMAiNNMqdyGtOhEpnpJCReEFfZ vika@rafflesia
+    sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAINAgFdk78I4zssUGsAIV01zefLBpwc1W7hfTobbG80XLAAAABHNzaDo= vika@nitrokey
     EOF
 
     cat <<EOF > /root/.ssh/environment

pkgs/build-worker-oci/source.nix

@@ -4,8 +4,8 @@
 
 dockerTools.pullImage {
   imageName = "nixos/nix";
-  imageDigest = "sha256:fd7a5c67d396fe6bddeb9c10779d97541ab3a1b2a9d744df3754a99add4046f1";
-  sha256 = "1ggkwd9zw8lj97ig7zah7dqy463hfhsgq3iwxxf8117gf8xi422s";
+  imageDigest = "sha256:133a1607deea14a02c2bc0850e275ed135814235a1147f68967afee261caea2b";
+  sha256 = "0602a59g14l1jiqfffz14hcp982qaqczi5f0ylvv0h9pp2pqrqs5";
   finalImageName = "nixos/nix";
   finalImageTag = "latest";
 }