2 files changed, 1 insertions, 35 deletions
diff --git a/host/Rory-devenv/software.nix b/host/Rory-devenv/software.nix
index 2d26885..af07bdf 100755
--- a/host/Rory-devenv/software.nix
+++ b/host/Rory-devenv/software.nix
@@ -55,11 +55,9 @@
   };
 
   environment.systemPackages = with pkgs; [
-    zsh
     gnome-console
     kitty
     feh
-    lsd
     sshfs
     cinnamon.nemo
     firefox-bin
diff --git a/host/RoryNix/configuration.nix b/host/RoryNix/configuration.nix
index a5dbf3b..aa079e8 100644
--- a/host/RoryNix/configuration.nix
+++ b/host/RoryNix/configuration.nix
@@ -5,6 +5,7 @@
     [
 #       ./hardware-configuration.nix
        ../../modules/packages/vim.nix
+       ../../modules/environments/home.nix
     ];
 
     boot = {
@@ -159,40 +160,7 @@
     sudo.wheelNeedsPassword = false;
   };
 
-  nix = {
-    distributedBuilds = true;
-
-    buildMachines = [
-      #"self" = {
-      #  
-      #};
-      {
-        systems = [ "x86_64-linux" "i686-linux" ];
-        hostName = "192.168.0.3";
-        sshUser = "Rory";
-        sshKey = "/home/Rory/.ssh/id_ed25519";
-        maxJobs = 6;
-        #cores = 2;
-        speedFactor = 43200;
-      }
-    ];
-    #buildersUseSubstitutes = true;
-    #ssh://Rory@192.168.0.3 x86_64-linux,i686-linux /home/Rory/.ssh/id_ed25519 12 1 - - -
-    #registry.nixpkgs.flake = pkgs;
-    nixPath = [ "nixpkgs=flake:nixpkgs" ];
 
-    settings.trusted-substituters = [
-      "https://nix-community.cachix.org"
-      "https://cache.garnix.io"
-      "https://numtide.cachix.org"
-    ];
-    settings.trusted-public-keys = [
-      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-      "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
-      "numtide.cachix.org-1:2ps1kLBUWjxIneOy1Ik6cQjb41X0iXVXeHigGmycPPE="
-    ];
-
-  };
   
   system.stateVersion = "22.11"; # DO NOT EDIT!
 }