diff --git a/config/eww/eww.yuck b/config/eww/eww.yuck
index c49aa32..f4f5305 100644
--- a/config/eww/eww.yuck
+++ b/config/eww/eww.yuck
@@ -70,6 +70,9 @@
 (defwidget power []
   (box :class "power" :valign "end" "⏻"))
 
+(defwidget tray []
+  (systray :orientation "v" :icon-size 20))
+
 (defwidget bar []
   (centerbox :orientation "vertical"
        :halign "center"
@@ -81,6 +84,7 @@
          (mic)
          (volume)
          (battery)
+         (tray)
          (power))))
 
 
diff --git a/config/zshrc b/config/zshrc
index 3348032..3b8f8e0 100755
--- a/config/zshrc
+++ b/config/zshrc
@@ -7,7 +7,6 @@ unsetopt autocd beep notify
 unsetopt PROMPT_SP
 bindkey -v
 # End of lines configured by zsh-newuser-install
-
 export XDG_CONFIG_HOME="$HOME/.config"
 export XDG_CACHE_HOME="$HOME/.cache"
 export XDG_DATA_HOME="$HOME/.local/share"
@@ -30,6 +29,7 @@ alias imv="imv -b aa77bb"
 alias find="fd"
 alias tree="eza --tree"
 alias icat="kitty +kitten icat"
+alias qsus="NIXPKGS_ALLOW_UNFREE=1 nix-shell -p quartus-prime-lite -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/fe7ab74a86d78ba00d144aa7a8da8c71a200c563.tar.gz"
 
 # Automatically get new programs for autocompletion
 
@@ -37,6 +37,19 @@ zshcache_time="$(date +%s%N)"
 
 autoload -Uz add-zsh-hook
 
+function osc7-pwd() {
+    emulate -L zsh # also sets localoptions for us
+    setopt extendedglob
+    local LC_ALL=C
+    printf '\e]2;%s%s\e\' ${PWD//(#m)([^@-Za-z&-;_~])/%${(l:2::0:)$(([##16]#MATCH))}}
+}
+
+function chpwd-osc7-pwd() {
+    (( ZSH_SUBSHELL )) || osc7-pwd
+}
+add-zsh-hook -Uz chpwd chpwd-osc7-pwd
+
+
 rehash_precmd() {
   if [[ -a /var/cache/zsh/pacman ]]; then
     local paccache_time="$(date -r /var/cache/zsh/pacman +%s%N)"
diff --git a/flake.nix b/flake.nix
index becf67f..b83de7c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,8 +6,8 @@
     nixpkgs,
     nixpkgs-xr,
     nixos-hardware,
+    nixpkgs-quartus,
     home-manager,
-    osu-nixos,
     ...
   } : {
 
@@ -85,6 +85,6 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     nixpkgs-xr.url = "github:nix-community/nixpkgs-xr";
     nixos-hardware.url = "github:Nixos/nixos-hardware/master";
-    osu-nixos.url = "github:Asqiir/osu-nixos";
+    nixpkgs-quartus.url = "github:nixos/nixpkgs/nixos-22.05";
   };
 }
diff --git a/hosts/default.nix b/hosts/default.nix
index dbec4a3..508f4eb 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -66,6 +66,24 @@ in
       allowedUDPPorts = [ 22000 ];
     };
 
+    services.udev.packages = [
+      (pkgs.writeTextFile {
+
+        name = "alterra-udev";
+        destination = "/etc/udev/rules.d/92-alterra.rules";
+        text = ''
+        # USB-Blaster
+        SUBSYSTEM=="usb", ATTRS{idVendor}=="09fb", ATTRS{idProduct}=="6001", MODE="0666"
+        SUBSYSTEM=="usb", ATTRS{idVendor}=="09fb", ATTRS{idProduct}=="6002", MODE="0666"
+
+        SUBSYSTEM=="usb", ATTRS{idVendor}=="09fb", ATTRS{idProduct}=="6003", MODE="0666"
+
+        # USB-Blaster II
+        SUBSYSTEM=="usb", ATTRS{idVendor}=="09fb", ATTRS{idProduct}=="6010", MODE="0666"
+        SUBSYSTEM=="usb", ATTRS{idVendor}=="09fb", ATTRS{idProduct}=="6810", MODE="0666"
+        '';
+    })];
+
     environment.etc.hosts.mode = "0644";
     nix.settings.experimental-features = [ "nix-command" "flakes" ];
   };
diff --git a/hosts/lappy/default.nix b/hosts/lappy/default.nix
index 90012f2..4143226 100644
--- a/hosts/lappy/default.nix
+++ b/hosts/lappy/default.nix
@@ -35,8 +35,11 @@
     "kernel.yama.ptrace_scope=0"
   ];
 
-  virtualisation.docker.enable = true;
-  virtualisation.libvirtd.enable = true;
+  virtualisation = {
+    docker.enable = true;
+    libvirtd.enable = true;
+    waydroid.enable = true;
+  };
   hardware.bluetooth.enable = true;
   hardware.bluetooth.settings.General.Experimental = true;
   hardware.graphics = {
diff --git a/users/stitchynyan/default.nix b/users/stitchynyan/default.nix
index 4864b00..fd714db 100644
--- a/users/stitchynyan/default.nix
+++ b/users/stitchynyan/default.nix
@@ -12,6 +12,9 @@
       "steam-original"
       "steam-run"
       ];
+  nixpkgs.config.permittedInsecurePackages = [
+    "olm-3.2.16"
+  ];
 
   hardware = {
     opentabletdriver.enable = true;
@@ -49,18 +52,22 @@
 
   users.users.stitchynyan = {
     description = "Personal user";
-    extraGroups = [ "audio" "dialout" "docker" "kvm" "libvirtd" "networkmanager" "wheel" ];
+    extraGroups = [ "audio" "dialout" "docker" "kvm" "libvirtd" "networkmanager" "wireshark" "wheel" ];
     home = "/home/stitchynyan";
     initialHashedPassword = "$y$j9T$rvySCWHYE4AO4A9J0Vf20.$x5hpBNsOWovQFtNfFUIt17OAH5MJFwFBGjxbaEIagJ3";
     isNormalUser = true;
     shell = pkgs.zsh;
   };
 
-  i18n.inputMethod = {
-    enable = true;
-    type = "fcitx5";
-    fcitx5.addons = [
-      pkgs.fcitx5-mozc
-    ];
+  i18n = {
+    defaultLocale = "ja_JP.UTF-8";
+    inputMethod = {
+      enable = true;
+      type = "fcitx5";
+      fcitx5.addons = with pkgs; [
+        fcitx5-mozc
+        fcitx5-nord
+      ];
+    };
   };
 }
diff --git a/users/stitchynyan/home.nix b/users/stitchynyan/home.nix
index 8a90b2a..2e418db 100644
--- a/users/stitchynyan/home.nix
+++ b/users/stitchynyan/home.nix
@@ -11,7 +11,10 @@ let
   ] pkgs;
   pcPkgs = lib.attrVals [
     "activitywatch"
+    "awatcher"
+    "anki"
     "dunst"
+    "foliate"
     "foot"
     "grim"
     "imv"
@@ -24,21 +27,25 @@ let
     "lynx"
     "mpv"
     "msmtp"
-    "mupdf"
     "neomutt"
     "networkmanagerapplet"
     "nheko"
     "notmuch"
     "okular"
+    "osu-lazer"
     "pavucontrol"
     "pass"
     "playerctl"
     "prismlauncher"
+    "pstree"
     "qt5ct"
     "qt6ct"
+    "qbittorrent"
     "slurp"
     "swaylock-effects"
+    "tofi"
     "wofi"
+    "zathura"
   ] pkgs ++ [ pkgs.hunspellDicts.en_US ];
 in
 {
@@ -54,8 +61,9 @@ in
       #steamvr?
       procps
       usbutils
+      yt-dlp
       (python311.withPackages (lib.attrVals [ "matplotlib" "python-lsp-server" "sympy"]))
-      (octaveFull.withPackages (lib.attrVals ["symbolic"]))
+      #(octaveFull.withPackages (lib.attrVals ["symbolic"]))
     ]
     ++ (lib.optionals (nixosConfig.stitchyconf.form == "handheld") handheldPkgs)
     ++ (lib.optionals (nixosConfig.stitchyconf.form == "pc") pcPkgs);