disable some stuff, add another user

bathtub/default.nix

···
   pkgs,
   ...
 }:
-
 {
   imports = lib.fileset.toList (lib.fileset.fileFilter (file: file.hasExt "nix") ../nixos/core) ++ [
     ./hardware.nix
···
       hashedPasswordFile = config.sops.secrets."passwords/monke".path;
     };
   };
+
+  home-manager.users.monke = import ./home.nix;
 
   security.pki.certificateFiles = [
     ../files/forest.pem

bathtub/home-overrides.nix

···
-{
-  lib,
-  ...
-}:
-{
-  programs.waybar = {
-    settings = {
-      bar.modules-center = lib.mkForce [ ];
-      bar.modules-right = lib.mkForce [
-        "backlight"
-        "battery"
-        "wireplumber"
-        "tray"
-        "clock"
-      ];
-    };
-    style = lib.mkForce (builtins.readFile ../files/waybar/style-bathtub.css);
-  };
-
-  programs.niri.settings.outputs."eDP-1" = {
-    mode = {
-      width = 3024;
-      height = 1964;
-      refresh = 120.0;
-    };
-    scale = 1.5;
-    variable-refresh-rate = true;
-  };
-}

bathtub/home.nix

···
     ++ [
       ../modules/rclone.nix
       ../modules/email.nix
-      ./home-overrides.nix
     ];
 
   sops = {
···
     ];
 
     stateVersion = "26.05";
+  };
+
+  # overrides
+  programs.waybar = {
+    settings = {
+      bar.modules-center = lib.mkForce [ ];
+      bar.modules-right = lib.mkForce [
+        "backlight"
+        "battery"
+        "wireplumber"
+        "tray"
+        "clock"
+      ];
+    };
+    style = lib.mkForce (builtins.readFile ../files/waybar/style-bathtub.css);
+  };
+
+  programs.niri.settings.outputs."eDP-1" = {
+    mode = {
+      width = 3024;
+      height = 1964;
+      refresh = 120.0;
+    };
+    scale = 1.5;
+    variable-refresh-rate = true;
   };
 }

flake.nix

···
                 extraSpecialArgs = inputs;
                 useGlobalPkgs = true;
                 useUserPackages = true;
-                users."monke" = import ./${hostname}/home.nix;
                 sharedModules = [
                   inputs.sops-nix.homeManagerModules.sops
                   inputs.nixvim.homeModules.nixvim

forest/default.nix

···
   pkgs,
   ...
 }:
-
 {
   imports =
     lib.fileset.toList (lib.fileset.fileFilter (file: file.hasExt "nix") ../nixos/core)
···
     secrets = {
       "passwords/root".neededForUsers = true;
       "passwords/monke".neededForUsers = true;
+      "passwords/taro".neededForUsers = true;
     };
   };
 
···
     useXkbConfig = true;
   };
 
-  services.xserver.xkb = {
-    layout = "us";
-    variant = "colemak_dh_ortho";
-  };
+  services.xserver.xkb.layout = "us";
 
   users.defaultUserShell = pkgs.zsh;
   users.users = {
     root.hashedPasswordFile = config.sops.secrets."passwords/root".path;
+    taro = {
+      isNormalUser = true;
+      extraGroups = [
+        "audio"
+        "input"
+        "lp"
+        "render"
+        "video"
+      ];
+      hashedPasswordFile = config.sops.secrets."passwords/taro".path;
+    };
     monke = {
       isNormalUser = true;
       extraGroups = [
···
       ];
     };
   };
+
+  home-manager.users.monke = import ./home.nix;
+  home-manager.users.taro = import ./home-taro.nix;
 
   system.stateVersion = "25.11";
 }

forest/home-overrides.nix

···
-{ lib, ... }:
-{
-  programs.zsh.initContent = lib.mkForce ''
-    PROMPT="[%F{blue}%~%f] %F{green}>%f "
-    bindkey '^R' history-incremental-search-backward
-    if [[ $- =~ i ]] && [[ -z "$TMUX" ]] && [[ -n "$SSH_TTY" ]]; then
-    	exec tmux new -A -s ssh
-    fi
-  '';
-
-  programs.niri.settings = {
-    spawn-at-startup = lib.mkForce [ ];
-  };
-
-  programs.anki.enable = lib.mkForce false;
-  programs.eww.enable = lib.mkForce false;
-  programs.hexchat.enable = lib.mkForce false;
-  programs.inori.enable = lib.mkForce false;
-  programs.ncmpcpp.enable = lib.mkForce false;
-  programs.sioyek.enable = lib.mkForce false;
-  programs.swayimg.enable = lib.mkForce false;
-  services.easyeffects.enable = lib.mkForce false;
-  services.fusuma.enable = lib.mkForce false;
-  services.kdeconnect.enable = lib.mkForce false;
-  services.mpd.enable = lib.mkForce false;
-  services.mpd-mpris.enable = lib.mkForce false;
-  services.udiskie.enable = lib.mkForce false;
-}

forest/home-taro.nix

···
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
+  home = {
+    username = "taro";
+    homeDirectory = "/home/taro";
+
+    sessionPath = [
+      "$HOME/usr/bin"
+    ];
+    preferXdgDirectories = true;
+
+    stateVersion = "26.05";
+  };
+
+  wayland.windowManager.sway = {
+    enable = true;
+    config = {
+      modifier = "Mod4";
+      keybindings =
+        let
+          modifier = config.wayland.windowManager.sway.config.modifier;
+        in
+        lib.mkOptionDefault {
+          "${modifier}+Return" = "exec ghostty";
+          "${modifier}+d" = "exec wofi";
+        };
+    };
+  };
+
+  programs = {
+    ghostty = {
+      enable = true;
+      enableZshIntegration = true;
+    };
+    wofi = {
+      enable = true;
+      settings = {
+        show = "drun";
+        width = 300;
+        prompt = "type to search...";
+        allow_images = true;
+        insentitive = true;
+        line_wrap = "word";
+      };
+    };
+  };
+
+  services.swayidle = {
+    enable = true;
+    timeouts = [
+      {
+        timeout = 600;
+        command = "${pkgs.hyprlock}/bin/hyprlock";
+      }
+    ];
+  };
+}

forest/home.nix

···
     lib.fileset.toList (lib.fileset.fileFilter (file: file.hasExt "nix") ../modules/core)
     ++ lib.fileset.toList (lib.fileset.fileFilter (file: file.hasExt "nix") ../modules/nixvim)
     ++ lib.fileset.toList (lib.fileset.fileFilter (file: file.hasExt "nix") ../modules/desktop)
-    ++ lib.fileset.toList (lib.fileset.fileFilter (file: file.hasExt "nix") ../modules/server)
-    ++ [
-      ./home-overrides.nix
-    ];
+    ++ lib.fileset.toList (lib.fileset.fileFilter (file: file.hasExt "nix") ../modules/server);
 
   home = {
     username = "monke";
···
 
     stateVersion = "26.05";
   };
+
+  # overrides
+  programs.zsh.initContent = lib.mkForce ''
+    PROMPT="[%F{blue}%~%f] %F{green}>%f "
+    bindkey '^R' history-incremental-search-backward
+    if [[ $- =~ i ]] && [[ -z "$TMUX" ]] && [[ -n "$SSH_TTY" ]]; then
+    	exec tmux new -A -s ssh
+    fi
+  '';
+
+  programs.niri.settings = {
+    spawn-at-startup = lib.mkForce [ ];
+  };
+
+  programs.anki.enable = lib.mkForce false;
+  programs.eww.enable = lib.mkForce false;
+  programs.hexchat.enable = lib.mkForce false;
+  programs.inori.enable = lib.mkForce false;
+  programs.ncmpcpp.enable = lib.mkForce false;
+  programs.sioyek.enable = lib.mkForce false;
+  programs.swayimg.enable = lib.mkForce false;
+  services.easyeffects.enable = lib.mkForce false;
+  services.fusuma.enable = lib.mkForce false;
+  services.kdeconnect.enable = lib.mkForce false;
+  services.mpd.enable = lib.mkForce false;
+  services.mpd-mpris.enable = lib.mkForce false;
+  services.udiskie.enable = lib.mkForce false;
 }

nixos/server/nextcloud.nix

