README.md

@@ -5,7 +5,7 @@ My personal NixOS and home-manager configurations.
 - `nixos`: My main computer.
 - `vps`: 2GB KVM VPS server on [RackNerd](https://www.racknerd.com/), installed with NixOS using [nixos-infect](https://github.com/elitak/nixos-infect).
 - `wsl`: NixOS on WSL via [NixOS-WSL](https://github.com/nix-community/NixOS-WSL).
-- `y2q`: Spare Galaxy S20+ phone, repurposed as a Ubuntu server using [chroot-distro](https://github.com/Magisk-Modules-Alt-Repo/chroot-distro).
+- `y2q`: Spare Galaxy S20+ phone, repurposed as a Raspbian server using [Pi Deploy](https://github.com/DesktopECHO/Pi-hole-for-Android).
 
 ## Deploy
 ```sh

flake.nix

@@ -70,7 +70,7 @@
           extraSpecialArgs = { inherit inputs rootPath; };
           modules = [ ./home/hosts/wsl.nix ];
         };
-        "toast@y2q" = home-manager.lib.homeManagerConfiguration {
+        "android@y2q" = home-manager.lib.homeManagerConfiguration {
           pkgs = nixpkgs.legacyPackages.aarch64-linux;
           extraSpecialArgs = { inherit inputs rootPath; };
           modules = [ ./home/hosts/y2q.nix ];
@@ -89,9 +89,12 @@
               pkgs.sops
             ];
 
-            shellHook = ''
+            packages = [
-              export PATH=${builtins.toPath ./bin}:$PATH
+              (pkgs.symlinkJoin {
-            '';
+                name = "deploy-bin";
+                paths = [ ./bin ];
+              })
+            ];
           };
         }
       );

home/hosts/y2q.nix

@@ -4,7 +4,6 @@
   imports = [
     inputs.nixvim.homeModules.nixvim
 
-    ../modules/runit
     ../modules/cli/git.nix
     ../modules/cli/ripgrep.nix
     ../modules/cli/btop.nix
@@ -15,8 +14,8 @@
   ];
 
   home = {
-    username = "toast";
+    username = "android";
-    homeDirectory = "/home/toast";
+    homeDirectory = "/home/android";
     stateVersion = "24.11";
   };
 

home/modules/runit/default.nix

@@ -1,50 +0,0 @@
-{ config, lib, ... }:
-
-{
-  imports = (
-    let
-      servicesPath = ./services;
-      serviceModules = builtins.attrNames (builtins.readDir (servicesPath));
-    in
-      map (module: servicesPath + "/${module}") serviceModules
-  );
-
-  options.runit = {
-    services = lib.mkOption {
-      type = lib.types.attrsOf (lib.types.submodule ({ name, ... }: {
-        options = {
-          script = lib.mkOption {
-            type = lib.types.str;
-            description = "Shell commands executed as the service's main process";
-          };
-          log.enable = lib.mkEnableOption "Enable logging";
-        };
-      }));
-    };
-    default = {};
-    description = "User-level runit services under ~/runit/services/";
-  };
-
-  config = {
-    home.file = lib.mkMerge (
-      lib.mapAttrsToList (serviceName: sCfg:
-        {
-          # run script
-          "runit/services/${serviceName}/run" = {
-            text = sCfg.script;
-            executable = true;
-          };
-          
-          # logging
-          "runit/services/${serviceName}/log/run" = lib.mkIf sCfg.log.enable {
-            text = ''
-              #!/bin/sh
-              exec svlogd -t ./main
-            '';
-          };
-        }
-      ) config.runit.services
-    );
-  };
-}
-

home/modules/runit/services/glances.nix

@@ -1,10 +0,0 @@
-{ pkgs, ... }:
-
-{
-  runit.services.glances = {
-    script = ''
-      #!/bin/bash
-      ${pkgs.glances}/bin/glances -w
-    '';
-  };
-}