diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..593558f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+windows-11
+windows-11.conf
diff --git a/configuration.nix b/configuration.nix
index 79bd649..3f48629 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -60,6 +60,20 @@ in
   #   useXkbConfig = true; # use xkb.options in tty.
   };
 
+  i18n.inputMethod = {
+      enabled = "fcitx5";
+      fcitx5.addons = with pkgs; [ 
+          fcitx5-rime 
+          fcitx5-mozc 
+          fcitx5-gtk
+          fcitx5-configtool
+      ];
+  };
+  # i18n.inputMethod.fcitx5.engines = with pkgs.fcitx-engines; [ mozc ];
+  # i18n.inputMethod = {
+  #   enabled = "ibus";
+  #   ibus.engines = with pkgs.ibus-engines; [ mozc ];
+  # };
 
   # TTY settings
   i18n = {
@@ -84,7 +98,7 @@ in
     enable = true;
     autorun = true;
 
-    autoRepeatDelay = 250;
+    autoRepeatDelay = 200;
     autoRepeatInterval = 24;
     
     # DVORAK + NO
@@ -139,8 +153,11 @@ in
   # Enable touchpad support (enabled default in most desktopManager).
   services.libinput.enable = true;
 
+  services.blueman.enable = true;
+
   hardware.bluetooth = {
     enable = true;
+    powerOnBoot = true;
     hsphfpd.enable = true;
     settings = {
       General = {
@@ -176,6 +193,12 @@ in
     xclip
     # xorg.xbacklight
     # htop
+    usbutils
+    udiskie
+    udisks
+    # javaPackages.openjfx17
+    libGL
+    # gtk3
   ]);
 
   programs.steam.enable = true;
@@ -265,17 +288,6 @@ in
     powerKey = "hibernate";
   }; 
 
-  fonts = {
-    packages = with pkgs; [
-      (nerdfonts.override { fonts = [ "FiraCode" "Monoid" ]; })
-    ];
-
-    fontconfig = {
-      defaultFonts = {
-        monospace = [ "Monoid" ];
-      };
-    };
-  };
 
   # video acceleration
   # nixpkgs.config.packageOverrides = pkgs: {
@@ -291,5 +303,64 @@ in
   # };
   # environment.sessionVariables = { LIBVA_DRIVER_NAME = "iHD"; }; # Force intel-media-driver
 
+
+  services.devmon.enable = true;
+  services.gvfs.enable = true;
+  services.udisks2.enable = true;
+
+
+  services.xrdp = {
+    enable = true;
+    defaultWindowManager = "xmonad";
+    openFirewall = true;
+  };
+
+  fonts = {
+    # enableDefaultFonts = true;
+
+    packages = with pkgs; [
+      (nerdfonts.override { fonts = [ "FiraCode" "Monoid" ]; })
+    ];
+
+    fonts = with pkgs; [
+      noto-fonts
+      ubuntu_font_family
+      unifont
+      noto-fonts-cjk-sans
+      noto-fonts-cjk-serif
+      carlito
+      dejavu_fonts
+      ipafont
+      kochi-substitute
+      source-code-pro
+      ttf_bitstream_vera
+    ];
+  
+    fontconfig = {
+      antialias = true;
+      # defaultFonts = {
+      #   serif = [ "Ubuntu" ];
+      #   sansSerif = [ "Ubuntu" ];
+      #   monospace = [ "Ubuntu Source" ];
+      # };
+      # defaultFonts = {
+      #   monospace = [ "Monoid" ];
+      # };
+      defaultFonts = {
+        monospace = [
+          "DejaVu Sans Mono"
+          "IPAGothic"
+        ];
+        sansSerif = [
+          "DejaVu Sans"
+          "IPAPGothic"
+        ];
+        serif = [
+          "DejaVu Serif"
+          "IPAPMincho"
+        ];
+      };
+    };
+  };
 }
 
diff --git a/home.nix b/home.nix
index 5f113d7..c23be31 100644
--- a/home.nix
+++ b/home.nix
@@ -16,6 +16,12 @@
     brightnessctl
     zathura
     python3
+    sage
+    quickemu
+    maven
+    vscode-fhs
+    anki-bin
+    tldr
   ];
 
   # Home Manager is pretty good at managing dotfiles. The primary way to manage
@@ -275,6 +281,12 @@
       presence-nvim.enable = true;
 
       which-key.enable = true;
+
+      nvim-jdtls = {
+          enable = true;
+          data = "/home/fredrikr/.cache/jdtls/workspace";
+      };
+
     };
     extraConfigLua = ''
           luasnip = require("luasnip")
@@ -324,13 +336,14 @@
     oh-my-zsh = {
       enable = true;
       plugins = [ "git" "shrink-path" ];
-      theme = "lambda";
+      theme = "arrow";
     };
 
     shellAliases = {
         hibernate = "systemctl hibernate";
         suspend = "systemctl suspend";
         logout = "sudo pkill -u fredrikr";
+        lock = "/home/fredrikr/.logout.sh";
     };
 
     defaultKeymap = "viins";
@@ -347,4 +360,10 @@
       userName = "fredrikr79";
       userEmail = "fredrikrobertsen7@gmail.com";
   };
+
+  programs.java = {
+    enable = true;
+    package = (pkgs.jdk21.override { enableJavaFX = true; });
+    # package = pkgs.jdk21;
+  };
 }