···
 { pkgs, config, ... }:
 {
-  sops = {
-    secrets = {
-      "nc/adminPass" = {
+  /*
+    sops = {
+      secrets = {
+        "nc/adminPass" = {
+          owner = "nextcloud";
+          group = "nextcloud";
+        };
+        "nc/id" = { };
+        "nc/passSalt" = { };
+        "nc/secret" = { };
+        "nc/smtpHost" = { };
+        "nc/smtpPass" = { };
+        "nc/smtpUser" = { };
+      };
+      templates.nc-secrets = {
         owner = "nextcloud";
         group = "nextcloud";
-      };
-      "nc/id" = { };
-      "nc/passSalt" = { };
-      "nc/secret" = { };
-      "nc/smtpHost" = { };
-      "nc/smtpPass" = { };
-      "nc/smtpUser" = { };
-    };
-    templates.nc-secrets = {
-      owner = "nextcloud";
-      group = "nextcloud";
-      content = builtins.toJSON {
-        instanceid = config.sops.placeholder."nc/id";
-        passwordsalt = config.sops.placeholder."nc/passSalt";
-        secret = config.sops.placeholder."nc/secret";
-        mail_domain = "monke.moe";
-        mail_from_address = "nc";
-        mail_smtpsecure = "ssl";
-        mail_smtpauth = true;
-        mail_smtphost = config.sops.placeholder."nc/smtpHost";
-        mail_smtpuser = config.sops.placeholder."nc/smtpUser";
-        mail_smtppassword = config.sops.placeholder."nc/smtpPass";
-        mail_smtpport = 465;
+        content = builtins.toJSON {
+          instanceid = config.sops.placeholder."nc/id";
+          passwordsalt = config.sops.placeholder."nc/passSalt";
+          secret = config.sops.placeholder."nc/secret";
+          mail_domain = "monke.moe";
+          mail_from_address = "nc";
+          mail_smtpsecure = "ssl";
+          mail_smtpauth = true;
+          mail_smtphost = config.sops.placeholder."nc/smtpHost";
+          mail_smtpuser = config.sops.placeholder."nc/smtpUser";
+          mail_smtppassword = config.sops.placeholder."nc/smtpPass";
+          mail_smtpport = 465;
+        };
       };
     };
-  };
+  */
 
   services.nextcloud = {
     enable = false;

nixos/server/nginx.nix

···
     virtualHosts = {
       "${config.services.nextcloud.hostName}" = {
         onlySSL = true;
-        useACMEHost = "monke.moe";
+        useACMEHost = "auri.ee";
         http2 = true;
       };
       "pds.monke.moe" = {

secrets/forest.yaml

···
 passwords:
     root: ENC[AES256_GCM,data:4g87dG2Y+kz0zu66EpHZlObWwds1Arkjg1/nvxHrMErLhFB8M2rFOaNhS+RFQaYDwlhSXDWSinYXTp+7OipwWBPaC0Ad+C0+KQ==,iv:7lzxuV74uq6vvl+X7imIzPc019b6MbgSjyoMaiF0WIY=,tag:MXrANiv9cMnkyXNfIvWIcw==,type:str]
     monke: ENC[AES256_GCM,data:kScs+gH39P8CuWsYBV9A4cGuItiyRb8Ea3155W1CmOTOdpBQPqAdalAeSyT8Otuik5H1lo1cRWNEHCT78qO03FtSjui08zrXCg==,iv:5ecPv00sUU0V7JoNcKHcllrah3AZyVvRaAFViwzqkFM=,tag:YMbAxmRTcIqgtd/Fs4QiEA==,type:str]
+    taro: ENC[AES256_GCM,data:xJJwf6GUwIerBuErsEv8pfxbYMrcrKsxmxSLZPErvkj9M7xJtQdFmmBtDhoieCm1QLOBJPAhHm302aat2hK3gK09UyogQ4WRtA==,iv:VLgz17h9SJbkfJ9kyLzJ1q4GF7TdGqdUJbHISPUWQbE=,tag:M3eoXwkAWxIc5YdE9zEI5Q==,type:str]
 zed:
     ntfyTopic: ENC[AES256_GCM,data:5td6059epSxPwYopRLD3Ng==,iv:Kfh16V0KfhJ4DuWnw3IO4s0mvyvclQ+zW4o/P/8fF/s=,tag:+TJraDgrG5tnEF0SCTh9DQ==,type:str]
     smtpPass: ENC[AES256_GCM,data:JCpD1nIRSXQiaDo9XdHVznpTqqHYhDSkA9E5LzmfMiogIe6lM7yLku2IZce6JD+Xw3EWlBQhOFHPiZmnL6f+kg==,iv:ySNDkmYk9SdqdfPoPVLGHYDJjm0eRB1Q1rhO02T7jgc=,tag:1mCFMDWQvUD4YhiFVeHe0A==,type:str]
···
             Q0hjS2ZHamZXUHhCWE5MOHJIZ2xNa0kKUrtOBXmsBhwmDfehU0kDymfTCGaCSoBm
             fwzrYdaF72+lxgvuqm8t6KK+x3yrz3/ksuVRvHPfgvM0cKp1D2vNKA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-12-07T01:26:22Z"
-    mac: ENC[AES256_GCM,data:lEMPIXQ5SiDHoCMXteBuKU+WoDsRhb4q73YZkgN1TaDUVtziHLjGN8cYmKPCHuOgWiEeMdYNHNgrTI214NA5Jkw24ux2dmeY/nYKv0raB41IhIIw7IAarU6KXOG5nNLM1AmSOcp5JrdW2RCj1avhOBNhnMSkzJ8DfXd54surirU=,iv:48Yqa6UCKOEU7atmlJsSdUCZ8yI2mR61tuLmPUMEXDs=,tag:6Kcxn5CbpGcCuK4raBuqWQ==,type:str]
+    lastmodified: "2026-01-21T00:03:45Z"
+    mac: ENC[AES256_GCM,data:HYa3/t73/3VOtOgNYdJls7a5StbAZsUCW5jq2whWylmGGWeHmJZcGp3xFD6K90pI1827zhMQiAt4XSYy2Tfdry24w+eo2Z0kr9ubL9/G8gRsixGnjDAup0cMk0LZAj266SzRxklxl+IFRTJnvg5/KcQb/0OLXrlm4c2CfUpPxx0=,iv:R79rzwiTK3X+WfTq4YRqssBASpaaP7vl83pta0aRiUM=,tag:0iyd2QEqrauWFJZLIJpuIw==,type:str]
     unencrypted_suffix: _unencrypted
     version: 3.11.0

tundra/default.nix

···
   config,
   ...
 }:
-
 {
   imports = lib.fileset.toList (lib.fileset.fileFilter (file: file.hasExt "nix") ../nixos/core) ++ [
     ./hardware.nix
···
       hashedPasswordFile = config.sops.secrets."passwords/monke".path;
     };
   };
+
+  home-manager.users.monke = import ./home.nix;
 
   services.xserver.xkb = {
     layout = "us";

tundra/home-overrides.nix

···
-{ config, lib, ... }:
-{
-  programs.niri.settings = {
-    outputs = {
-      "eDP-1" = lib.mkForce {
-        mode = {
-          width = 1920;
-          height = 1080;
-          refresh = 60.0;
-        };
-        scale = 1.0;
-        variable-refresh-rate = false;
-      };
-      # TODO: find out why my thinkpad adds a random fucking nonexistent display
-      "Unknown-1".enable = lib.mkForce false;
-    };
-    binds = with config.lib.niri.actions; {
-      "Print".action = spawn "screenshot";
-    };
-    input.touchpad.enable = false;
-  };
-}

tundra/home.nix

···
 {
   pkgs,
   lib,
+  config,
   ...
 }:
-
 {
   imports =
     lib.fileset.toList (lib.fileset.fileFilter (file: file.hasExt "nix") ../modules/core)
···
     ++ lib.fileset.toList (lib.fileset.fileFilter (file: file.hasExt "nix") ../modules/desktop)
     ++ [
       ../modules/wlsunset.nix
-      ./home-overrides.nix
       ../modules/rclone.nix
     ];
 
···
     ];
 
     stateVersion = "26.05";
+  };
+
+  # overrides
+  programs.niri.settings = {
+    outputs = {
+      "eDP-1" = lib.mkForce {
+        mode = {
+          width = 1920;
+          height = 1080;
+          refresh = 60.0;
+        };
+        scale = 1.0;
+        variable-refresh-rate = false;
+      };
+      # TODO: find out why my thinkpad adds a random fucking nonexistent display
+      "Unknown-1".enable = lib.mkForce false;
+    };
+    binds = with config.lib.niri.actions; {
+      "Print".action = spawn "screenshot";
+    };
+    input.touchpad.enable = false;
   };
 }