diff --git a/home-manager/.gitignore b/home-manager/.gitignore
deleted file mode 100644
index 0e6395d..0000000
--- a/home-manager/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-flake.nix
diff --git a/home-manager/flake.lock b/home-manager/flake.lock
deleted file mode 100644
index 75c7e9d..0000000
--- a/home-manager/flake.lock
+++ /dev/null
@@ -1,274 +0,0 @@
-{
-  "nodes": {
-    "bellado": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1702690530,
-        "narHash": "sha256-evko1/qE4oRXTMdCOGuwJRUkRm7Sxb5MhQCTLgx5Z+4=",
-        "owner": "isabelroses",
-        "repo": "bellado",
-        "rev": "8b9bb4e19b06a35acd8b2d39830c2751246ff189",
-        "type": "github"
-      },
-      "original": {
-        "owner": "isabelroses",
-        "repo": "bellado",
-        "type": "github"
-      }
-    },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1743387206,
-        "narHash": "sha256-24N3NAuZZbYqZ39NgToZgHUw6M7xHrtrAm18kv0+2Wo=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "15c5f9d04fabd176f30286c8f52bbdb2c853a146",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "release-24.11",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "moonlight": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "nixpkgs-unstable"
-        ],
-        "pnpm2nix": "pnpm2nix"
-      },
-      "locked": {
-        "lastModified": 1742927915,
-        "narHash": "sha256-lhTv0kAe9qvowcWVt2pxEKLcdVg2HcMYZMvqxWlDx7E=",
-        "owner": "moonlight-mod",
-        "repo": "moonlight",
-        "rev": "edb548c9fb005a4eed89f2ef72f49b97baa67282",
-        "type": "github"
-      },
-      "original": {
-        "owner": "moonlight-mod",
-        "repo": "moonlight",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1701263465,
-        "narHash": "sha256-lNXUIlkfyDyp9Ox21hr+wsEf/IBklLvb6bYcyeXbdRc=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "50aa30a13c4ab5e7ba282da460a3e3d44e9d0eb3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-23.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-gsr-ui": {
-      "locked": {
-        "lastModified": 1741023597,
-        "narHash": "sha256-09HLLCoC6L8OEjy0mvA7F6agriHQQOGXYsOisE0b4g8=",
-        "owner": "js6pak",
-        "repo": "nixpkgs",
-        "rev": "5c405e5de49ffe89bcdc5b43813b31383eef6f1c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "js6pak",
-        "ref": "gpu-screen-recorder-ui/init",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-unstable": {
-      "locked": {
-        "lastModified": 1743315132,
-        "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "52faf482a3889b7619003c0daec593a1912fddc1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1736344531,
-        "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1743367904,
-        "narHash": "sha256-sOos1jZGKmT6xxPvxGQyPTApOunXvScV4lNjBCXd/CI=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "7ffe0edc685f14b8c635e3d6591b0bbb97365e6c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-24.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1743095683,
-        "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "pnpm2nix": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_2"
-      },
-      "locked": {
-        "lastModified": 1736457458,
-        "narHash": "sha256-eiw+hAsxavEgBfhwrktNI2hwvgeVDzBDYClx/yqka78=",
-        "owner": "NotNite",
-        "repo": "pnpm2nix-nzbr",
-        "rev": "4ac61c6a50623da937dca005e3dbcb8862aafb83",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NotNite",
-        "repo": "pnpm2nix-nzbr",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "bellado": "bellado",
-        "home-manager": "home-manager",
-        "moonlight": "moonlight",
-        "nixpkgs": "nixpkgs_3",
-        "nixpkgs-gsr-ui": "nixpkgs-gsr-ui",
-        "nixpkgs-unstable": "nixpkgs-unstable",
-        "shadps4-git": "shadps4-git"
-      }
-    },
-    "shadps4-git": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_4"
-      },
-      "locked": {
-        "lastModified": 1,
-        "narHash": "sha256-F++9IlKzjo5nlNYC+fpx4GfbJiEUqLarfQPBBT5uz3A=",
-        "path": "/nix/store/pqmm2wcrq2ag9i7msn7yd7ck3qv35rjp-source/programs/shadps4",
-        "type": "path"
-      },
-      "original": {
-        "path": "/nix/store/pqmm2wcrq2ag9i7msn7yd7ck3qv35rjp-source/programs/shadps4",
-        "type": "path"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
diff --git a/home-manager/hosts/low-power-laptop/home.nix b/home-manager/hosts/low-power-laptop/home.nix
deleted file mode 100644
index 45b33cc..0000000
--- a/home-manager/hosts/low-power-laptop/home.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  # Home Manager needs a bit of information about you and the paths it should
-  # manage.
-  home.username = "aria";
-  home.homeDirectory = "/home/aria";
-
-  # This value determines the Home Manager release that your configuration is
-  # compatible with. This helps avoid breakage when a new Home Manager release
-  # introduces backwards incompatible changes.
-  #
-  # You should not change this value, even if you update Home Manager. If you do
-  # want to update the value, then make sure to first check the Home Manager
-  # release notes.
-  home.stateVersion = "24.11"; # Please read the comment before changing.
-
-  # The home.packages option allows you to install Nix packages into your
-  # environment.
-  home.packages = [
-    # # Adds the 'hello' command to your environment. It prints a friendly
-    # # "Hello, world!" when run.
-    # pkgs.hello
-
-    # # It is sometimes useful to fine-tune packages, for example, by applying
-    # # overrides. You can do that directly here, just don't forget the
-    # # parentheses. Maybe you want to install Nerd Fonts with a limited number of
-    # # fonts?
-    # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
-
-    # # You can also create simple shell scripts directly inside your
-    # # configuration. For example, this adds a command 'my-hello' to your
-    # # environment:
-    # (pkgs.writeShellScriptBin "my-hello" ''
-    #   echo "Hello, ${config.home.username}!"
-    # '')
-  ];
-
-  # Home Manager is pretty good at managing dotfiles. The primary way to manage
-  # plain files is through 'home.file'.
-  home.file = {
-    # # Building this configuration will create a copy of 'dotfiles/screenrc' in
-    # # the Nix store. Activating the configuration will then make '~/.screenrc' a
-    # # symlink to the Nix store copy.
-    # ".screenrc".source = dotfiles/screenrc;
-
-    # # You can also set the file content immediately.
-    # ".gradle/gradle.properties".text = ''
-    #   org.gradle.console=verbose
-    #   org.gradle.daemon.idletimeout=3600000
-    # '';
-  };
-
-  # Home Manager can also manage your environment variables through
-  # 'home.sessionVariables'. These will be explicitly sourced when using a
-  # shell provided by Home Manager. If you don't want to manage your shell
-  # through Home Manager then you have to manually source 'hm-session-vars.sh'
-  # located at either
-  #
-  #  ~/.nix-profile/etc/profile.d/hm-session-vars.sh
-  #
-  # or
-  #
-  #  ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh
-  #
-  # or
-  #
-  #  /etc/profiles/per-user/aria/etc/profile.d/hm-session-vars.sh
-  #
-  home.sessionVariables = {
-    # EDITOR = "emacs";
-  };
-
-  # Let Home Manager install and manage itself.
-  programs.home-manager.enable = true;
-}
diff --git a/home-manager/hosts/nixos/home.nix b/home-manager/hosts/nixos/home.nix
deleted file mode 100644
index f2ce34b..0000000
--- a/home-manager/hosts/nixos/home.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  config,
-  pkgs,
-  unstable,
-  inputs,
-  ...
-}:
-
-{
-
-  # Home Manager needs a bit of information about you and the paths it should
-  # manage.
-  home.username = "buymymojo";
-  home.homeDirectory = "/home/buymymojo";
-
-  # This value determines the Home Manager release that your configuration is
-  # compatible with. This helps avoid breakage when a new Home Manager release
-  # introduces backwards incompatible changes.
-  #
-  # You should not change this value, even if you update Home Manager. If you do
-  # want to update the value, then make sure to first check the Home Manager
-  # release notes.
-  home.stateVersion = "24.11"; # Please read the comment before changing.
-
-  # Home Manager is pretty good at managing dotfiles. The primary way to manage
-  # plain files is through 'home.file'.
-  home.file = {
-    # # Building this configuration will create a copy of 'dotfiles/screenrc' in
-    # # the Nix store. Activating the configuration will then make '~/.screenrc' a
-    # # symlink to the Nix store copy.
-    # ".screenrc".source = dotfiles/screenrc;
-
-    # # You can also set the file content immediately.
-    # ".gradle/gradle.properties".text = ''
-    #   org.gradle.console=verbose
-    #   org.gradle.daemon.idletimeout=3600000
-    # '';
-  };
-
-  # Home Manager can also manage your environment variables through
-  # 'home.sessionVariables'. These will be explicitly sourced when using a
-  # shell provided by Home Manager. If you don't want to manage your shell
-  # through Home Manager then you have to manually source 'hm-session-vars.sh'
-  # located at either
-  #
-  #  ~/.nix-profile/etc/profile.d/hm-session-vars.sh
-  #
-  # or
-  #
-  #  ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh
-  #
-  # or
-  #
-  #  /etc/profiles/per-user/buymymojo/etc/profile.d/hm-session-vars.sh
-  #
-  home.sessionVariables = {
-    EDITOR = "code";
-    NIXPKGS_ALLOW_UNFREE = "1";
-  };
-
-  home.sessionPath = [
-    "/home/buymymojo/bin/"
-  ];
-
-  # Let Home Manager install and manage itself.
-  programs.home-manager.enable = true;
-}
diff --git a/home-manager/hosts/nixos/packages.nix b/home-manager/hosts/nixos/packages.nix
deleted file mode 100644
index de3d396..0000000
--- a/home-manager/hosts/nixos/packages.nix
+++ /dev/null
@@ -1,155 +0,0 @@
-{
-  config,
-  pkgs,
-  unstable,
-  gsr-ui,
-  inputs,
-  ...
-}:
-
-{
-
-  home.file."jdks/zulujdk8".source = pkgs.zulu8;
-  home.file."jdks/zulujdk17".source = pkgs.zulu17;
-  home.file."jdks/zulujdk23".source = pkgs.zulu23;
-
-  home.file."Godot/current".source = unstable.godot;
-  home.file."Godot/current-mono".source = unstable.godot-mono;
-  home.file."Godot/export-templates/current".source = unstable.godot-export-templates;
-  home.file."Godot/4.3".source = unstable.godot_4_3;
-  home.file."Godot/4.3-mono".source = unstable.godot_4_3-mono;
-  home.file."Godot/export-templates/4.3".source = unstable.godot_4_3-export-templates;
-
-  home.file."bin/wine".source = unstable.wineWowPackages.waylandFull;
-
-  # The home.packages option allows you to install Nix packages into your
-  # environment.
-  home.packages =
-    with unstable;
-    with inputs;
-    [
-      pkgs.nextcloud-client
-      pkgs.xpipe
-      pkgs.monero-gui
-      unstable.kiwix
-
-      # pkgs.protonplus
-      unstable.pcsx2
-      pkgs.rpcs3
-      unstable.ryubing
-      unstable.torzu
-      pkgs.heroic-unwrapped
-      unstable.ludusavi
-      inputs.shadps4-git.packages."x86_64-linux".default
-
-      unstable.wineWowPackages.waylandFull
-      unstable.winetricks
-      steamtinkerlaunch
-
-      # === Minecraft ===
-      pkgs.prismlauncher
-      # pkgs.zulu8
-      # pkgs.zulu17
-      # pkgs.zulu23
-      # === Minecraft ===
-
-      # === CLI ===
-      pkgs.bat
-      pkgs.btop
-      pkgs.rrsync
-      pkgs.ripgrep
-      pkgs.wl-clipboard
-      pkgs.poop # Compare the performance of multiple commands with a colorful terminal user interface
-      pkgs.age
-      pkgs.stow
-      unstable.yt-dlp
-      pkgs.aria2
-      pkgs.jujutsu
-      pkgs.lazyjj
-      pkgs.biome
-      # === CLI ===
-
-      # === Image CLI ===
-      unstable.oxipng
-      unstable.image_optim
-      unstable.jpegoptim
-      pkgs.libjxl
-      pkgs.libavif
-      pkgs.libwebp
-      pkgs.imagemagick
-      # === Image CLI ===
-
-      # === Game perf ===
-      unstable.mangojuice
-      unstable.goverlay
-      # === Game perf ===
-
-      # === Dev tooling ===
-      # pkgs.rustup
-      # === Dev tooling ===
-
-      # pkgs.polychromatic
-
-      pkgs.lazydocker
-      pkgs.distrobox
-      pkgs.boxbuddy
-
-      unstable.godot-mono
-      unstable.godot-export-templates
-      unstable.blender-hip
-      unstable.freecad-wayland
-      pkgs.unityhub
-      pkgs.material-maker
-      unstable.blockbench
-
-      unstable.gpu-screen-recorder-gtk
-      gsr-ui.gpu-screen-recorder-ui
-
-      # # You can also create simple shell scripts directly inside your
-      # # configuration. For example, this adds a command 'my-hello' to your
-      # # environment:
-      # (pkgs.writeShellScriptBin "my-hello" ''
-      #   echo "Hello, ${config.home.username}!"
-      # '')
-    ];
-
-  programs.mangohud = {
-    enable = true;
-    enableSessionWide = true;
-    package = unstable.mangohud;
-  };
-
-  programs.obs-studio = {
-    enable = true;
-    plugins = with pkgs.obs-studio-plugins; [
-      wlrobs
-      obs-vkcapture
-      obs-pipewire-audio-capture
-      obs-teleport
-      obs-source-record
-      obs-source-clone
-      obs-composite-blur
-    ];
-  };
-
-  # === ssh ===
-  programs.ssh.matchBlocks = {
-    "*" = {
-      identityFile = "/home/buymymojo/.ssh/id_ed25519-mainpc";
-    };
-
-    "game2.buymymojo.net" = {
-      hostname = "game2.buymymojo.net";
-      user = "jumpbox";
-      identityFile = "/home/buymymojo/.ssh/id_ed25519-mainpc";
-    };
-
-    "git.aria.coffee" = {
-      hostname = "git.aria.coffee";
-      user = "git";
-      identityFile = "/home/buymymojo/.ssh/id_ed25519-mainpc";
-      port = 23;
-    };
-  };
-
-}
diff --git a/home-manager/hosts/nixos/services.nix b/home-manager/hosts/nixos/services.nix
deleted file mode 100644
index ddc5404..0000000
--- a/home-manager/hosts/nixos/services.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  config,
-  pkgs,
-  unstable,
-  inputs,
-  ...
-}:
-
-{
-
-  services.ssh-agent.enable = true;
-  services.syncthing.enable = true;
-
-}
diff --git a/home-manager/low-power-laptop.nix b/home-manager/low-power-laptop.nix
deleted file mode 100644
index 0bb9e27..0000000
--- a/home-manager/low-power-laptop.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  description = "Home Manager configuration of aria";
-
-  inputs = {
-    # Specify the source of Home Manager and Nixpkgs.
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
-    home-manager = {
-      url = "github:nix-community/home-manager/release-24.11";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-  };
-
-  outputs = { nixpkgs, home-manager, ... }:
-    let
-      system = "x86_64-linux";
-      pkgs = nixpkgs.legacyPackages.${system};
-    in {
-      homeConfigurations."aria" = home-manager.lib.homeManagerConfiguration {
-        inherit pkgs;
-
-        # Specify your home configuration modules here, for example,
-        # the path to your home.nix.
-        modules = [ ./hosts/low-power-laptop/home.nix ];
-
-        # Optionally use extraSpecialArgs
-        # to pass through arguments to home.nix
-      };
-    };
-}
diff --git a/home-manager/nixos.nix b/home-manager/nixos.nix
deleted file mode 100644
index 25c6f25..0000000
--- a/home-manager/nixos.nix
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-  description = "Home Manager configuration of buymymojo";
-
-  inputs = {
-    # Specify the source of Home Manager and Nixpkgs.
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
-    nixpkgs-unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable";
-
-    home-manager = {
-      url = "github:nix-community/home-manager/release-24.11";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    moonlight = {
-      url = "github:moonlight-mod/moonlight"; # Add `/develop` to the flake URL to use nightly.
-      inputs.nixpkgs.follows = "nixpkgs-unstable";
-    };
-
-    shadps4-git.url = "./programs/shadps4";
-
-    nixpkgs-gsr-ui = {
-      url = "github:js6pak/nixpkgs/gpu-screen-recorder-ui/init"; # Add `/develop` to the flake URL to use nightly.
-    };
-    
-    bellado.url = "github:isabelroses/bellado";
-
-  };
-
-  outputs =
-    {
-      nixpkgs,
-      home-manager,
-      nixpkgs-unstable,
-      nixpkgs-gsr-ui,
-      bellado,
-      ...
-    }@inputs:
-    let
-      system = "x86_64-linux";
-      pkgs = import nixpkgs {
-        inherit system;
-        config.allowUnfree = true;
-      };
-
-      unstable = import nixpkgs-unstable {
-        inherit system;
-        config.allowUnfree = true;
-      };
-
-      gsr-ui = import nixpkgs-gsr-ui {
-        inherit system;
-        config.allowUnfree = true;
-      };
-
-    in
-    {
-      homeConfigurations."buymymojo" = home-manager.lib.homeManagerConfiguration {
-        inherit pkgs;
-        extraSpecialArgs = {
-          inherit unstable;
-          inherit inputs;
-          inherit gsr-ui;
-          inherit bellado;
-    };
-
-        # Specify your home configuration modules here, for example,
-        # the path to your home.nix.
-        modules = [
-          ./hosts/nixos/home.nix
-          ./hosts/nixos/packages.nix
-          ./hosts/nixos/services.nix
-
-          ./packages/common-cli.nix
-          ./packages/common-desktop.nix
-        ];
-
-        # Optionally use extraSpecialArgs
-        # to pass through arguments to home.nix
-      };
-    };
-}
diff --git a/home-manager/packages/common-cli.nix b/home-manager/packages/common-cli.nix
deleted file mode 100644
index f64ca27..0000000
--- a/home-manager/packages/common-cli.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  config,
-  pkgs,
-  unstable,
-  inputs,
-  lib,
-  ...
-}:
-
-let
-  withExtraPackages =
-    pkg: extraPackages:
-    pkgs.runCommand "${pkg.name}-wrapped" { nativeBuildInputs = [ pkgs.makeWrapper ]; } ''
-      for exe in ${lib.getBin pkg}/bin/*; do
-        makeWrapper $exe $out/bin/$(basename $exe) --prefix PATH : ${lib.makeBinPath extraPackages}
-      done
-    '';
-in
-{
-
-  imports = [
-    inputs.bellado.homeManagerModules.default
-  ];
-
-  home.packages =
-    with unstable;
-    with inputs;
-    [
-
-    ];
-
-  programs.neovim = {
-    # package = unstable.neovim;
-    enable = true;
-    viAlias = true;
-    vimAlias = true;
-    plugins = with pkgs.vimPlugins; [
-      lazy-nvim
-    ];
-
-  };
-
-  programs.git = {
-    enable = true;
-    userName = "BuyMyMojo";
-    userEmail = "hello+git@buymymojo.net";
-    lfs.enable = true;
-    signing.key = "E7B7B8D20C8753C077F9B17119AB7AA462B8AB3B";
-    signing.signByDefault = true;
-    extraConfig = {
-      init = {
-
-        defaultBranch = "main";
-      };
-    };
-  };
-
-  programs.bellado = {
-    enable = true;
-    enableAliases = true;
-  };
-
-  programs.ssh.enable = true;
-  programs.ssh.addKeysToAgent = "yes";
-
-  # === shells ===
-  programs.bash.enable = true;
-  programs.fish.enable = true;
-
-}
diff --git a/home-manager/packages/common-desktop.nix b/home-manager/packages/common-desktop.nix
deleted file mode 100644
index c3ddf26..0000000
--- a/home-manager/packages/common-desktop.nix
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-  config,
-  pkgs,
-  unstable,
-  inputs,
-  lib,
-  ...
-}:
-
-let
-  withExtraPackages =
-    pkg: extraPackages:
-    pkgs.runCommand "${pkg.name}-wrapped" { nativeBuildInputs = [ pkgs.makeWrapper ]; } ''
-      for exe in ${lib.getBin pkg}/bin/*; do
-        makeWrapper $exe $out/bin/$(basename $exe) --prefix PATH : ${lib.makeBinPath extraPackages}
-      done
-    '';
-in
-{
-
-  imports = [
-    inputs.moonlight.homeModules.default
-  ];
-
-  nixpkgs = {
-    overlays = [
-      inputs.moonlight.overlays.default
-    ];
-  };
-
-  home.packages =
-    with unstable;
-    with inputs;
-    [
-      pkgs.yubioath-flutter
-      pkgs.qbittorrent
-      unstable.peazip
-
-      # === Communication ===
-      pkgs.vesktop
-      pkgs.discord-canary
-      pkgs.signal-desktop
-      pkgs.telegram-desktop
-      # pkgs.thunderbird-latest-unwrapped
-      # === Communication ===
-
-      # === Editors/Office ===
-      unstable.libreoffice-fresh
-      # pkgs.kdePackages.kate
-      pkgs.jetbrains.webstorm
-      pkgs.jetbrains.rider
-      pkgs.jetbrains.idea-community
-      # unstable.neovim
-      # === Editors/Office ===
-
-      # === Media ===
-      unstable.gimp
-      unstable.krita
-      # pkgs.mpv
-      unstable.losslesscut-bin
-      unstable.jellyfin-media-player
-      # === Media ===
-
-      unstable.orca-slicer
-    ];
-
-  programs.moonlight-mod = {
-    enable = true;
-    # stable = {
-    #   extensions = {
-    #     allActivites.enabled = true;
-    #     alwaysFocus.enabled = true;
-
-    #     betterEmbedsYT = {
-    #       enabled = true;
-    #       config = {
-    #         fullDescription = false;
-    #         expandDescription = true;
-    #       };
-    #     };
-    #   };
-    # };
-  };
-
-}
diff --git a/home-manager/programs/shadps4/.gitignore b/home-manager/programs/shadps4/.gitignore
deleted file mode 100644
index 82e0cdf..0000000
--- a/home-manager/programs/shadps4/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/result
\ No newline at end of file
diff --git a/home-manager/programs/shadps4/flake.lock b/home-manager/programs/shadps4/flake.lock
deleted file mode 100644
index 7fa58fe..0000000
--- a/home-manager/programs/shadps4/flake.lock
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "nodes": {
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1743095683,
-        "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
diff --git a/home-manager/programs/shadps4/flake.nix b/home-manager/programs/shadps4/flake.nix
deleted file mode 100644
index 1acba3f..0000000
--- a/home-manager/programs/shadps4/flake.nix
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-  description = "Current git build of shadps4";
-
-  inputs = {
-    # nixpkgs.url = "github:nixos/nixpkgs?rev=cfd19cdc54680956dc1816ac577abba6b58b901c"; # Same as https://github.com/shadps4-emu/shadPS4/blob/main/shell.nix
-    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
-  };
-
-  outputs =
-    { self, nixpkgs }:
-    let
-      pkgs = import nixpkgs {
-        config.allowUnfree = true;
-        system = "x86_64-linux";
-      };
-    in
-    {
-
-      packages.x86_64-linux.default = pkgs.stdenv.mkDerivation {
-        name = "shadps4-git";
-        pname = "shadps4";
-
-        src = pkgs.fetchFromGitHub {
-          owner = "shadps4-emu";
-          repo = "shadPS4";
-          rev = "a707d31a4c23fdd8aefb146ae04d25ecbca246d0";
-          hash = "sha256-ZOuhdZuLXbR3kzNwoK7jioFy+MjKL8GDBtVRsyGcL98=";
-          fetchSubmodules = true;
-          leaveDotGit = true;
-        };
-
-        nativeBuildInputs = [
-          pkgs.llvmPackages_18.clang
-          pkgs.cmake
-          pkgs.pkg-config
-          pkgs.git
-          pkgs.qt6.wrapQtAppsHook
-        ];
-
-        buildInputs = [
-          pkgs.alsa-lib
-          pkgs.libpulseaudio
-          pkgs.openal
-          pkgs.openssl
-          pkgs.zlib
-          pkgs.libedit
-          pkgs.udev
-          pkgs.libevdev
-          pkgs.SDL2
-          pkgs.jack2
-          pkgs.sndio
-          pkgs.qt6.qtbase
-          pkgs.qt6.qttools
-          pkgs.qt6.qtmultimedia
-
-          pkgs.vulkan-headers
-          pkgs.vulkan-utility-libraries
-          pkgs.vulkan-tools
-
-          pkgs.ffmpeg
-          pkgs.fmt
-          pkgs.glslang
-          pkgs.libxkbcommon
-          pkgs.wayland
-          pkgs.xorg.libxcb
-          pkgs.xorg.xcbutil
-          pkgs.xorg.xcbutilkeysyms
-          pkgs.xorg.xcbutilwm
-          pkgs.sdl3
-          pkgs.stb
-          pkgs.qt6.qtwayland
-          pkgs.wayland-protocols
-          pkgs.libpng
-        ];
-
-        # buildPhase = ''
-        #   # === setup ===
-        #   export QT_QPA_PLATFORM="wayland"
-        #   export QT_PLUGIN_PATH="${pkgs.qt6.qtwayland}/lib/qt-6/plugins:${pkgs.qt6.qtbase}/lib/qt-6/plugins"
-        #   export QML2_IMPORT_PATH="${pkgs.qt6.qtbase}/lib/qt-6/qml"
-        #   export CMAKE_PREFIX_PATH="${pkgs.vulkan-headers}:$CMAKE_PREFIX_PATH"
-
-        #   # OpenGL
-        #   export LD_LIBRARY_PATH="${
-        #     pkgs.lib.makeLibraryPath [
-        #       pkgs.libglvnd
-        #       pkgs.vulkan-tools
-        #     ]
-        #   }:$LD_LIBRARY_PATH"
-
-        #   export LDFLAGS="-L${pkgs.llvmPackages_18.libcxx}/lib -lc++"
-        #   export LC_ALL="C.UTF-8"
-        #   export XAUTHORITY=${builtins.getEnv "XAUTHORITY"}
-        #   # === setup ===
-
-        #   # === build ===
-        #   cmake -S . -B build/ -DENABLE_QT_GUI=ON -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
-        #   # cmake --build ./build --parallel $(nproc)
-        #   # === build ===
-        # '';
-
-        # installPhase = ''
-        #   cmake --install . --parallel $(nproc)
-        # '';
-
-        cmakeFlags = [
-          (nixpkgs.lib.cmakeBool "ENABLE_QT_GUI" true)
-          (nixpkgs.lib.cmakeBool "ENABLE_UPDATER" false)
-        ];
-
-        # Still in development, help with debugging
-        # cmakeBuildType = "RelWithDebugInfo";
-        # dontStrip = true;
-
-        installPhase = ''
-          runHook preInstall
-
-          install -D -t $out/bin shadps4
-          install -Dm644 $src/.github/shadps4.png $out/share/icons/hicolor/512x512/apps/net.shadps4.shadPS4.png
-          install -Dm644 -t $out/share/applications $src/dist/net.shadps4.shadPS4.desktop
-          install -Dm644 -t $out/share/metainfo $src/dist/net.shadps4.shadPS4.metainfo.xml
-
-          runHook postInstall
-        '';
-
-        runtimeDependencies = [
-          pkgs.vulkan-loader
-          pkgs.xorg.libXi
-        ];
-
-      };
-
-    };
-}