diff --git a/README.md b/README.md
index 5951198..e606761 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # nix-config
 
-Jo's absolutely insane NixOS configuration - not in the good way
+Jo's absolutely insane NixOS configuration - as of july 2024
 
 ## Deployment
 
diff --git a/flake.lock b/flake.lock
deleted file mode 100644
index 70195ae..0000000
--- a/flake.lock
+++ /dev/null
@@ -1,123 +0,0 @@
-{
-  "nodes": {
-    "catppuccin": {
-      "locked": {
-        "lastModified": 1719915848,
-        "narHash": "sha256-zq+CMkdT8A9z74HonwspXp8HsX4OvP4uaVdD98AO6as=",
-        "owner": "catppuccin",
-        "repo": "nix",
-        "rev": "9345073d27d91ab66c1b6ab65df322906992aa59",
-        "type": "github"
-      },
-      "original": {
-        "owner": "catppuccin",
-        "repo": "nix",
-        "type": "github"
-      }
-    },
-    "hardware": {
-      "locked": {
-        "lastModified": 1719895800,
-        "narHash": "sha256-xNbjISJTFailxass4LmdWeV4jNhAlmJPwj46a/GxE6M=",
-        "owner": "NixOS",
-        "repo": "nixos-hardware",
-        "rev": "6e253f12b1009053eff5344be5e835f604bb64cd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "master",
-        "repo": "nixos-hardware",
-        "type": "github"
-      }
-    },
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1719827439,
-        "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "master",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "nix-flatpak": {
-      "locked": {
-        "lastModified": 1711997201,
-        "narHash": "sha256-J71xzQlVYsjagA4AsVwRazhBh2rZrPpKvxTgs6UzL7c=",
-        "owner": "gmodena",
-        "repo": "nix-flatpak",
-        "rev": "b76fa31346db7fc958a9898f3c594696ca71c4fd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "gmodena",
-        "ref": "v0.4.1",
-        "repo": "nix-flatpak",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1719848872,
-        "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "plasma-manager": {
-      "inputs": {
-        "home-manager": [
-          "home-manager"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1719875930,
-        "narHash": "sha256-jQmdWLxRP6BzOxRF8hQEhDD7UKw7UrnYbmaAPOSaXWY=",
-        "owner": "pjones",
-        "repo": "plasma-manager",
-        "rev": "7e062fcd669e261fb06cf54fe0ef2e46c3db8e83",
-        "type": "github"
-      },
-      "original": {
-        "owner": "pjones",
-        "repo": "plasma-manager",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "catppuccin": "catppuccin",
-        "hardware": "hardware",
-        "home-manager": "home-manager",
-        "nix-flatpak": "nix-flatpak",
-        "nixpkgs": "nixpkgs",
-        "plasma-manager": "plasma-manager"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
diff --git a/flake.nix b/flake.nix
index c50c3ff..59217b8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,13 +11,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    # Plasma manager
-    plasma-manager = {
-      url = "github:pjones/plasma-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.home-manager.follows = "home-manager";
-    };
-
     hardware.url = "github:NixOS/nixos-hardware/master";
 
     catppuccin.url = "github:catppuccin/nix";
@@ -25,7 +18,7 @@
     nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1";
   };
 
-  outputs = { self, nixpkgs, home-manager, plasma-manager, hardware, catppuccin, nix-flatpak, ... } @inputs:
+  outputs = { self, nixpkgs, home-manager, hardware, catppuccin, nix-flatpak, ... } @inputs:
   let
     inherit (self) outputs;
 
diff --git a/hosts/puzzlevision/configuration.nix b/hosts/puzzlevision/configuration.nix
deleted file mode 100644
index f591563..0000000
--- a/hosts/puzzlevision/configuration.nix
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  inputs,
-  lib,
-  config,
-  pkgs,
-  outputs,
-  ...
-}: {
-  # You can import other NixOS modules here
-  imports = [
-    inputs.hardware.nixosModules.common-pc-laptop
-    inputs.hardware.nixosModules.common-cpu-intel
-    inputs.hardware.nixosModules.common-pc-laptop-ssd
-    outputs.nixosModules.desktop.gnome
-    ./hardware-configuration.nix
-  ];
-
-  nixpkgs = {
-    config = {
-      allowUnfree = true;
-    };
-
-    overlays = [
-      (final: prev: {
-        linuxPackages_latest = prev.linuxPackages_latest.extend (lpfinal: lpprev: {
-          rtl8821ce = lpprev.rtl8821ce.overrideAttrs ({src, ...}: {
-            version = "${lpprev.kernel.version}-unstable-2024-03-26";
-            src = final.fetchFromGitHub {
-              inherit (src) owner repo;
-              rev = "f119398d868b1a3395f40c1df2e08b57b2c882cd";
-              hash = "sha256-EfpKa5ZRBVM5T8EVim3cVX1PP1UM9CyG6tN5Br8zYww=";
-            };
-          });
-        });
-      })
-    ];
-  };
-
-  nix = {
-    # This will add each flake input as a registry
-    # To make nix3 commands consistent with your flake
-    registry = lib.mapAttrs (_: value: {flake = value;}) inputs;
-
-    # This will additionally add your inputs to the system's legacy channels
-    # Making legacy nix commands consistent as well, awesome!
-    nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
-
-    settings = {
-      auto-optimise-store = true;
-      builders-use-substitutes = true;
-      experimental-features = [ "nix-command" "flakes" "repl-flake" ];
-      keep-derivations = true;
-      keep-outputs = true;
-      max-jobs = "auto";
-      warn-dirty = false;
-    };
-
-    gc = {
-      automatic = true;
-      dates = "daily";
-      options = "--delete-older-than 3d";
-    };
-  };
-
-  # Set hostname
-  networking.hostName = "puzzlevision";
-
-  # Enable networking
-  networking.networkmanager.enable = true;
-  
-  # Install the latest kernel
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-
-  # Network card driver
-  boot.extraModulePackages = [
-    pkgs.linuxPackages_latest.rtl8821ce
-  ];
-
-  boot.blacklistedKernelModules = [
-    "rtw88_8821ce"
-  ];
-
-  # Bootloader.
-  boot.loader.grub = {
-    enable = true;
-    devices = [ "nodev" ];
-    efiInstallAsRemovable = true;
-    efiSupport = true;
-
-    extraEntries = ''
-      menuentry "Reboot" {
-        reboot
-      }
-      menuentry "Poweroff" {
-        halt
-      }
-    '';
-  };
-
-  # Set your time zone.
-  time.timeZone = "Europe/Berlin";
-
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.UTF-8";
-
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "de_DE.UTF-8";
-    LC_IDENTIFICATION = "de_DE.UTF-8";
-    LC_MEASUREMENT = "de_DE.UTF-8";
-    LC_MONETARY = "de_DE.UTF-8";
-    LC_NAME = "de_DE.UTF-8";
-    LC_NUMERIC = "de_DE.UTF-8";
-    LC_PAPER = "de_DE.UTF-8";
-    LC_TELEPHONE = "de_DE.UTF-8";
-    LC_TIME = "de_DE.UTF-8";
-  };
-
-  # Configure console keymap
-  console.keyMap = "de";
-
-  # Enable the power-profiles-daemon service for improved battery health
-  services.power-profiles-daemon.enable = true;
-
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
-
-  # Enable sound with pipewire.
-  sound.enable = true;
-  hardware.pulseaudio.enable = false;
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-  };
-
-  # Enable bluetooth on boot
-  hardware.bluetooth = {
-    enable = true;
-    powerOnBoot = true;
-    package = pkgs.bluez;
-
-    settings = {
-      General = {
-        Disable = "Handsfree";
-        ControllerMode = "dual";
-        FastConnectable = "true";
-        Experimental = "true";
-        KernelExperimental = "true";
-      };
-    };
-  };
-
-  services.blueman.enable = true;
-
-  # Enable flatpak
-  services.flatpak.enable = true;
-
-  programs.steam = {
-    remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
-    dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
-  };
-
-  # Enable automatic screen rotation and similar features
-  hardware.sensor.iio.enable = true;
-
-  # Enable docker
-  virtualisation.docker.enable = true;
-
-  # Configure keymap in X11
-  services.xserver = {
-    xkb.layout = "de";
-    xkb.variant = "";
-  };
-
-  # Configure fish as the default shell
-  environment.shells = with pkgs; [ fish ];
-  users.defaultUserShell = pkgs.fish;
-  programs.fish.enable = true;
-
-  # Define user accounts
-  users.users = {
-    jo = {
-      isNormalUser = true;
-      description = "Jo";
-      initialPassword = "jo";
-      extraGroups = [ "networkmanager" "wheel" "docker" "tty" "dialout" ];
-    };
-
-    work = {
-      isNormalUser = true;
-      description = "Work account";
-      initialPassword = "work";
-      extraGroups = [ "networkmanager" "wheel" "docker" ];
-    };
-
-    gaming = {
-      isNormalUser = true;
-      description = "Gaming account";
-      initialPassword = "gaming";
-      extraGroups = [ "networkmanager" "wheel" ];
-    };
-  };
-
-  environment.systemPackages = with pkgs; [
-    nano
-    firefox
-    vlc
-    libreoffice
-    spotify
-
-    # Bluetooth
-    bluez
-    bluez-tools
-
-    # Fonts
-    noto-fonts
-    noto-fonts-color-emoji
-  ];
-
-  # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
-  system.stateVersion = "23.05";
-}
diff --git a/hosts/puzzlevision/hardware-configuration.nix b/hosts/puzzlevision/hardware-configuration.nix
deleted file mode 100644
index d27d0ae..0000000
--- a/hosts/puzzlevision/hardware-configuration.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "vmd" "nvme" "rtsx_pci_sdmmc" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/864b1287-89fd-4cc0-98a5-40a3caf804c6";
-      fsType = "btrfs";
-      options = [ "subvol=@" ];
-    };
-
-  boot.initrd.luks.devices."luks-5fd4fc76-d5c5-46c3-b952-1a7a7ff3a1fc".device = "/dev/disk/by-uuid/5fd4fc76-d5c5-46c3-b952-1a7a7ff3a1fc";
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/2429-4141";
-      fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
-    };
-
-  fileSystems."/var/lib/docker/btrfs" =
-    { device = "/@/var/lib/docker/btrfs";
-      fsType = "none";
-      options = [ "bind" ];
-    };
-
-  swapDevices = [ ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.br-9b746f4e7e2f.useDHCP = lib.mkDefault true;
-  # networking.interfaces.docker0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
deleted file mode 100644
index 6a2b195..0000000
--- a/modules/home-manager/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  themes = {
-    gruvbox = {
-      plasma = import ./themes/gruvbox/plasma.nix;
-    };
-
-    catppuccin = {
-      gnome = import ./themes/catppuccin/gnome.nix;
-      global = import ./themes/catppuccin/global.nix;
-    };
-  };
-
-  development = {
-    ssh = import ./development/ssh.nix;
-  };
-}
\ No newline at end of file
diff --git a/modules/home-manager/development/ssh.nix b/modules/home-manager/development/ssh.nix
deleted file mode 100644
index 66ef821..0000000
--- a/modules/home-manager/development/ssh.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  pkgs,
-  config,
-  ...
-}: let 
-  sshDir = "${config.home.homeDirectory}/.ssh";
-in {
-  home.packages = with pkgs; [
-    openssh
-  ];
-
-  programs.ssh = {
-    enable = true;
-    extraConfig = ''
-      AddKeysToAgent yes
-    '';
-
-    matchBlocks = {
-      "github.com" = {
-        identityFile = "${sshDir}/id_ed25519";
-        identitiesOnly = true;
-        user = "git";
-      };
-
-
-      "gitlab.com" = {
-        identityFile = "${sshDir}/id_ed25519";
-        identitiesOnly = true;
-        user = "git";
-      };
-
-
-      "bitbucket.org" = {
-        identityFile = "${sshDir}/id_ed25519";
-        identitiesOnly = true;
-        user = "git";
-      };
-    };
-  };
-}
diff --git a/modules/home-manager/themes/catppuccin/global.nix b/modules/home-manager/themes/catppuccin/global.nix
deleted file mode 100644
index 261dda9..0000000
--- a/modules/home-manager/themes/catppuccin/global.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  inputs,
-  pkgs,
-  outputs,
-  lib,
-  ...
-}: {
-  catppuccin = {
-    enable = true;
-    accent = "blue";
-    flavor = "frappe";
-
-    pointerCursor.enable = true;
-    pointerCursor.accent = "blue";
-    pointerCursor.flavor = "frappe";
-  };
-}
diff --git a/modules/home-manager/themes/catppuccin/gnome.nix b/modules/home-manager/themes/catppuccin/gnome.nix
deleted file mode 100644
index 9d673c1..0000000
--- a/modules/home-manager/themes/catppuccin/gnome.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  inputs,
-  pkgs,
-  outputs,
-  lib,
-  ...
-}: {
-  gtk = with pkgs; {
-    enable = true;
-
-    font = {
-      name = "Cantarell";
-      size = 12;
-      package = cantarell-fonts;
-    };
-
-    catppuccin = {
-      icon.enable = true;
-      icon.accent = "blue";
-      icon.flavor = "frappe";
-    };
-
-    theme = {
-      name = "Colloid-Dark-Catppuccin";
-      package = colloid-gtk-theme.override {
-        themeVariants = ["default"];
-        colorVariants = ["dark"];
-        sizeVariants = ["standard"];
-        tweaks = ["catppuccin"];
-      };
-    };
-  };
-
-  dconf.settings = {
-    # ---------------------- Theming
-    "org/gnome/desktop/background" = {
-      picture-uri = "${outputs.resources.wallpapers}/animals_at_campfire.jpg";
-      picture-uri-dark = "${outputs.resources.wallpapers}/animals_at_campfire.jpg";
-    };
-
-    "org/gnome/shell/extensions/user-theme" = {
-      name = "Colloid-Dark-Catppuccin";
-    };
-    # ---------------------- Theming END
-  };
-}
diff --git a/modules/home-manager/themes/gruvbox/plasma.nix b/modules/home-manager/themes/gruvbox/plasma.nix
deleted file mode 100644
index 677cb9c..0000000
--- a/modules/home-manager/themes/gruvbox/plasma.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  inputs,
-  pkgs,
-  outputs,
-  lib,
-  ...
-}: {
-  home.packages = with pkgs; [
-    tela-icon-theme
-    outputs.packages.x86_64-linux.themes.kde-gruvbox-colors
-  ];
-
-  programs.plasma.workspace = {
-    iconTheme = "Tela-green-dark";
-    colorScheme = "GruvboxColors";
-    wallpaper = "${outputs.resources.wallpapers}/gruvbox/green_pokemon_guy.png";
-  };
-}
\ No newline at end of file
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
deleted file mode 100644
index ecd07d6..0000000
--- a/modules/nixos/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  desktop = {
-    kde = import ./desktop/kde.nix;
-    gnome = import ./desktop/gnome.nix;
-    cosmic = import ./desktop/cosmic.nix;
-  };
-}
\ No newline at end of file
diff --git a/modules/nixos/desktop/cosmic.nix b/modules/nixos/desktop/cosmic.nix
deleted file mode 100644
index 976cb41..0000000
--- a/modules/nixos/desktop/cosmic.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  inputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
-  # Enable the x11 windowing system
-  services.xserver.enable = true;
-
-  # Enable Cosmic DE
-  services.desktopManager.cosmic.enable = true;
-
-  # Enable Cosmic greeter
-  services.displayManager.cosmic-greeter.enable = true;
-}
diff --git a/modules/nixos/desktop/gnome.nix b/modules/nixos/desktop/gnome.nix
deleted file mode 100644
index 8f7ba51..0000000
--- a/modules/nixos/desktop/gnome.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  inputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
-  # Enable the X11 windowing system.
-  services.xserver.enable = true;
-
-  # Enable the GNOME Desktop Environment.
-  services.xserver.displayManager.gdm.enable = true;
-  services.xserver.desktopManager.gnome.enable = true;
-
-  environment.gnome.excludePackages = (with pkgs; [
-    gnome-tour
-    gedit
-  ]) ++ (with pkgs.gnome; [
-    cheese
-    gnome-music
-    epiphany # Gnome web
-    tali # Poker game
-    iagno # Go game
-    hitori # Sudoku game
-    yelp # Help view
-    gnome-contacts
-    gnome-initial-setup
-    geary
-  ]);
-
-  programs.dconf.enable = true;
-
-  services.gnome.gnome-keyring.enable = true;
-
-  programs.kdeconnect = {
-    enable = true;
-    package = pkgs.gnomeExtensions.gsconnect;
-  };
-
-  environment.systemPackages = with pkgs; [
-    gnome.gnome-tweaks
-  ];
-}
\ No newline at end of file
diff --git a/modules/nixos/desktop/kde.nix b/modules/nixos/desktop/kde.nix
deleted file mode 100644
index 604b96e..0000000
--- a/modules/nixos/desktop/kde.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  inputs,
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
-  # Enable the x11 windowing system
-  services.xserver.enable = true;
-
-  # Enable the SDDM display manager.
-  services.displayManager.sddm.enable = true;
-
-  # Enable the KDE Plasma 6 desktop environment.
-  services.desktopManager.plasma6.enable = true;
-
-  # Enable KDE-Connect
-  programs.kdeconnect.enable = true;
-
-  # On-screen keyboard dependency
-  environment.systemPackages = with pkgs; [
-    maliit-keyboard
-  ];
-}
diff --git a/pkgs/default.nix b/pkgs/default.nix
deleted file mode 100644
index 7cb14e4..0000000
--- a/pkgs/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-# Custom packages, that can be defined similarly to ones from nixpkgs
-# You can build them using 'nix build .#example'
-pkgs: {
-  # example = pkgs.callPackage ./example { };
-  themes = {
-    kde-gruvbox-colors = pkgs.callPackage ./themes/kde-gruvbox-colors.nix { };
-  };
-
-  gnomeExtensions = {
-    rounded-window-corners = pkgs.callPackage ./gnomeExtensions/rounded-window-corners.nix { };
-  };
-}
diff --git a/pkgs/gnomeExtensions/rounded-window-corners.nix b/pkgs/gnomeExtensions/rounded-window-corners.nix
deleted file mode 100644
index f504a9d..0000000
--- a/pkgs/gnomeExtensions/rounded-window-corners.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchFromGitHub, pkgs }:
-
-stdenv.mkDerivation rec {
-  pname = "rounded-window-corners";
-  version = "1.0.0";
-
-  src = fetchFromGitHub {
-    owner = "flexagoon";
-    repo = pname;
-    rev = "61c326e3d6cba36fe3d07cf1c15e6c74d3f9abb1";
-    sha256 = "sha256-jS6G9wSKSXAxNhCmuew6pTcYa1gTZqbfrcAZ0ky4vkc=";
-  };
-
-  buildInputs = with pkgs; [ nodejs_22 gettext just ];
-
-  installPhase = ''
-    runHook preInstall
-
-    just install
-
-    mkdir -p $out/share/gnome-shell/extensions
-    cp ~/.local/share/gnome-shell/extensions/rounded-window-corners@fxgn $out/share/gnome-shell/extensions/rounded-window-corners@fxgn
-
-    runHook postInstall
-  '';
-}
\ No newline at end of file
diff --git a/pkgs/themes/kde-gruvbox-colors.nix b/pkgs/themes/kde-gruvbox-colors.nix
deleted file mode 100644
index 72c805e..0000000
--- a/pkgs/themes/kde-gruvbox-colors.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
-  pname = "kde-gruvbox-colors";
-  version = "1.0.0";
-
-  src = fetchFromGitHub {
-    owner = "jokiller230";
-    repo = pname;
-    rev = "438a23c571e22c1bf416c229afac78ad64e81f17";
-    sha256 = "sha256-5iRfWqqtv+ImDN96PuWaS3nuK8AHjfa4DGc8vCkLi4U=";
-  };
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/share
-    cp -R color-schemes konsole $out/share
-
-    runHook postInstall
-  '';
-}
\ No newline at end of file
diff --git a/resources/default.nix b/resources/default.nix
deleted file mode 100644
index 8470c52..0000000
--- a/resources/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  wallpapers = ./wallpapers;
-  app-files = ./programm-files;
-}
diff --git a/resources/programm-files/blackbox/Catppuccin-Macchiato.json b/resources/programm-files/blackbox/Catppuccin-Macchiato.json
deleted file mode 100644
index 2435532..0000000
--- a/resources/programm-files/blackbox/Catppuccin-Macchiato.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "name": "Catppuccin-Macchiato",
-  "comment": "Soothing pastel theme for the high-spirited!",
-  "background-color": "#24273A",
-  "foreground-color": "#CAD3F5",
-  "badge-color": "#5B6078",
-  "bold-color": "#5B6078",
-  "cursor-background-color": "#F4DBD6",
-  "cursor-foreground-color": "#24273A",
-  "highlight-background-color": "#F4DBD6",
-  "highlight-foreground-color": "#24273A",
-  "palette": [
-    "#494D64",
-    "#ED8796",
-    "#A6DA95",
-    "#EED49F",
-    "#8AADF4",
-    "#F5BDE6",
-    "#8BD5CA",
-    "#B8C0E0",
-    "#5B6078",
-    "#ED8796",
-    "#A6DA95",
-    "#EED49F",
-    "#8AADF4",
-    "#F5BDE6",
-    "#8BD5CA",
-    "#A5ADCB"
-  ],
-  "use-badge-color": false,
-  "use-bold-color": false,
-  "use-cursor-color": true,
-  "use-highlight-color": true,
-  "use-theme-colors": false
-}
diff --git a/resources/programm-files/fish/Catppuccin Frappe.theme b/resources/programm-files/fish/Catppuccin Frappe.theme
deleted file mode 100644
index b4c1994..0000000
--- a/resources/programm-files/fish/Catppuccin Frappe.theme	
+++ /dev/null
@@ -1,30 +0,0 @@
-# name: 'Catppuccin Frappé'
-# url: 'https://github.com/catppuccin/fish'
-# preferred_background: 303446
-
-fish_color_normal c6d0f5
-fish_color_command 8caaee
-fish_color_param eebebe
-fish_color_keyword e78284
-fish_color_quote a6d189
-fish_color_redirection f4b8e4
-fish_color_end ef9f76
-fish_color_comment 838ba7
-fish_color_error e78284
-fish_color_gray 737994
-fish_color_selection --background=414559
-fish_color_search_match --background=414559
-fish_color_option a6d189
-fish_color_operator f4b8e4
-fish_color_escape ea999c
-fish_color_autosuggestion 737994
-fish_color_cancel e78284
-fish_color_cwd e5c890
-fish_color_user 81c8be
-fish_color_host 8caaee
-fish_color_host_remote a6d189
-fish_color_status e78284
-fish_pager_color_progress 737994
-fish_pager_color_prefix f4b8e4
-fish_pager_color_completion c6d0f5
-fish_pager_color_description 737994
\ No newline at end of file
diff --git a/resources/wallpapers/animals_at_campfire.jpg b/resources/wallpapers/animals_at_campfire.jpg
deleted file mode 100644
index cc76e9a..0000000
Binary files a/resources/wallpapers/animals_at_campfire.jpg and /dev/null differ
diff --git a/resources/wallpapers/gruvbox/green_pokemon_guy.png b/resources/wallpapers/gruvbox/green_pokemon_guy.png
deleted file mode 100644
index df57eb7..0000000
Binary files a/resources/wallpapers/gruvbox/green_pokemon_guy.png and /dev/null differ
diff --git a/users/gaming/desktop/plasma.nix b/users/gaming/desktop/plasma.nix
deleted file mode 100644
index 85aa0e8..0000000
--- a/users/gaming/desktop/plasma.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  inputs,
-  lib,
-  config,
-  pkgs,
-  outputs,
-  ...
-}: {
-  imports = [
-    inputs.plasma-manager.homeManagerModules.plasma-manager
-    outputs.homeManagerModules.themes.gruvbox.plasma
-  ];
-
-  home.packages = with pkgs; [
-    kdePackages.sierra-breeze-enhanced
-    kde-rounded-corners
-  ];
-
-  # Plasma configuration
-  programs.plasma = {
-    enable = true;
-
-    workspace = {
-      clickItemTo = "select";
-    };
-  };
-}
\ No newline at end of file
diff --git a/users/gaming/home.nix b/users/gaming/home.nix
deleted file mode 100644
index 9c5d872..0000000
--- a/users/gaming/home.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  inputs,
-  lib,
-  config,
-  pkgs,
-  outputs,
-  ...
-}: {
-  imports = [
-    ./desktop/plasma.nix
-  ];
-
-  nixpkgs = {
-    config = {
-      allowUnfree = true;
-
-      # Workaround for https://github.com/nix-community/home-manager/issues/2942
-      allowUnfreePredicate = _: true;
-    };
-  };
-
-  # Username and home directory
-  home = {
-    username = "gaming";
-    homeDirectory = "/home/gaming";
-  };
-
-  # General packages
-  home.packages = with pkgs; [
-    lutris
-    vesktop
-    steam
-    lunar-client
-  ];
-
-  # Enable home-manager
-  programs.home-manager.enable = true;
-
-  # Nicely reload system units when changing configs
-  systemd.user.startServices = "sd-switch";
-
-  home.stateVersion = "23.05";
-}
diff --git a/users/jo/apps/blackbox.nix b/users/jo/apps/blackbox.nix
deleted file mode 100644
index 355f400..0000000
--- a/users/jo/apps/blackbox.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  inputs,
-  pkgs,
-  outputs,
-  lib,
-  ...
-}: {
-  home.file.".local/share/blackbox/schemes/Catppuccin-Macchiato.json".source = "${outputs.resources.app-files}/blackbox/Catppuccin-Macchiato.json";
-}
diff --git a/users/jo/apps/fish.nix b/users/jo/apps/fish.nix
deleted file mode 100644
index 629b486..0000000
--- a/users/jo/apps/fish.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  inputs,
-  pkgs,
-  outputs,
-  lib,
-  ...
-}: {
-  home.file.".config/fish/themes/Catppuccin\ Frappe.theme".source = "${outputs.resources.app-files}/fish/Catppuccin\ Frappe.theme";
-}
diff --git a/users/jo/apps/librewolf.nix b/users/jo/apps/librewolf.nix
deleted file mode 100644
index f785e22..0000000
--- a/users/jo/apps/librewolf.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  inputs,
-  pkgs,
-  outputs,
-  lib,
-  ...
-}: {
-  home.file.".librewolf/librewolf.overrides.cfg".text = ''
-    defaultPref("identity.fxaccounts.enabled", true);
-  '';
-}
diff --git a/users/jo/desktop/gnome.nix b/users/jo/desktop/gnome.nix
deleted file mode 100644
index fc902f1..0000000
--- a/users/jo/desktop/gnome.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  inputs,
-  pkgs,
-  outputs,
-  lib,
-  ...
-}: {
-  imports = [
-    outputs.homeManagerModules.themes.catppuccin.gnome
-  ];
-
-  home.packages = with pkgs.gnomeExtensions; [
-    dash-to-dock
-    user-themes
-    blur-my-shell
-    appindicator
-    unite
-    color-picker
-  ];
-
-  # Use `dconf watch /` to track stateful changes you are doing, then set them here.
-  dconf.settings = {
-    "org/gnome/desktop/interface" = {
-      color-scheme = "prefer-dark";
-      cursor-theme = "catppuccin-frappe-blue-cursors";
-    };
-
-    "org/gnome/shell" = {
-      favorite-apps = [
-        "org.gnome.Nautilus.desktop"
-        "firefox.desktop"
-        "spotify.desktop"
-        "phpstorm.desktop"
-      ];
-
-      enabled-extensions = [
-        "user-theme@gnome-shell-extensions.gcampax.github.com"
-        "dash-to-dock@micxgx.gmail.com"
-        "blur-my-shell@aunetx"
-        "appindicatorsupport@rgcjonas.gmail.com"
-        "unite@hardpixel.eu"
-        "color-picker@tuberry"
-      ];
-    };
-
-    "org/gnome/desktop/wm/preferences" = {
-      workspace-names = [ "Main" ];
-    };
-
-    "org/gnome/shell/extensions/unite" = {
-      use-activities-text = false;
-      extend-left-box = false;
-      reduce-panel-spacing = false;
-      window-buttons-placement = "first";
-      show-legacy-tray = false;
-      show-appmenu-button = false;
-      show-desktop-name = false;
-      enable-titlebar-actions = false;
-      restrict-to-primary-screen = true;
-      hide-activities-button = "never";
-      hide-window-titlebars = "maximized";
-      show-window-title = false;
-      autofocus-windows = true;
-      show-window-buttons = "maximized";
-      notifications-position = "right";
-      window-buttons-theme = "catppuccin";
-    };
-  };
-}
diff --git a/users/jo/desktop/kde.nix b/users/jo/desktop/kde.nix
deleted file mode 100644
index 85aa0e8..0000000
--- a/users/jo/desktop/kde.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  inputs,
-  lib,
-  config,
-  pkgs,
-  outputs,
-  ...
-}: {
-  imports = [
-    inputs.plasma-manager.homeManagerModules.plasma-manager
-    outputs.homeManagerModules.themes.gruvbox.plasma
-  ];
-
-  home.packages = with pkgs; [
-    kdePackages.sierra-breeze-enhanced
-    kde-rounded-corners
-  ];
-
-  # Plasma configuration
-  programs.plasma = {
-    enable = true;
-
-    workspace = {
-      clickItemTo = "select";
-    };
-  };
-}
\ No newline at end of file
diff --git a/users/jo/home.nix b/users/jo/home.nix
deleted file mode 100644
index be22501..0000000
--- a/users/jo/home.nix
+++ /dev/null
@@ -1,124 +0,0 @@
-{
-  inputs,
-  lib,
-  config,
-  pkgs,
-  outputs,
-  ...
-}: {
-  imports = [
-    ./desktop/gnome.nix
-    ./apps/fish.nix
-    ./apps/blackbox.nix
-    ./apps/librewolf.nix
-    outputs.homeManagerModules.themes.catppuccin.global
-    outputs.homeManagerModules.development.ssh
-  ];
-
-  nixpkgs = {
-    config = {
-      allowUnfree = true;
-
-      # Workaround for https://github.com/nix-community/home-manager/issues/2942
-      allowUnfreePredicate = _: true;
-    };
-  };
-
-  # Username and home directory
-  home = {
-    username = "jo";
-    homeDirectory = "/home/jo";
-  };
-
-  # Flatpak packages
-  services.flatpak = {
-    enable = true;
-    update.auto.enable = true;
-    uninstallUnmanaged = true;
-
-    packages = [
-      "com.jeffser.Alpaca"
-      "dev.aunetx.deezer"
-    ];
-  };
-
-  # General packages
-  home.packages = with pkgs; [
-    qflipper
-    wineWowPackages.waylandFull
-    vesktop
-    lunar-client
-    steam
-    g4music
-    librewolf
-
-    # For development
-    avra
-    avrdude
-    jetbrains.phpstorm
-    git
-    nodejs_22
-    bun
-    termius
-    blackbox-terminal
-    forge-sparks
-    devenv
-
-    # Work stuff for when I'm not actually working
-    teams-for-linux
-    enpass
-
-    # Notes and Organisation
-    obsidian
-
-    # File synchronization
-    celeste
-  ];
-
-  # Enable home-manager
-  programs.home-manager.enable = true;
-
-  # Enable and configure git
-  programs.git = {
-    enable = true;
-
-    userEmail = "jo@thevoid.cafe";
-    userName = "Jo";
-
-    extraConfig = {
-      user = {
-        signingkey = "$HOME/.ssh/id_ed25519";
-      };
-
-      init = {
-        defaultBranch = "main";
-      };
-
-      color = {
-        ui = true;
-      };
-    };
-  };
-
-  programs.gh = {
-    enable = true;
-
-    gitCredentialHelper = {
-      enable = true;
-
-      hosts = [
-        "https://github.com"
-        "https://gist.github.com"
-        "https://git.thevoid.cafe"
-        "https://gitlab.org"
-        "https://git.semiko.dev"
-        "https://bitbucket.org"
-      ];
-    };
-  };
-
-  # Nicely reload system units when changing configs
-  systemd.user.startServices = "sd-switch";
-
-  home.stateVersion = "23.05";
-}
diff --git a/users/work/desktop/plasma.nix b/users/work/desktop/plasma.nix
deleted file mode 100644
index 85aa0e8..0000000
--- a/users/work/desktop/plasma.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  inputs,
-  lib,
-  config,
-  pkgs,
-  outputs,
-  ...
-}: {
-  imports = [
-    inputs.plasma-manager.homeManagerModules.plasma-manager
-    outputs.homeManagerModules.themes.gruvbox.plasma
-  ];
-
-  home.packages = with pkgs; [
-    kdePackages.sierra-breeze-enhanced
-    kde-rounded-corners
-  ];
-
-  # Plasma configuration
-  programs.plasma = {
-    enable = true;
-
-    workspace = {
-      clickItemTo = "select";
-    };
-  };
-}
\ No newline at end of file
diff --git a/users/work/home.nix b/users/work/home.nix
deleted file mode 100644
index b38feec..0000000
--- a/users/work/home.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  pkgs,
-  lib,
-  outputs,
-  inputs,
-  config,
-  ...
-}: {
-  imports = [
-    ./desktop/plasma.nix
-    outputs.homeManagerModules.development.ssh
-  ];
-
-  nixpkgs = {
-    config = {
-      allowUnfree = true;
-
-      # Workaround for https://github.com/nix-community/home-manager/issues/2942
-      allowUnfreePredicate = _: true;
-    };
-  };
-
-  home = {
-    username = "work";
-    homeDirectory = "/home/work";
-  };
-
-  home.packages = with pkgs; [
-		jetbrains.phpstorm
-		thunderbird
-		teams-for-linux
-		enpass
-		vscodium
-  ];
-
-  systemd.user.startServices = "sd-switch";
-
-  home.stateVersion = "23.05";
-}