diff --git a/home-manager/all.nix b/home-manager/all.nix
index 2bb4a21..294b794 100644
--- a/home-manager/all.nix
+++ b/home-manager/all.nix
@@ -40,6 +40,11 @@
       "*~"
       "*.swp"
     ];
+    extraConfig = {
+      global = {
+        init.defaultbranch = "main";
+      };
+    };
   };
   programs.neovim = {
     enable = true;
diff --git a/home-manager/dots/bspwm/bspwmrc b/home-manager/dots/bspwm/bspwmrc
deleted file mode 100755
index 1d8d33e..0000000
--- a/home-manager/dots/bspwm/bspwmrc
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh
-
-# Monitors
-bspc monitor DP-1 -d 1 2 3 4 5
-bspc monitor DP-2 -d 6 7 8 9 0
-
-# Behavior
-bspc config automatic_scheme alternate
-bspc config split_ratio          0.6
-bspc config focus_follows_pointer true
-bspc config pointer_follows_focus false
-
-# Style
-bspc config border_width 1
-bspc config top_padding 0
-bspc config window_gap 24
-bspc config borderless_monocle   false
-bspc config gapless_monocle      false
-bspc config focused_border_color '#bd93f9'
-bspc config normal_border_color '#282a36'
-bspc config presel_feedback_color '#282a36'
-
-# Rules
-bspc rule -a Wrapper-2.0 \
-	state=floating border=off focus=on
-bspc rule -a mpv \
-	state=floating sticky=on follow=off focus=on \
-	rectangle=640x360+1920+1080 monitor=DP-1
-bspc rule -a "*:Toolkit:Picture-in-Picture" \
-	state=floating sticky=on follow=off focus=on \
-	rectangle=640x360+1920+1080 monitor=DP-1
-bspc rule -a trayer:panel: border=off manage=off
-bspc rule -a xdragon:Xdragon state=floating sticky=on
diff --git a/home-manager/dots/catgirl/libera b/home-manager/dots/catgirl/libera
index a044828..cda0f20 100755
--- a/home-manager/dots/catgirl/libera
+++ b/home-manager/dots/catgirl/libera
@@ -1,3 +1,4 @@
 nick = iiogama
 real = iiogama
 host = irc.libera.chat
+join = #nixos
diff --git a/home-manager/dots/sxhkd/sxhkdrc b/home-manager/dots/sxhkd/sxhkdrc
index b479c7e..1431cd6 100644
--- a/home-manager/dots/sxhkd/sxhkdrc
+++ b/home-manager/dots/sxhkd/sxhkdrc
@@ -8,7 +8,7 @@ super + Return
 
 # terminal emulator with tmux session menu
 super + shift + Return
-	st -e iitmux
+	st -e "iitmux"
 
 # program launcher
 super + @space
@@ -34,8 +34,10 @@ super + shift + r
 	bspc wm -r; notify-desktop "bspwm config reloaded"
 
 # close and kill
-super + {_,shift + }q
-	bspc node -{c,k}
+super + w
+	bspc node -c
+super + q
+	test "$(printf 'Yes\nNo\n' | dmenu -i -p 'Kill node? ')" = "Yes" && bspc node -k
 
 # alternate between the tiled and monocle layout
 super + z
diff --git a/home-manager/gui.nix b/home-manager/gui.nix
index 53164ee..93b2c73 100644
--- a/home-manager/gui.nix
+++ b/home-manager/gui.nix
@@ -1,5 +1,5 @@
-# GUI home.nix
-{ config, lib, pkgs, inputs, user, ... }:
+  # GUI home.nix
+  { config, lib, pkgs, inputs, user, ... }:
 {
   xresources.properties = {
     "*.foreground" = "#f8f8f2";
@@ -71,7 +71,7 @@
     };
     settings = {
       automatic_scheme = "alternate";
-      split_ratio = 0.5;
+      split_ratio = 0.60;
       focus_follows_pointer = true;
       pointer_follows_focus = false;
       border_width = 1;
@@ -85,12 +85,6 @@
     };
   };
   xdg.configFile = {
-    #"bspwm" = {
-    #  source = ./dots/bspwm;
-    #  target = "bspwm";
-    #  recursive = true;
-    #  executable = true;
-    #};
     "dunst" = {
       source = ./dots/dunst;
       target = "dunst";
@@ -121,63 +115,4 @@
       name = "Comic Mono";
     };
   };
-  programs = {
-    hexchat = {
-      enable = true;
-      channels = {
-        darkscience = {
-          autojoin = [
-            "#darkscience"
-          ];
-          nickname = "${user.long}";
-          userName = "${user.long}";
-          servers = [
-            "irc.darkscience.net"
-          ];
-        };
-        libera = {
-          autojoin = [
-            "#nixos"
-          ];
-          loginMethod = "sasl";
-          nickname = "${user.long}";
-          servers = [
-            "irc.libera.chat"
-          ];
-          userName = "${user.long}";
-        };
-        sdf = {
-          autojoin = [
-            "#anonradio"
-            "#sdf"
-          ];
-          nickname = "${user.long}";
-          userName = "${user.long}";
-          servers = [
-            "irc.sdf.org"
-          ];
-        };
-        tilde = {
-          autojoin = [
-            "#ascii.town"
-          ];
-          nickname = "${user.long}";
-          userName = "${user.long}";
-          servers = [
-            "irc.tilde.chat"
-          ];
-        };
-      };
-    };
-  };
-  #home.packages = with pkgs; [
-  #  (dmenu.overrideAttrs (oldAttrs: rec { 
-  #    configFile = writeText "config.def.h" (builtins.readFile ../patches/dmenu/config.h);
-  #    postPatch = "${oldAttrs.postPatch}\n cp ${configFile} config.def.h";
-  #  }))
-  #  (st.overrideAttrs (oldAttrs: rec { 
-  #    configFile = writeText "config.def.h" (builtins.readFile ../patches/st/config.h);
-  #    postPatch = "${oldAttrs.postPatch}\n cp ${configFile} config.def.h";
-  #  }))
-  #];
 }
