diff --git a/backup/Makefile b/backup/Makefile
deleted file mode 100644
index f3d5837..0000000
--- a/backup/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-result: $(shell find dotfiles darwin -type f) darwin.sh
-	./darwin.sh build
diff --git a/backup/nix/sources.json b/backup/nix/sources.json
deleted file mode 100644
index 47e17c4..0000000
--- a/backup/nix/sources.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "kak-lsp": {
-        "branch": "master",
-        "description": "Kakoune Language Server Protocol Client",
-        "homepage": null,
-        "owner": "kak-lsp",
-        "repo": "kak-lsp",
-        "rev": "bad9859300ef1168b1422469247c8cbeeb029d2f",
-        "sha256": "1dvgji9ny5s2dmlxrvzk3n4y3jy7xa8rn4jxfav4r4y3jg4hafqh",
-        "type": "tarball",
-        "url": "https://github.com/kak-lsp/kak-lsp/archive/bad9859300ef1168b1422469247c8cbeeb029d2f.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
-    "nixpkgs-mozilla": {
-        "branch": "master",
-        "description": "mozilla related nixpkgs (extends nixos/nixpkgs repo)",
-        "homepage": "",
-        "owner": "mozilla",
-        "repo": "nixpkgs-mozilla",
-        "rev": "b1001ed670666ca4ce1c1b064481f88694315c1d",
-        "sha256": "1hpig8z4pzdwc2vazr6hg7qyxllbgznsaivaigjnmrdszlxz55zz",
-        "type": "tarball",
-        "url": "https://github.com/mozilla/nixpkgs-mozilla/archive/b1001ed670666ca4ce1c1b064481f88694315c1d.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    }
-}
diff --git a/backup/nix/sources.nix b/backup/nix/sources.nix
deleted file mode 100644
index 1938409..0000000
--- a/backup/nix/sources.nix
+++ /dev/null
@@ -1,174 +0,0 @@
-# This file has been generated by Niv.
-
-let
-
-  #
-  # The fetchers. fetch_<type> fetches specs of type <type>.
-  #
-
-  fetch_file = pkgs: name: spec:
-    let
-      name' = sanitizeName name + "-src";
-    in
-      if spec.builtin or true then
-        builtins_fetchurl { inherit (spec) url sha256; name = name'; }
-      else
-        pkgs.fetchurl { inherit (spec) url sha256; name = name'; };
-
-  fetch_tarball = pkgs: name: spec:
-    let
-      name' = sanitizeName name + "-src";
-    in
-      if spec.builtin or true then
-        builtins_fetchTarball { name = name'; inherit (spec) url sha256; }
-      else
-        pkgs.fetchzip { name = name'; inherit (spec) url sha256; };
-
-  fetch_git = name: spec:
-    let
-      ref =
-        if spec ? ref then spec.ref else
-          if spec ? branch then "refs/heads/${spec.branch}" else
-            if spec ? tag then "refs/tags/${spec.tag}" else
-              abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!";
-    in
-      builtins.fetchGit { url = spec.repo; inherit (spec) rev; inherit ref; };
-
-  fetch_local = spec: spec.path;
-
-  fetch_builtin-tarball = name: throw
-    ''[${name}] The niv type "builtin-tarball" is deprecated. You should instead use `builtin = true`.
-        $ niv modify ${name} -a type=tarball -a builtin=true'';
-
-  fetch_builtin-url = name: throw
-    ''[${name}] The niv type "builtin-url" will soon be deprecated. You should instead use `builtin = true`.
-        $ niv modify ${name} -a type=file -a builtin=true'';
-
-  #
-  # Various helpers
-  #
-
-  # https://github.com/NixOS/nixpkgs/pull/83241/files#diff-c6f540a4f3bfa4b0e8b6bafd4cd54e8bR695
-  sanitizeName = name:
-    (
-      concatMapStrings (s: if builtins.isList s then "-" else s)
-        (
-          builtins.split "[^[:alnum:]+._?=-]+"
-            ((x: builtins.elemAt (builtins.match "\\.*(.*)" x) 0) name)
-        )
-    );
-
-  # The set of packages used when specs are fetched using non-builtins.
-  mkPkgs = sources: system:
-    let
-      sourcesNixpkgs =
-        import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) { inherit system; };
-      hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath;
-      hasThisAsNixpkgsPath = <nixpkgs> == ./.;
-    in
-      if builtins.hasAttr "nixpkgs" sources
-      then sourcesNixpkgs
-      else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
-        import <nixpkgs> {}
-      else
-        abort
-          ''
-            Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
-            add a package called "nixpkgs" to your sources.json.
-          '';
-
-  # The actual fetching function.
-  fetch = pkgs: name: spec:
-
-    if ! builtins.hasAttr "type" spec then
-      abort "ERROR: niv spec ${name} does not have a 'type' attribute"
-    else if spec.type == "file" then fetch_file pkgs name spec
-    else if spec.type == "tarball" then fetch_tarball pkgs name spec
-    else if spec.type == "git" then fetch_git name spec
-    else if spec.type == "local" then fetch_local spec
-    else if spec.type == "builtin-tarball" then fetch_builtin-tarball name
-    else if spec.type == "builtin-url" then fetch_builtin-url name
-    else
-      abort "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}";
-
-  # If the environment variable NIV_OVERRIDE_${name} is set, then use
-  # the path directly as opposed to the fetched source.
-  replace = name: drv:
-    let
-      saneName = stringAsChars (c: if isNull (builtins.match "[a-zA-Z0-9]" c) then "_" else c) name;
-      ersatz = builtins.getEnv "NIV_OVERRIDE_${saneName}";
-    in
-      if ersatz == "" then drv else
-        # this turns the string into an actual Nix path (for both absolute and
-        # relative paths)
-        if builtins.substring 0 1 ersatz == "/" then /. + ersatz else /. + builtins.getEnv "PWD" + "/${ersatz}";
-
-  # Ports of functions for older nix versions
-
-  # a Nix version of mapAttrs if the built-in doesn't exist
-  mapAttrs = builtins.mapAttrs or (
-    f: set: with builtins;
-    listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set))
-  );
-
-  # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/lists.nix#L295
-  range = first: last: if first > last then [] else builtins.genList (n: first + n) (last - first + 1);
-
-  # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L257
-  stringToCharacters = s: map (p: builtins.substring p 1 s) (range 0 (builtins.stringLength s - 1));
-
-  # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L269
-  stringAsChars = f: s: concatStrings (map f (stringToCharacters s));
-  concatMapStrings = f: list: concatStrings (map f list);
-  concatStrings = builtins.concatStringsSep "";
-
-  # https://github.com/NixOS/nixpkgs/blob/8a9f58a375c401b96da862d969f66429def1d118/lib/attrsets.nix#L331
-  optionalAttrs = cond: as: if cond then as else {};
-
-  # fetchTarball version that is compatible between all the versions of Nix
-  builtins_fetchTarball = { url, name ? null, sha256 }@attrs:
-    let
-      inherit (builtins) lessThan nixVersion fetchTarball;
-    in
-      if lessThan nixVersion "1.12" then
-        fetchTarball ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; }))
-      else
-        fetchTarball attrs;
-
-  # fetchurl version that is compatible between all the versions of Nix
-  builtins_fetchurl = { url, name ? null, sha256 }@attrs:
-    let
-      inherit (builtins) lessThan nixVersion fetchurl;
-    in
-      if lessThan nixVersion "1.12" then
-        fetchurl ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; }))
-      else
-        fetchurl attrs;
-
-  # Create the final "sources" from the config
-  mkSources = config:
-    mapAttrs (
-      name: spec:
-        if builtins.hasAttr "outPath" spec
-        then abort
-          "The values in sources.json should not have an 'outPath' attribute"
-        else
-          spec // { outPath = replace name (fetch config.pkgs name spec); }
-    ) config.sources;
-
-  # The "config" used by the fetchers
-  mkConfig =
-    { sourcesFile ? if builtins.pathExists ./sources.json then ./sources.json else null
-    , sources ? if isNull sourcesFile then {} else builtins.fromJSON (builtins.readFile sourcesFile)
-    , system ? builtins.currentSystem
-    , pkgs ? mkPkgs sources system
-    }: rec {
-      # The sources, i.e. the attribute set of spec name to spec
-      inherit sources;
-
-      # The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers
-      inherit pkgs;
-    };
-
-in
-mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); }
diff --git a/backup/occasional-scripts/chapters.py b/backup/occasional-scripts/chapters.py
deleted file mode 100644
index 323fd8d..0000000
--- a/backup/occasional-scripts/chapters.py
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env python
-from __future__ import print_function, unicode_literals
-import argparse
-
-parser = argparse.ArgumentParser()
-parser.add_argument("num_chapters", type=int)
-args = parser.parse_args()
-
-task_templates = [
-    "read chapter {}",
-    "make chapter summary for chapter {}",
-    "make flashcards for chapter {}",
-]
-
-for i in range(1, args.num_chapters + 1):
-    for template in task_templates:
-        print(template.format(i))
diff --git a/backup/occasional-scripts/flashcardify.py b/backup/occasional-scripts/flashcardify.py
deleted file mode 100644
index 34540e7..0000000
--- a/backup/occasional-scripts/flashcardify.py
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env python
-import sys
-import argparse
-
-parser = argparse.ArgumentParser()
-parser.add_argument("--name", default=None)
-args = parser.parse_args()
-
-for line in sys.stdin.read().split("\n"):
-    out = line.strip("- ").split("|")
-    if args.name is not None:
-        out.append(args.name)
-
-    print("\t".join(out))
diff --git a/backup/shell.nix b/backup/shell.nix
deleted file mode 100644
index 0266292..0000000
--- a/backup/shell.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ ... }:
-let
-  sources = import ./nix/sources.nix;
-  nixpkgs = import sources.nixpkgs { };
-  niv = import sources.niv { };
-in with nixpkgs;
-stdenv.mkDerivation {
-  name = "dotfiles";
-  buildInputs = [
-    ## meta-information for managing dotfiles
-    niv.niv
-
-    ## formatting
-    python3Packages.black
-
-    ## sample projects
-    # elm
-    elmPackages.elm
-    elmPackages.elm-format
-
-    # rust
-    cargo
-    libiconv
-    rustc
-  ];
-}
diff --git a/backup/torch/README.md b/backup/torch/README.md
deleted file mode 100644
index becae16..0000000
--- a/backup/torch/README.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# Torch
-
-A Early 2015 MacBook Pro (12,2) that I put NixOS on!
-
-## Setting up
-
-- [ ] screenshots and recording
-- [ ] music (spotifyd, maybe? And don't forget the media keys with playerctl, and mpd status in waybar)
-- [x] networking
-- [x] keyboard (caps as ctrl, repeat rate)
-- [x] audio
-- [x] display brightness (on keys)
-- [x] keyboard illumination
-- [x] ssh-agent
-- [x] launcher
-- [x] top bar in sway
-- [x] clipboard
-- [x] wallpapers
-- [x] day/night shifting
-- [x] notifications
-- [x] screen locking
-- [x] Chrome with wayland
-- [x] Obsidian or Neuron or something to manage notes
-- [x] password manager
-- [x] file manager
-- [x] document, image, video viewer
-- [x] emoji font (https://wiki.archlinux.org/index.php/Fonts#Emoji_and_symbols)
-- [x] display management
-
-## Misc Resources to Look At
-
-- [Wayland in 2021](https://shibumi.dev/posts/wayland-in-2021/)
-- [pywal](https://github.com/dylanaraps/pywal)
diff --git a/backup/torch/hardware-configuration.nix b/backup/torch/hardware-configuration.nix
deleted file mode 100644
index 78a89b3..0000000
--- a/backup/torch/hardware-configuration.nix
+++ /dev/null
@@ -1,33 +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 + "/hardware/network/broadcom-43xx.nix")
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
-
-  boot.initrd.availableKernelModules =
-    [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/c6e36cb8-3cfd-470d-aaf3-b3ece1f0289c";
-    fsType = "ext4";
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/62C7-5C97";
-    fsType = "vfat";
-  };
-
-  swapDevices =
-    [{ device = "/dev/disk/by-uuid/1dbbf463-6dc4-46a1-8686-1647374bcc84"; }];
-
-  # high-resolution display
-  hardware.video.hidpi.enable = lib.mkDefault true;
-}
diff --git a/backup/torch/standings.json b/backup/torch/standings.json
deleted file mode 100644
index 1ce9bf3..0000000
--- a/backup/torch/standings.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  "players": [
-    {
-      "name": "clipboard",
-      "rating": 1252,
-      "matches": 5
-    },
-    {
-      "name": "day/night shifting",
-      "rating": 1221,
-      "matches": 5
-    },
-    {
-      "name": "display management",
-      "rating": 1197,
-      "matches": 7
-    },
-    {
-      "name": "document, image, and video viewer",
-      "rating": 1126,
-      "matches": 5
-    },
-    {
-      "name": "file manager",
-      "rating": 1075,
-      "matches": 5
-    },
-    {
-      "name": "launcher",
-      "rating": 1294,
-      "matches": 6
-    },
-    {
-      "name": "music",
-      "rating": 1212,
-      "matches": 7
-    },
-    {
-      "name": "notifications",
-      "rating": 1174,
-      "matches": 5
-    },
-    {
-      "name": "screen locking",
-      "rating": 1132,
-      "matches": 5
-    },
-    {
-      "name": "screenshots and recording",
-      "rating": 1043,
-      "matches": 6
-    },
-    {
-      "name": "ssh-agent",
-      "rating": 1360,
-      "matches": 6
-    },
-    {
-      "name": "top bar in sway",
-      "rating": 1290,
-      "matches": 5
-    },
-    {
-      "name": "wallpapers",
-      "rating": 1224,
-      "matches": 5
-    }
-  ]
-}
\ No newline at end of file
diff --git a/backup/torch/torch.sh b/backup/torch/torch.sh
deleted file mode 100755
index 0e3088a..0000000
--- a/backup/torch/torch.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-NIXOS_CONFIG=$(pwd)/torch/default.nix nixos-rebuild $@
diff --git a/backup/notes/home-manager-with-nix-darwin.org b/notes/home-manager-with-nix-darwin.org
similarity index 100%
rename from backup/notes/home-manager-with-nix-darwin.org
rename to notes/home-manager-with-nix-darwin.org
diff --git a/backup/notes/upgrading-to-21.05.md b/notes/upgrading-to-21.05.md
similarity index 100%
rename from backup/notes/upgrading-to-21.05.md
rename to notes/upgrading-to-21.05.md
diff --git a/backup/wallpapers/README.md b/wallpapers/README.md
similarity index 100%
rename from backup/wallpapers/README.md
rename to wallpapers/README.md
diff --git a/backup/wallpapers/alien-moon.png b/wallpapers/alien-moon.png
similarity index 100%
rename from backup/wallpapers/alien-moon.png
rename to wallpapers/alien-moon.png