From 73f957e81dbd17f41d739514ee88e86b7ca61819 Mon Sep 17 00:00:00 2001
From: Jan-Bulthuis <git@bulthuis.dev>
Date: Mon, 2 Dec 2024 00:58:01 +0100
Subject: [PATCH] Update personal setup

---
 users/jan.nix | 100 ++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 77 insertions(+), 23 deletions(-)

diff --git a/users/jan.nix b/users/jan.nix
index 4dc8e34..52eee1e 100644
--- a/users/jan.nix
+++ b/users/jan.nix
@@ -8,43 +8,97 @@
     home.stateVersion = "24.05";
 
     # TODO: Move into modules
-    home.packages = with pkgs; [ libreoffice-fresh ];
+    home.packages = with pkgs; [
+      libreoffice-still
+      remmina
+      # dina-vector
+      android-studio
+      docker
+      docker-compose
+      jellyfin-tui
+      pinentry
+      thunderbird
+      signal-desktop
+    ];
+
+    programs.gpg = {
+      enable = true;
+      mutableKeys = true;
+      mutableTrust = true;
+    };
+    services.gpg-agent = {
+      enable = true;
+      enableSshSupport = true;
+    };
 
     # Enabled modules
     modules = {
+      # Theming
+      theming.enable = true;
+
       # Window manager
       river.enable = true;
       waylock.enable = true;
       waybar.enable = true;
-      glpaper.enable = true;
+      glpaper.enable = false;
 
-      # Theming
-      theming.enable = true;
-
-      # Programs
-      feishin.enable = true;
-      firefox.enable = true;
-      foot.enable = true;
+      # Desktop environment
       mako.enable = true;
-      vscode.enable = true;
-      zathura.enable = true;
-      fish.enable = true;
+      foot.enable = true;
+
+      # Communication
       whatsapp.enable = true;
-      winbox.enable = true;
       discord.enable = true;
-      qutebrowser = {
+
+      # Browser
+      firefox = {
         enable = true;
         default = true;
       };
-      neovim.enable = true;
-      rofi-rbw.enable = true;
-      obsidian.enable = true;
-      bluetuith.enable = true;
+      qutebrowser = {
+        enable = true;
+        default = false;
+      };
 
-      # Programming languages
-      haskell.enable = true;
+      # Gaming
+      steam.enable = true;
+
+      # Media
+      spotify.enable = true;
+      feishin.enable = true;
+
+      # Tools
+      rofi-rbw.enable = true;
+      git = {
+        enable = true;
+        user = "Jan-Bulthuis";
+        email = "git@bulthuis.dev";
+      };
+      btop.enable = true;
+      fish.enable = true;
+      bluetuith.enable = false;
+      winbox.enable = true;
+      obsidian.enable = true;
+      zathura.enable = true;
+
+      # Development
+      neovim.enable = true;
+      vscode.enable = true;
+
+      # Languages
+      haskell.enable = false;
+      js.enable = true;
       nix.enable = true;
       rust.enable = true;
+      python.enable = true;
+      cpp.enable = true;
+      tex.enable = true;
+      jupyter.enable = true;
+      python.extraPythonPackages = p: [
+        p.scikit-learn
+        p.numpy
+        p.matplotlib
+      ];
 
       # Enable unfree
       unfree.enable = true;
@@ -60,7 +114,7 @@
         fonts.serif = fontpkgs."DejaVu Serif";
         fonts.sansSerif = fontpkgs."DejaVu Sans";
         fonts.monospace = fontpkgs."Dina";
-        fonts.emoji = fontpkgs."Dina";
+        fonts.emoji = fontpkgs."Noto Color Emoji";
         fonts.extraFonts = [ ];
 
         # Color scheme
@@ -69,10 +123,10 @@
           darkMode = false;
         };
         themes.catppuccin = {
-          enable = false;
+          enable = true;
           flavor = "mocha";
         };
-        themes.sakura.enable = true;
+        themes.sakura.enable = false;
 
         # TODO: Remove
         # Nice themes: