users: slight restructure to match hosts/

users/rin/default.nix

@@ -0,0 +1,53 @@
+{ config, lib, modules, pkgs, ... }: {
+  users.users.rin = {
+    isNormalUser = true;
+    extraGroups = [ "adbusers" "audio" "video" "wheel" ];
+    shell = pkgs.zsh;
+    uid = 1001;
+    passwordFile = config.age.secrets.passwd.path;
+  };
+  home-manager.users.rin = { config, enableGUI, lib, pkgs, ... }: {
+    home = {
+      username = "rin";
+      homeDirectory = "/home/rin";
+      stateVersion = "21.05";
+      keyboard = null; # see https://github.com/nix-community/home-manager/issues/2219
+    };
+
+    imports = with modules.user; [
+      ./packages.nix
+      sessionVariables
+
+      direnv
+      git
+      gpg
+      neovim
+      npm
+      zsh
+    ] ++ lib.optionals enableGUI [
+      theming
+      xdg
+
+      kitty
+      mpv
+      rofi
+
+      dunst
+      picom
+      polybar
+
+      xorg
+      sxhkd
+      bspwm
+    ];
+
+    home.file.".local/bin/ipc-bridge.exe".source = builtins.fetchurl {
+      url = "https://github.com/0e4ef622/wine-discord-ipc-bridge/releases/download/v0.0.1/winediscordipcbridge.exe";
+      sha256 = "1swn9spxpq6blm74kjmfz4ipq6a8qjzccvb2msb25pf5b1z7jnns";
+    };
+    home.file.".local/bin/osu" = {
+      executable = true;
+      source = ../../scripts/osu;
+    };
+  };
+}

users/rin/packages.nix

@@ -0,0 +1,62 @@
+{ config, enableGUI, inputs, pkgs, ... }: {
+  home.packages = with pkgs; [
+    dconf
+    ffmpeg
+    gnupg
+    kitty
+    nodejs-16_x
+    pamixer
+    rnix-lsp
+    unrar
+    weechat
+    youtube-dl
+
+    nodePackages_latest.pnpm
+  ] ++ lib.optionals enableGUI [
+    adoptopenjdk-hotspot-bin-16
+    brave
+    (discord-plugged.override {
+      plugins = [
+        inputs.better-status-indicators
+        inputs.channel-typing
+        inputs.discord-tweaks
+        inputs.fix-user-popouts
+        inputs.no-double-back-pc
+        inputs.powercord-popout-fix
+        inputs.rolecolor-everywhere
+        inputs.theme-toggler
+        inputs.twemoji-but-good
+        inputs.view-raw
+        inputs.who-reacted
+      ];
+      themes = [
+        pkgs.me.discord-tokyonight
+        inputs.radialstatus
+        inputs.tokyonight
+        inputs.zelk
+      ];
+    })
+    element-desktop
+    feh
+    gnome.file-roller
+    gimp
+    kotatogram-desktop
+    insomnia
+    maim
+    ((multimc.override {
+      jdk8 = adoptopenjdk-hotspot-bin-8;
+      jdk = adoptopenjdk-hotspot-bin-16;
+    }).overrideAttrs(o: {
+      postPatch = lib.strings.replaceStrings ["/lib/openjdk"] [""] o.postPatch;
+    }))
+    obs-studio
+    pavucontrol
+    screenkey
+    tor-browser-bundle-bin
+    transmission-remote-gtk
+    inputs.nix-gaming.packages.x86_64-linux.wine-tkg
+    inputs.nix-gaming.packages.x86_64-linux.wowtricks
+    xclip
+    xorg.xgamma
+  ];
+}