diff --git a/hosts/default.nix b/hosts/default.nix
index 1cccfc9..2073968 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -7,8 +7,10 @@
     modules = [ 
       ../nixos/all.nix
       ../nixos/cli.nix
+      ../nixos/chat.nix
       ../nixos/gui.nix
       ../nixos/gaming.nix
+      ../nixos/office.nix
       ./buckwheat/configuration.nix
       home-manager.nixosModules.home-manager {
         home-manager.useGlobalPkgs = true;
@@ -32,6 +34,7 @@
       ../nixos/all.nix
       ../nixos/cli.nix
       ../nixos/gui.nix
+      ../nixos/office.nix
       ../nixos/pentest.nix
       ./fireweed/configuration.nix
       home-manager.nixosModules.home-manager {
diff --git a/nixos/chat.nix b/nixos/chat.nix
new file mode 100644
index 0000000..d992946
--- /dev/null
+++ b/nixos/chat.nix
@@ -0,0 +1,10 @@
+# Office packages configuration.nix
+{ config, lib, pkgs, inputs, user, ... }:
+{
+  users.users.${user.name}.packages = with pkgs; [
+    catgirl
+    discord
+    halloy
+    signal-desktop
+  ];
+}
diff --git a/nixos/cli.nix b/nixos/cli.nix
index 47e7a85..f678e55 100644
--- a/nixos/cli.nix
+++ b/nixos/cli.nix
@@ -69,7 +69,6 @@
   };
   users.users.${user.name}.packages = with pkgs; [
     btfs
-    catgirl
     cava
     cifs-utils
     cmus
@@ -95,18 +94,15 @@
     jo
     john
     jq
-    ledger
     lynis
     mdp
     mediainfo
     nb
     oed
-    pandoc
     pdfgrep
     phetch
     profanity
     recutils
-    #sc-im
     shellcheck
     ssss
     surfraw
diff --git a/nixos/gui.nix b/nixos/gui.nix
index e161b9b..d395e19 100644
--- a/nixos/gui.nix
+++ b/nixos/gui.nix
@@ -58,6 +58,22 @@
     slock.enable = true;
   };
   users.users.${user.name}.packages = with pkgs; [
+    ani-cli
+    bashmount
+    feh
+    glib
+    lagrange
+    librewolf
+    mangal
+    mpv
+    mullvad-browser
+    mupdf
+    #onionshare-gui
+    scrot
+    tor-browser-bundle-bin
+    urlview
+  ];
+  environment.systemPackages = with pkgs; [
     (dmenu.overrideAttrs (oldAttrs: rec { 
       configFile = writeText "config.def.h" (builtins.readFile ./patches/dmenu/config.h);
       postPatch = "${oldAttrs.postPatch}\n cp ${configFile} config.def.h";
@@ -66,25 +82,6 @@
       configFile = writeText "config.def.h" (builtins.readFile ./patches/st/config.h);
       postPatch = "${oldAttrs.postPatch}\n cp ${configFile} config.def.h";
     }))
-    ani-cli
-    bashmount
-    discord
-    feh
-    glib
-    lagrange
-    libreoffice
-    librewolf
-    mangal
-    mpv
-    mullvad-browser
-    mupdf
-    #onionshare-gui
-    scrot
-    signal-desktop
-    tor-browser-bundle-bin
-    urlview
-  ];
-  environment.systemPackages = with pkgs; [
     clipmenu
     dunst
     hsetroot
diff --git a/nixos/office.nix b/nixos/office.nix
new file mode 100644
index 0000000..4f50463
--- /dev/null
+++ b/nixos/office.nix
@@ -0,0 +1,11 @@
+# Office packages configuration.nix
+{ config, lib, pkgs, inputs, user, ... }:
+{
+  users.users.${user.name}.packages = with pkgs; [
+    ledger
+    libreoffice
+    pandoc
+    pdftk
+    sc-im
+  ];
+}