diff --git a/hosts/tohru/background-image.jpg b/hosts/tohru/background-image.jpg
deleted file mode 100755
index bc9a614..0000000
Binary files a/hosts/tohru/background-image.jpg and /dev/null differ
diff --git a/hosts/tohru/configuration.nix b/hosts/tohru/configuration.nix
index 4878136..84f046c 100644
--- a/hosts/tohru/configuration.nix
+++ b/hosts/tohru/configuration.nix
@@ -31,6 +31,11 @@
   sound.enable = true;
   hardware.pulseaudio.enable = true;
 
+  # Enable touchpad support (enabled default in most desktopManager).
+  services.xserver.libinput.enable = true;
+
+  # List packages installed in system profile. To search, run:
+  # $ nix search wget
   environment.systemPackages = with pkgs; [
     colmena
     git
@@ -38,12 +43,31 @@
     wget
   ];
 
+  # Some programs need SUID wrappers, can be configured further or are
+  # started in user sessions.
+  # programs.mtr.enable = true;
+  # programs.gnupg.agent = {
+  #   enable = true;
+  #   enableSSHSupport = true;
+  # };
+
   programs.steam = {
     enable = true;
     remotePlay.openFirewall = true;
     dedicatedServer.openFirewall = true;
   };
 
+  # List services that you want to enable:
+
+  # Enable the OpenSSH daemon.
+  # services.openssh.enable = true;
+
+  # Open ports in the firewall.
+  # networking.firewall.allowedTCPPorts = [ ... ];
+  # networking.firewall.allowedUDPPorts = [ ... ];
+  # Or disable the firewall altogether.
+  # networking.firewall.enable = false;
+
   nixpkgs.config.allowUnfree = true;
   hardware.enableAllFirmware = true;
   services.fwupd.enable = true;
diff --git a/hosts/tohru/home.nix b/hosts/tohru/home.nix
index 2ea0105..a9949c9 100644
--- a/hosts/tohru/home.nix
+++ b/hosts/tohru/home.nix
@@ -4,11 +4,7 @@
   users.users.bluebird = {
     isNormalUser = true;
     description = "Bluebird";
-    extraGroups = [
-      "wheel" # sudo
-      "networkmanager" # UI wifi configuration
-      "dialout" # access to serial ports
-    ];
+    extraGroups = [ "wheel" "networkmanager" ];
     packages = with pkgs; [
       # TODO: move these to home-manager
       bitwarden
@@ -17,83 +13,53 @@
     ];
   };
 
-  home-manager.users.bluebird = { pkgs, ... }:
-    let
-      homeDirectory = "/home/bluebird";
-    in
-    {
-      home.homeDirectory = homeDirectory;
+  home-manager.users.bluebird = { pkgs, ... }: {
+    home.packages = with pkgs; [
+      fortune
+      htop
+      tree
 
-      home.packages = with pkgs; [
-        fortune
-        htop
-        tree
+      nil
+      nixpkgs-fmt
+    ];
 
-        nil
-        nixpkgs-fmt
-      ];
-
-      dconf = {
-        enable = true;
-        settings =
-          let
-            backgroundOptions = {
-              color-shading-type = "solid";
-              picture-options = "zoom";
-              picture-uri = "${homeDirectory}/.background-image";
-              primary-color = "#3a4ba0";
-              secondary-color = "#2f302f";
-            };
-          in
-          {
-            "org/gnome/desktop/background" = backgroundOptions // {
-              picture-uri-dark = backgroundOptions.picture-uri;
-            };
-            "org/gnome/desktop/screensaver" = backgroundOptions;
-            "org/gnome/desktop/interface".color-scheme = "prefer-dark";
-          };
-      };
-      home.file.".background-image".source = ./background-image.jpg;
-
-      programs.chromium.enable = true;
-
-      programs.git = {
-        enable = true;
-        userName = "Katherina Walshe-Grey";
-        userEmail = "git@katherina.rocks";
-      };
-
-      programs.vscode =
-        let
-          system = builtins.currentSystem;
-          sources = import ../../npins;
-          extensions = (import sources.nix-vscode-extensions).extensions.${system};
-        in
-        {
-          enable = true;
-          enableExtensionUpdateCheck = false;
-          enableUpdateCheck = false;
-          package = pkgs.vscodium;
-          extensions = (with pkgs.vscode-extensions; [
-            jnoortheen.nix-ide
-            ms-python.python
-          ]) ++ (with extensions.open-vsx; [
-            robbowen.synthwave-vscode
-          ]);
-          mutableExtensionsDir = false;
-          userSettings = {
-            "extensions.autoUpdate" = false;
-            "git.autofetch" = true;
-            "nix.enableLanguageServer" = true;
-            "nix.serverPath" = "nil";
-            "nix.serverSettings".nil = {
-              diagnostics.ignored = [ "unused_binding" "unused_with" ];
-              formatting.command = [ "nixpkgs-fmt" ];
-            };
-            "workbench.colorTheme" = "SynthWave '84";
-          };
-        };
-
-      home.stateVersion = "23.11";
+    programs.git = {
+      enable = true;
+      userName = "Katherina Walshe-Grey";
+      userEmail = "git@katherina.rocks";
     };
+
+    programs.vscode =
+      let
+        system = builtins.currentSystem;
+        sources = import ../../npins;
+        extensions = (import sources.nix-vscode-extensions).extensions.${system};
+      in
+      {
+        enable = true;
+        enableExtensionUpdateCheck = false;
+        enableUpdateCheck = false;
+        package = pkgs.vscodium;
+        extensions = (with pkgs.vscode-extensions; [
+          jnoortheen.nix-ide
+          ms-python.python
+        ]) ++ (with extensions.open-vsx; [
+          robbowen.synthwave-vscode
+        ]);
+        mutableExtensionsDir = false;
+        userSettings = {
+          "extensions.autoUpdate" = false;
+          "git.autofetch" = true;
+          "nix.enableLanguageServer" = true;
+          "nix.serverPath" = "nil";
+          "nix.serverSettings".nil = {
+            diagnostics.ignored = [ "unused_binding" "unused_with" ];
+            formatting.command = [ "nixpkgs-fmt" ];
+          };
+          "workbench.colorTheme" = "SynthWave '84";
+        };
+      };
+
+    home.stateVersion = "23.11";
+  };
 }
