From 1012a3a1de1e4cc19f44506d4c522762bfc9e3af Mon Sep 17 00:00:00 2001
From: Katherina Walshe-Grey <git@katherina.rocks>
Date: Tue, 28 May 2024 22:53:50 +0100
Subject: [PATCH] [tohru] Move most user config to home-manager & install VS
 Code

---
 hosts/tohru/configuration.nix | 16 ++-------------
 hosts/tohru/home.nix          | 38 +++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 14 deletions(-)
 create mode 100644 hosts/tohru/home.nix

diff --git a/hosts/tohru/configuration.nix b/hosts/tohru/configuration.nix
index 2a09eb4..87707ea 100644
--- a/hosts/tohru/configuration.nix
+++ b/hosts/tohru/configuration.nix
@@ -2,8 +2,9 @@
 
 {
   imports =
-    [ # Include the results of the hardware scan.
+    [
       ./hardware-configuration.nix
+      ./home.nix
     ];
 
   boot.loader.systemd-boot.enable = true;
@@ -33,25 +34,12 @@
   # Enable touchpad support (enabled default in most desktopManager).
   services.xserver.libinput.enable = true;
 
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.bluebird = {
-    isNormalUser = true;
-    extraGroups = [ "wheel" "networkmanager" ];
-    packages = with pkgs; [
-      bitwarden
-      firefox
-      tor-browser-bundle-bin
-    ];
-  };
-
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
     colmena
     git
     npins
-    plocate
-    tree
     wget
   ];
 
diff --git a/hosts/tohru/home.nix b/hosts/tohru/home.nix
new file mode 100644
index 0000000..2f2b128
--- /dev/null
+++ b/hosts/tohru/home.nix
@@ -0,0 +1,38 @@
+{ config, lib, pkgs, ... }:
+
+{
+  users.users.bluebird = {
+    isNormalUser = true;
+    description = "Bluebird";
+    extraGroups = [ "wheel" "networkmanager" ];
+    packages = with pkgs; [
+      # TODO: move these to home-manager
+      bitwarden
+      firefox
+      tor-browser-bundle-bin
+    ];
+  };
+
+  home-manager.users.bluebird = { pkgs, ... }: {
+    home.packages = [
+      pkgs.fortune
+      pkgs.htop
+      pkgs.tree
+    ];    
+
+    programs.git = {
+      enable = true;
+      userName = "Katherina Walshe-Grey";
+      userEmail = "git@katherina.rocks";
+    };
+
+    programs.vscode = {
+      enable = true;
+      package = pkgs.vscodium;
+      extensions = with pkgs.vscode-extensions; [
+      ];
+    };
+
+    home.stateVersion = "23.11";
+  };
+}