diff --git a/nixos/bootstrap/flake.nix b/nixos/bootstrap/flake.nix
index 0da539c3..35826e73 100644
--- a/nixos/bootstrap/flake.nix
+++ b/nixos/bootstrap/flake.nix
@@ -9,54 +9,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    xmonad-contrib = {
-      url = github:IvanMalison/xmonad-contrib/withMyChanges;
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        flake-utils.follows = "flake-utils";
-        git-ignore-nix.follows = "git-ignore-nix";
-        xmonad.follows = "xmonad";
-      };
-    };
-
-    xmonad = {
-      url = github:IvanMalison/xmonad/master;
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        flake-utils.follows = "flake-utils";
-        git-ignore-nix.follows = "git-ignore-nix";
-      };
-    };
-
-    taffybar = {
-      url = github:taffybar/taffybar/master;
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        flake-utils.follows = "flake-utils";
-        git-ignore-nix.follows = "git-ignore-nix";
-        xmonad.follows = "xmonad";
-        gtk-sni-tray.follows = "gtk-sni-tray";
-        gtk-strut.follows = "gtk-strut";
-      };
-    };
-
-    imalison-taffybar = {
-      url = path:../../dotfiles/config/taffybar;
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        flake-utils.follows = "flake-utils";
-        xmonad.follows = "xmonad";
-        taffybar.follows = "taffybar";
-      };
-    };
-
-    notifications-tray-icon = {
-      url = github:IvanMalison/notifications-tray-icon;
-      inputs.flake-utils.follows = "flake-utils";
-      inputs.git-ignore-nix.follows = "git-ignore-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     nix = {
       url = github:IvanMalison/nix;
       inputs.nixpkgs.follows = "nixpkgs";
@@ -73,41 +25,10 @@
       url = github:hercules-ci/gitignore.nix;
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
-    gtk-sni-tray = {
-      url = github:taffybar/gtk-sni-tray;
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        flake-utils.follows = "flake-utils";
-        git-ignore-nix.follows = "git-ignore-nix";
-        status-notifier-item.follows = "status-notifier-item";
-      };
-    };
-
-    status-notifier-item = {
-      url = github:taffybar/status-notifier-item;
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        flake-utils.follows = "flake-utils";
-        git-ignore-nix.follows = "git-ignore-nix";
-      };
-    };
-
-    gtk-strut = {
-      url = github:taffybar/gtk-strut;
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        flake-utils.follows = "flake-utils";
-        git-ignore-nix.follows = "git-ignore-nix";
-      };
-    };
-
-    nixpkgs-regression = { url = github:NixOS/nixpkgs; };
   };
 
   outputs = inputs@{
-    self, nixpkgs, nixos-hardware, home-manager, taffybar, xmonad,
-    xmonad-contrib, notifications-tray-icon, nix, imalison-taffybar, ...
+    self, nixpkgs, nixos-hardware, home-manager, nix, ...
   }:
   let
     mkConfig =
diff --git a/nixos/flake.nix b/nixos/flake.nix
index 5af405b0..6dbd8184 100644
--- a/nixos/flake.nix
+++ b/nixos/flake.nix
@@ -128,12 +128,13 @@
         };
       } // specialArgs;
     });
-    machineFilenames = builtins.attrNames (builtins.readDir ./machines);
+    machinesFilepath = ./machines;
+    machineFilenames = builtins.attrNames (builtins.readDir machinesFilepath);
     machineNameFromFilename = filename: builtins.head (builtins.split "\\." filename);
     mkConfigurationParams = filename: {
       name = machineNameFromFilename filename;
       value = {
-        modules = [ (./machines + ("/" + filename)) ./base.nix ];
+        modules = [ (machinesFilepath + ("/" + filename)) ./base.nix ];
       };
     };
     defaultConfigurationParams =
diff --git a/nixos/machines/biskcomp.nix b/nixos/machines/biskcomp.nix
index cd9c6379..0bfea4d7 100644
--- a/nixos/machines/biskcomp.nix
+++ b/nixos/machines/biskcomp.nix
@@ -2,7 +2,6 @@
   imports = [
     ../internet-computer.nix
     ../raspberry-pi.nix
-    ../base.nix
   ];
 
   services.xrdp.enable = true;
diff --git a/nixos/raspberry-pi.nix b/nixos/raspberry-pi.nix
index 4d7a1ea4..0473f33b 100644
--- a/nixos/raspberry-pi.nix
+++ b/nixos/raspberry-pi.nix
@@ -10,7 +10,7 @@
 
   hardware.enableRedistributableFirmware = true;
 
-  networking.useDHCP = false;
+  networking.useDHCP = true;
   networking.interfaces.eth0.useDHCP = true;
   networking.interfaces.wlan0.useDHCP = true;