diff --git a/users/grfn/system/home/machines/dobharchu.nix b/users/grfn/system/home/machines/dobharchu.nix
index 0b8503a00..c26f3baef 100644
--- a/users/grfn/system/home/machines/dobharchu.nix
+++ b/users/grfn/system/home/machines/dobharchu.nix
@@ -4,7 +4,7 @@
   imports = [
     ../platforms/darwin.nix
     ../modules/common.nix
-    ../modules/games.nix
+    # ../modules/games.nix
   ];
 
   home.packages = with pkgs; [
@@ -14,4 +14,7 @@
     pass
     pinentry_mac
   ];
+
+  programs.home-manager.enable = true;
+  home.stateVersion = "21.11";
 }
diff --git a/users/grfn/system/home/modules/common.nix b/users/grfn/system/home/modules/common.nix
index 771464484..17d58a36c 100644
--- a/users/grfn/system/home/modules/common.nix
+++ b/users/grfn/system/home/modules/common.nix
@@ -6,7 +6,7 @@
 {
   imports = [
     ../modules/shell.nix
-    ../modules/development.nix
+    # ../modules/development.nix
     ../modules/emacs.nix
     ../modules/vim.nix
     ../modules/tarsnap.nix
@@ -118,8 +118,4 @@
     enableBashIntegration = true;
     enableZshIntegration = true;
   };
-
-  services.dropbox = {
-    enable = true;
-  };
 }
diff --git a/users/grfn/system/home/modules/development.nix b/users/grfn/system/home/modules/development.nix
index d67c83e53..f08e9d949 100644
--- a/users/grfn/system/home/modules/development.nix
+++ b/users/grfn/system/home/modules/development.nix
@@ -58,7 +58,6 @@ with lib;
     lldb
     hyperfine
     clang-tools_11
-    rr
 
     clj2nix
     clojure
@@ -68,13 +67,14 @@ with lib;
     pg-dump-upsert
 
     nodePackages.prettier
-
-    linuxPackages.perf
   ] ++ optionals (stdenv.isLinux) [
     # TODO(grfn): replace with stable again once the current julia debacle
     # is resolved upstream, see https://github.com/NixOS/nixpkgs/pull/121114
     julia_16-bin
     valgrind
+
+    linuxPackages.perf
+    rr
   ];
 
   programs.git = {
diff --git a/users/grfn/system/home/modules/development/rust.nix b/users/grfn/system/home/modules/development/rust.nix
index 9ed42f5d2..105a23bc8 100644
--- a/users/grfn/system/home/modules/development/rust.nix
+++ b/users/grfn/system/home/modules/development/rust.nix
@@ -3,13 +3,15 @@
 let
   inherit (config.lib) depot;
 in
+
+with lib;
+
 {
 
   home.packages = with pkgs; [
     rustup
     cargo-edit
     cargo-expand
-    cargo-rr
     cargo-udeps
     cargo-bloat
     sccache
@@ -24,6 +26,8 @@ in
     coz
     inferno
     hotspot
+  ] ++ optionals (stdenv.isLinux) [
+    cargo-rr
   ];
 
   programs.zsh.shellAliases = {
diff --git a/users/grfn/system/home/modules/twitter.nix b/users/grfn/system/home/modules/twitter.nix
index 3cb2e90ad..ab5647e41 100644
--- a/users/grfn/system/home/modules/twitter.nix
+++ b/users/grfn/system/home/modules/twitter.nix
@@ -1,6 +1,10 @@
 { pkgs, lib, ... }:
 
 {
+  imports = [
+    ./lib/zshFunctions.nix
+  ];
+
   home.packages = with pkgs; [
     t
   ];
diff --git a/users/grfn/system/home/platforms/linux.nix b/users/grfn/system/home/platforms/linux.nix
index 5429f3e09..f1a9e179b 100644
--- a/users/grfn/system/home/platforms/linux.nix
+++ b/users/grfn/system/home/platforms/linux.nix
@@ -81,4 +81,8 @@ in
   '';
 
   services.lorri.enable = true;
+
+  services.dropbox = {
+    enable = true;
+  };
 }