diff --git a/hosts/yevaud/configuration.nix b/hosts/yevaud/configuration.nix
index 4e3176d..34e6a1e 100644
--- a/hosts/yevaud/configuration.nix
+++ b/hosts/yevaud/configuration.nix
@@ -6,14 +6,31 @@
       ./hardware-configuration.nix
     ];
 
+  # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
   networking.hostName = "yevaud";
   networking.hostId = "09673d65";
+  # Pick only one of the below networking options.
+  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+  # networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
 
   time.timeZone = "Etc/UTC";
 
+  # Configure network proxy if necessary
+  # networking.proxy.default = "http://user:password@proxy:port/";
+  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+
+  # Select internationalisation properties.
+  # i18n.defaultLocale = "en_US.UTF-8";
+  # console = {
+  #   font = "Lat2-Terminus16";
+  #   keyMap = "us";
+  #   useXkbConfig = true; # use xkb.options in tty.
+  # };
+
+  # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.bluebird = {
     isNormalUser = true;
     extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
@@ -22,6 +39,24 @@
     ];
   };
 
+  # List packages installed in system profile. To search, run:
+  # $ nix search wget
+  # environment.systemPackages = with pkgs; [
+  #   vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+  #   wget
+  # ];
+
+  # Some programs need SUID wrappers, can be configured further or are
+  # started in user sessions.
+  # programs.mtr.enable = true;
+  # programs.gnupg.agent = {
+  #   enable = true;
+  #   enableSSHSupport = true;
+  # };
+
+  # List services that you want to enable:
+
+  # Enable the OpenSSH daemon.
   services.openssh = {
     enable = true;
     settings = {
@@ -30,8 +65,11 @@
     };
   };
 
+  # Open ports in the firewall.
   networking.firewall.allowedTCPPorts = [ 22 80 443 ];
   # networking.firewall.allowedUDPPorts = [ ... ];
+  # Or disable the firewall altogether.
+  # networking.firewall.enable = false;
 
   services.fail2ban.enable = true;
 
diff --git a/npins/sources.json b/npins/sources.json
index f0bb28a..554530a 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -7,10 +7,10 @@
         "owner": "nix-community",
         "repo": "home-manager"
       },
-      "branch": "release-24.05",
-      "revision": "a631666f5ec18271e86a5cde998cba68c33d9ac6",
-      "url": "https://github.com/nix-community/home-manager/archive/a631666f5ec18271e86a5cde998cba68c33d9ac6.tar.gz",
-      "hash": "13b22rkylwg4jwqmhyypkyjzm4algk5y43kfwwnb96wxmrqrplxc"
+      "branch": "release-23.11",
+      "revision": "2c78a57c544dd19b07442350727ced097e1aa6e6",
+      "url": "https://github.com/nix-community/home-manager/archive/2c78a57c544dd19b07442350727ced097e1aa6e6.tar.gz",
+      "hash": "1zb4qsyn7l1zdiv1kjx07jvgnakpsifc62fxcim50w3ni27cwxk3"
     },
     "nix-vscode-extensions": {
       "type": "Git",
@@ -20,15 +20,15 @@
         "repo": "nix-vscode-extensions"
       },
       "branch": "master",
-      "revision": "1ae16af500525f1ca1b3295f5ee4e2b1b26f3004",
-      "url": "https://github.com/nix-community/nix-vscode-extensions/archive/1ae16af500525f1ca1b3295f5ee4e2b1b26f3004.tar.gz",
-      "hash": "0rf225qaim5kgw7qkm7iq2jzjqlanipx8sjc4k6w84lqi2rc2aga"
+      "revision": "1f5f225e7ceee57404f6e409200cc9eea25090be",
+      "url": "https://github.com/nix-community/nix-vscode-extensions/archive/1f5f225e7ceee57404f6e409200cc9eea25090be.tar.gz",
+      "hash": "1s24w7fwfgd1v3s9zlj9cmwhbfc90av8c44kg9dchvj0yh6fg5sx"
     },
     "nixpkgs": {
       "type": "Channel",
-      "name": "nixos-24.05",
-      "url": "https://releases.nixos.org/nixos/24.05/nixos-24.05.675.805a384895c6/nixexprs.tar.xz",
-      "hash": "1lgx2ln363mhdv1hnmnpiryhg3fpkpgzq50k1gnscp24sm5rskv2"
+      "name": "nixos-23.11",
+      "url": "https://releases.nixos.org/nixos/23.11/nixos-23.11.7313.9d29cd266ceb/nixexprs.tar.xz",
+      "hash": "0phfgypnshhlh6ri54yp2f9qabq0hlq06jn46zv692jy6axss4kx"
     }
   },
   "version": 3