Changed location of some persistence files

Fixed impermanence not mounting persist
Updated REAME.md
2025-05-29 18:32:08 +02:00 · 2025-05-29 17:05:15 +02:00 · 2025-05-29 17:04:58 +02:00 · 2025-05-29 16:34:24 +02:00 · 2025-05-29 15:49:24 +02:00 · 2025-05-29 15:31:46 +02:00
152 changed files with 2313 additions and 6774 deletions
@@ -2,18 +2,10 @@

 My NixOS configuration.

-## Usage
+## Installation

-Clone the repository to some directory. `/etc/nixos/git` in this example.
+For disk configuration we use disko, this means that installing the system from the configuration is just a single command:

-Set up `configuration.nix`:
-```nix
-{ ... }:
-
-{
-    imports = [
-        ./hardware-configuration.nix
-        ./git/machines/[machine].nix
-    ];
-}
+```
+sudo nix --experimental-features "nix-command flakes" run "github:nix-community/disko/latest#disko-install" -- --flake git+https://git.bulthuis.dev/Jan/dotfiles#<hostname> --disk main /dev/sda
 ```
@@ -1,11 +0,0 @@
-{ ... }:
-
-{
-  imports = [
-    # Import modules
-    ./modules/default.nix
-
-    # Import custom packages
-    ./pkgs/default.nix
-  ];
-}
@@ -1,123 +1,26 @@
 {
  "nodes": {
-    "base16": {
-      "inputs": {
-        "fromYaml": "fromYaml"
-      },
-      "locked": {
-        "lastModified": 1732200724,
-        "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=",
-        "owner": "SenchoPens",
-        "repo": "base16.nix",
-        "rev": "153d52373b0fb2d343592871009a286ec8837aec",
-        "type": "github"
-      },
-      "original": {
-        "owner": "SenchoPens",
-        "repo": "base16.nix",
-        "type": "github"
-      }
-    },
-    "base16-fish": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1622559957,
-        "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=",
-        "owner": "tomyun",
-        "repo": "base16-fish",
-        "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tomyun",
-        "repo": "base16-fish",
-        "type": "github"
-      }
-    },
-    "base16-helix": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1736852337,
-        "narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=",
-        "owner": "tinted-theming",
-        "repo": "base16-helix",
-        "rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "base16-helix",
-        "type": "github"
-      }
-    },
-    "base16-vim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1735953590,
-        "narHash": "sha256-YbQwaApLFJobn/0lbpMKcJ8N5axKlW2QIGkDS5+xoSU=",
-        "owner": "tinted-theming",
-        "repo": "base16-vim",
-        "rev": "c2a1232aa2c0ed27dcbf005779bcfe0e0ab5e85d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "base16-vim",
-        "type": "github"
-      }
-    },
-    "devshell": {
+    "disko": {
      "inputs": {
        "nixpkgs": [
-          "nixvim",
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1735644329,
-        "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=",
-        "owner": "numtide",
-        "repo": "devshell",
-        "rev": "f7795ede5b02664b57035b3b757876703e2c3eac",
+        "lastModified": 1748225455,
+        "narHash": "sha256-AzlJCKaM4wbEyEpV3I/PUq5mHnib2ryEy32c+qfj6xk=",
+        "owner": "nix-community",
+        "repo": "disko",
+        "rev": "a894f2811e1ee8d10c50560551e50d6ab3c392ba",
        "type": "github"
      },
      "original": {
-        "owner": "numtide",
-        "repo": "devshell",
-        "type": "github"
-      }
-    },
-    "firefox-gnome-theme": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1736899990,
-        "narHash": "sha256-S79Hqn2EtSxU4kp99t8tRschSifWD4p/51++0xNWUxw=",
-        "owner": "rafaelmardojai",
-        "repo": "firefox-gnome-theme",
-        "rev": "91ca1f82d717b02ceb03a3f423cbe8082ebbb26d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rafaelmardojai",
-        "repo": "firefox-gnome-theme",
+        "owner": "nix-community",
+        "repo": "disko",
        "type": "github"
      }
    },
    "flake-compat": {
-      "locked": {
-        "lastModified": 1733328505,
-        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
-        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
-        "revCount": 69,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
-      }
-    },
-    "flake-compat_2": {
      "flake": false,
      "locked": {
        "lastModified": 1733328505,
@@ -133,48 +36,6 @@
        "type": "github"
      }
    },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "nixvim",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1736143030,
-        "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_2": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "nur",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1733312601,
-        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
    "flake-utils": {
      "inputs": {
        "systems": "systems"
@@ -193,156 +54,6 @@
        "type": "github"
      }
    },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": [
-          "stylix",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "fromYaml": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1731966426,
-        "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=",
-        "owner": "SenchoPens",
-        "repo": "fromYaml",
-        "rev": "106af9e2f715e2d828df706c386a685698f3223b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "SenchoPens",
-        "repo": "fromYaml",
-        "type": "github"
-      }
-    },
-    "git-hooks": {
-      "inputs": {
-        "flake-compat": [
-          "nixvim",
-          "flake-compat"
-        ],
-        "gitignore": "gitignore",
-        "nixpkgs": [
-          "nixvim",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1737465171,
-        "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "type": "github"
-      }
-    },
-    "git-hooks_2": {
-      "inputs": {
-        "flake-compat": [
-          "stylix",
-          "flake-compat"
-        ],
-        "gitignore": "gitignore_2",
-        "nixpkgs": [
-          "stylix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1735882644,
-        "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "type": "github"
-      }
-    },
-    "gitignore": {
-      "inputs": {
-        "nixpkgs": [
-          "nixvim",
-          "git-hooks",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
-    "gitignore_2": {
-      "inputs": {
-        "nixpkgs": [
-          "stylix",
-          "git-hooks",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
-    "gnome-shell": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1732369855,
-        "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=",
-        "owner": "GNOME",
-        "repo": "gnome-shell",
-        "rev": "dadd58f630eeea41d645ee225a63f719390829dc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "GNOME",
-        "ref": "47.2",
-        "repo": "gnome-shell",
-        "type": "github"
-      }
-    },
    "home-manager": {
      "inputs": {
        "nixpkgs": [
@@ -350,11 +61,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1737669579,
-        "narHash": "sha256-v9WQ3c4ctwPMfdBZMZxpdM9xXev4uChce4BxOpvsu0E=",
+        "lastModified": 1748134483,
+        "narHash": "sha256-5PBK1nV8X39K3qUj8B477Aa2RdbLq3m7wRxUKRtggX4=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "7b9ece1bf3c8780cde9b975b28c2d9ccd7e9cdb9",
+        "rev": "c1e671036224089937e111e32ea899f59181c383",
        "type": "github"
      },
      "original": {
@@ -363,256 +74,87 @@
        "type": "github"
      }
    },
-    "home-manager_2": {
-      "inputs": {
-        "nixpkgs": [
-          "nixvim",
-          "nixpkgs"
-        ]
-      },
+    "impermanence": {
      "locked": {
-        "lastModified": 1737630279,
-        "narHash": "sha256-wJQCxyMRc4P26zDrHmZiRD5bbfcJpqPG3e2djdGG3pk=",
+        "lastModified": 1737831083,
+        "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=",
        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "0db5c8bfcce78583ebbde0b2abbc95ad93445f7c",
+        "repo": "impermanence",
+        "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "repo": "home-manager",
+        "repo": "impermanence",
        "type": "github"
      }
    },
-    "home-manager_3": {
+    "nix-minecraft": {
      "inputs": {
+        "flake-compat": "flake-compat",
+        "flake-utils": "flake-utils",
        "nixpkgs": [
-          "stylix",
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1736785676,
-        "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d",
+        "lastModified": 1747581338,
+        "narHash": "sha256-/+H9qce+NPsEcAC31s3pbD64nB6GKC3+3ZNLV1+tffk=",
+        "owner": "Jan-Bulthuis",
+        "repo": "nix-minecraft",
+        "rev": "44b6b40d7a3e0a114567b38a203029a5bc67e838",
        "type": "github"
      },
      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
+        "owner": "Jan-Bulthuis",
+        "repo": "nix-minecraft",
        "type": "github"
      }
    },
-    "ixx": {
+    "nix-modpack": {
      "inputs": {
-        "flake-utils": [
-          "nixvim",
-          "nuschtosSearch",
-          "flake-utils"
-        ],
        "nixpkgs": [
-          "nixvim",
-          "nuschtosSearch",
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1729958008,
-        "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
-        "owner": "NuschtOS",
-        "repo": "ixx",
-        "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
+        "lastModified": 1747559249,
+        "narHash": "sha256-+ygKEGMVcXNklO4RDYSd5XzydDmQOZWcOcxYZf/PH1U=",
+        "owner": "Jan-Bulthuis",
+        "repo": "nix-modpack",
+        "rev": "a093625c2847afc3ef257513161c7fe318c6be1c",
        "type": "github"
      },
      "original": {
-        "owner": "NuschtOS",
-        "ref": "v0.0.6",
-        "repo": "ixx",
-        "type": "github"
-      }
-    },
-    "nix-darwin": {
-      "inputs": {
-        "nixpkgs": [
-          "nixvim",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1737504076,
-        "narHash": "sha256-/B4XJnzYU/6K1ZZOBIgsa3K4pqDJrnC2579c44c+4rI=",
-        "owner": "lnl7",
-        "repo": "nix-darwin",
-        "rev": "65cc1fa8e36ceff067daf6cfb142331f02f524d3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lnl7",
-        "repo": "nix-darwin",
+        "owner": "Jan-Bulthuis",
+        "repo": "nix-modpack",
        "type": "github"
      }
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1737469691,
-        "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=",
+        "lastModified": 1747958103,
+        "narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab",
+        "rev": "fe51d34885f7b5e3e7b59572796e1bcb427eccb1",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1737525964,
-        "narHash": "sha256-3wFonKmNRWKq1himW9N3TllbeGIHFACI5vmLpk6moF8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "5757bbb8bd7c0630a0cc4bb19c47e588db30b97c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
        "ref": "nixpkgs-unstable",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1736798957,
-        "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixvim": {
-      "inputs": {
-        "devshell": "devshell",
-        "flake-compat": "flake-compat",
-        "flake-parts": "flake-parts",
-        "git-hooks": "git-hooks",
-        "home-manager": "home-manager_2",
-        "nix-darwin": "nix-darwin",
-        "nixpkgs": "nixpkgs_2",
-        "nuschtosSearch": "nuschtosSearch",
-        "treefmt-nix": "treefmt-nix"
-      },
-      "locked": {
-        "lastModified": 1737667561,
-        "narHash": "sha256-BKUapQPTji3V2uxymGq62/UWF1XMjfHvKd565jj1HlA=",
-        "owner": "nix-community",
-        "repo": "nixvim",
-        "rev": "aab2b81792567237c104b90c3936e073d28a9ac6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixvim",
-        "type": "github"
-      }
-    },
-    "nur": {
-      "inputs": {
-        "flake-parts": "flake-parts_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "treefmt-nix": "treefmt-nix_2"
-      },
-      "locked": {
-        "lastModified": 1737676011,
-        "narHash": "sha256-NqRCQ98D1LY1txY8juG8ufvdSCfvvnoYjV6U6KLRHQ8=",
-        "owner": "nix-community",
-        "repo": "NUR",
-        "rev": "470a60434e82a09ea60adb564919923e1017feb7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "NUR",
-        "type": "github"
-      }
-    },
-    "nuschtosSearch": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "ixx": "ixx",
-        "nixpkgs": [
-          "nixvim",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1737372689,
-        "narHash": "sha256-nH3zK2ki0fd5o5qvbGHxukE4qnOLJa1uCzoDObG5vrE=",
-        "owner": "NuschtOS",
-        "repo": "search",
-        "rev": "570cc17bbc25650eb7d69e4fcda8cfd2f1656922",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NuschtOS",
-        "repo": "search",
-        "type": "github"
-      }
-    },
    "root": {
      "inputs": {
+        "disko": "disko",
        "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs",
-        "nixvim": "nixvim",
-        "nur": "nur",
-        "stylix": "stylix"
-      }
-    },
-    "stylix": {
-      "inputs": {
-        "base16": "base16",
-        "base16-fish": "base16-fish",
-        "base16-helix": "base16-helix",
-        "base16-vim": "base16-vim",
-        "firefox-gnome-theme": "firefox-gnome-theme",
-        "flake-compat": "flake-compat_2",
-        "flake-utils": "flake-utils_2",
-        "git-hooks": "git-hooks_2",
-        "gnome-shell": "gnome-shell",
-        "home-manager": "home-manager_3",
-        "nixpkgs": "nixpkgs_3",
-        "systems": "systems_2",
-        "tinted-foot": "tinted-foot",
-        "tinted-kitty": "tinted-kitty",
-        "tinted-tmux": "tinted-tmux",
-        "tinted-zed": "tinted-zed"
-      },
-      "locked": {
-        "lastModified": 1737657729,
-        "narHash": "sha256-TIDR1zKoP2uaqRot/LnarugfAC9U7geycjbJqA1naVM=",
-        "owner": "danth",
-        "repo": "stylix",
-        "rev": "e594886eb0951a0a0c28ffa333a9df6fb13857a1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "danth",
-        "repo": "stylix",
-        "type": "github"
+        "impermanence": "impermanence",
+        "nix-minecraft": "nix-minecraft",
+        "nix-modpack": "nix-modpack",
+        "nixpkgs": "nixpkgs"
      }
    },
    "systems": {
@@ -629,129 +171,6 @@
        "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"
-      }
-    },
-    "tinted-foot": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1726913040,
-        "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
-        "owner": "tinted-theming",
-        "repo": "tinted-foot",
-        "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "tinted-foot",
-        "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
-        "type": "github"
-      }
-    },
-    "tinted-kitty": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1716423189,
-        "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=",
-        "owner": "tinted-theming",
-        "repo": "tinted-kitty",
-        "rev": "eb39e141db14baef052893285df9f266df041ff8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "tinted-kitty",
-        "rev": "eb39e141db14baef052893285df9f266df041ff8",
-        "type": "github"
-      }
-    },
-    "tinted-tmux": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1735737224,
-        "narHash": "sha256-FO2hRBkZsjlIRqzNHCPc/52yxg11kHGA8MEtSun9RwE=",
-        "owner": "tinted-theming",
-        "repo": "tinted-tmux",
-        "rev": "aead506a9930c717ebf81cc83a2126e9ca08fa64",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "tinted-tmux",
-        "type": "github"
-      }
-    },
-    "tinted-zed": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1725758778,
-        "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=",
-        "owner": "tinted-theming",
-        "repo": "base16-zed",
-        "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "base16-zed",
-        "type": "github"
-      }
-    },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "nixvim",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1737483750,
-        "narHash": "sha256-5An1wq5U8sNycOBBg3nsDDgpwBmR9liOpDGlhliA6Xo=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "f2cc121df15418d028a59c9737d38e3a90fbaf8f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
-    },
-    "treefmt-nix_2": {
-      "inputs": {
-        "nixpkgs": [
-          "nur",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1733222881,
-        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
    }
  },
  "root": "root",
@@ -1,49 +1,21 @@
 {
-  description = "NixOS system";
+  description = "System configuration for NixOS";

  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    home-manager = {
-      url = "github:nix-community/home-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    stylix.url = "github:danth/stylix";
-    nixvim.url = "github:nix-community/nixvim";
-    nur = {
-      url = "github:nix-community/NUR";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    # General inputs
+    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+    home-manager.url = "github:nix-community/home-manager";
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
+    disko.url = "github:nix-community/disko";
+    disko.inputs.nixpkgs.follows = "nixpkgs";
+    impermanence.url = "github:nix-community/impermanence";
+
+    # For Minecraft VM
+    nix-minecraft.url = "github:Jan-Bulthuis/nix-minecraft";
+    nix-minecraft.inputs.nixpkgs.follows = "nixpkgs";
+    nix-modpack.url = "github:Jan-Bulthuis/nix-modpack";
+    nix-modpack.inputs.nixpkgs.follows = "nixpkgs";
  };

-  outputs =
-    {
-      nixpkgs,
-      home-manager,
-      stylix,
-      nixvim,
-      nur,
-      ...
-    }:
-    let
-      baseModules = [
-        home-manager.nixosModules.home-manager
-        {
-          home-manager.sharedModules = [
-            stylix.homeManagerModules.stylix
-            nixvim.homeManagerModules.nixvim
-            nur.modules.homeManager.default
-          ];
-        }
-      ];
-    in
-    {
-      nixosConfigurations = {
-        "20212060" = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          modules = [
-            ./machines/laptop.nix
-          ] ++ baseModules;
-        };
-      };
-    };
+  outputs = inputs: import ./glue inputs;
 }
@@ -0,0 +1,170 @@
+inputs:
+let
+  flake = inputs.self;
+  nixpkgs = inputs.nixpkgs;
+  lib = nixpkgs.lib;
+
+  importDir =
+    path: fn:
+    let
+      entries = builtins.readDir path;
+
+      # Get paths to directories
+      dirs = lib.filterAttrs (_: type: type == "directory") entries;
+      dirPaths = lib.mapAttrs (name: type: {
+        path = "${path}/${name}";
+        type = type;
+      }) dirs;
+
+      # Get paths to nix files
+      nixName = name: builtins.match "(.*)\\.nix" name;
+      files = lib.filterAttrs (name: type: (type != "directory") && ((nixName name) != null)) entries;
+      filePaths = lib.mapAttrs' (name: type: {
+        name = builtins.head (nixName name);
+        value = {
+          path = "${path}/${name}";
+          type = type;
+        };
+      }) files;
+
+      combined = dirPaths // filePaths;
+    in
+    fn (lib.optionalAttrs (builtins.pathExists path) combined);
+
+  # Split out into getNixFiles, getNixFilesRecursive, getDirs
+  importDirRecursive =
+    path: fn:
+    let
+      entries = importDir path lib.id;
+
+      # Dig down recursively
+      dirs = lib.filterAttrs (_: entry: entry.type == "directory") entries;
+      recursedEntries = lib.mapAttrs (name: entry: (importDirRecursive entry.path lib.id)) dirs;
+    in
+    fn (entries // recursedEntries);
+
+  eachSystem = fn: lib.genAttrs lib.systems.flakeExposed fn;
+
+  systemArgs = eachSystem (system: {
+    pkgs = (
+      import inputs.nixpkgs {
+        inherit system;
+      }
+    );
+  });
+
+  allPackages = importDir "${flake}/packages" (
+    attrs:
+    lib.mapAttrs (
+      name: entry: (if entry.type == "directory" then "${entry.path}/default.nix" else entry.path)
+    ) attrs
+  );
+
+  packages =
+    let
+      # TODO: Filter out packages that are not supported on the platform?
+      mkPackages =
+        system:
+        let
+          args = systemArgs."${system}";
+          pkgs = args.pkgs;
+        in
+        lib.mapAttrs (name: package: pkgs.callPackage package { }) allPackages;
+    in
+    eachSystem mkPackages;
+
+  overlay = final: prev: (lib.mapAttrs (name: package: prev.callPackage package { }) allPackages);
+
+  collectEntries =
+    attrs:
+    lib.attrsets.collect (
+      entry: (lib.isAttrs entry) && (lib.hasAttr "path" entry) && (lib.hasAttr "type" entry)
+    ) attrs;
+
+  collectModules =
+    path:
+    importDirRecursive path (
+      attrs:
+      map (entry: if entry.type == "directory" then entry.path + "/default.nix" else entry.path) (
+        collectEntries attrs
+      )
+    );
+
+  nixosModules = collectModules "${flake}/modules/nixos";
+  nixosProfiles = collectModules "${flake}/profiles/nixos";
+  inputNixosModules = lib.map (flake: flake.outputs.nixosModules.default) (
+    lib.filter (flake: lib.hasAttrByPath [ "outputs" "nixosModules" "default" ] flake) (
+      lib.attrValues inputs
+    )
+  );
+
+  homeModules = collectModules "${flake}/modules/home";
+  homeProfiles = collectModules "${flake}/profiles/home";
+  inputHomeModules = lib.map (flake: flake.outputs.homeManagerModules.default) (
+    lib.filter (flake: lib.hasAttrByPath [ "outputs" "homeManagerModules" "default" ] flake) (
+      lib.attrValues inputs
+    )
+  );
+
+  inputOverlays = lib.map (flake: flake.outputs.overlays.default) (
+    lib.filter (flake: lib.hasAttrByPath [ "outputs" "overlays" "default" ] flake) (
+      lib.attrValues inputs
+    )
+  );
+
+  overlayModule =
+    { ... }:
+    {
+      nixpkgs.overlays = [ overlay ] ++ inputOverlays;
+    };
+
+  nixosConfigurations = importDir "${flake}/hosts" (
+    attrs:
+    lib.mapAttrs (
+      name: entry:
+      lib.nixosSystem {
+        specialArgs = {
+          inherit inputs;
+        };
+        modules =
+          let
+            systemPath = "${entry.path}/configuration.nix";
+
+            userEntries = importDir "${entry.path}/users" lib.id;
+
+            usersConfiguration = lib.mapAttrs (name: entry: {
+              isNormalUser = true;
+              group = name;
+            }) userEntries;
+            groupsConfiguration = lib.mapAttrs (name: entry: {
+            }) userEntries;
+            homesConfiguration = lib.mapAttrs (name: entry: entry.path) userEntries;
+
+            usersModule =
+              { ... }:
+              {
+                home-manager.sharedModules = homeModules ++ homeProfiles ++ inputHomeModules;
+                home-manager.useUserPackages = false; # TODO: See if this should be changed to true?
+                home-manager.useGlobalPkgs = true;
+                home-manager.users = homesConfiguration;
+                users.users = usersConfiguration;
+                users.groups = groupsConfiguration;
+              };
+          in
+          [
+            systemPath
+            overlayModule
+            usersModule
+          ]
+          ++ nixosModules
+          ++ nixosProfiles
+          ++ inputNixosModules;
+      }
+    ) (lib.attrsets.filterAttrs (name: entry: entry.type == "directory") attrs)
+  );
+
+in
+{
+  inherit packages nixosConfigurations overlay;
+  overlays.default = overlay;
+}
@@ -0,0 +1,45 @@
+{ flake, ... }:
+
+{
+  # State version
+  system.stateVersion = "24.05";
+
+  # Machine hostname
+  networking.hostName = "20212060";
+
+  # Admin users
+  users.users.jan.extraGroups = [
+    "wheel"
+    "wireshark"
+  ];
+
+  # Enable virtualisation for VMs
+  virtualisation.libvirtd.enable = true;
+
+  # Enable wireshark
+  programs.wireshark = {
+    enable = true;
+    dumpcap.enable = true;
+    usbmon.enable = true;
+  };
+
+  # Set up wstunnel client
+  services.wstunnel = {
+    enable = true;
+    clients.wg-tunnel = {
+      connectTo = "wss://tunnel.bulthuis.dev:443";
+      localToRemote = [
+        "udp://51820:10.10.40.100:51820"
+      ];
+    };
+  };
+
+  # Module setup
+  modules = {
+    profiles.laptop.enable = true;
+  };
+
+  imports = [
+    ./hardware-configuration.nix
+  ];
+}
@@ -0,0 +1,43 @@
+{ ... }:
+
+{
+  # Machine platform
+  nixpkgs.hostPlatform = "x86_64-linux";
+
+  # Hardware configuration
+  hardware.enableRedistributableFirmware = true;
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "nvme"
+    "usb_storage"
+    "sd_mod"
+    "rtsx_pci_sdmmc"
+  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+  hardware.cpu.intel.updateMicrocode = true;
+
+  # Filesystems
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/3b91eaeb-ea95-4bea-8dc1-f55af7502d23";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/46BF-DE2C";
+    fsType = "vfat";
+    options = [
+      "fmask=0077"
+      "dmask=0077"
+    ];
+  };
+
+  # Swapfile
+  swapDevices = [
+    {
+      device = "/var/lib/swapfile";
+      size = 16 * 1024;
+    }
+  ];
+}
@@ -0,0 +1,9 @@
+{
+  ...
+}:
+
+{
+  home.stateVersion = "24.11";
+
+  modules.profiles.jan.enable = true;
+}
@@ -0,0 +1,241 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+
+{
+  # State version
+  system.stateVersion = "24.11";
+
+  # Machine hostname
+  networking.hostName = "vm-audio";
+
+  # Enabled modules
+  modules = {
+    profiles.vm.enable = true;
+    sound.enable = true;
+    # spotifyd.enable = true; # TODO: Add this as a local module
+  };
+
+  # Install system packages
+  environment.systemPackages = with pkgs; [
+    carla
+    xpra
+    alsa-utils
+    pulsemixer
+    adwaita-icon-theme
+    open-stage-control
+    carla_osc_bridge
+
+    # Add LV2 plugins
+    lsp-plugins
+    airwindows-lv2
+    distrho-ports
+    cardinal
+    calf
+  ];
+
+  # Setup firewall
+  networking.firewall = {
+    allowedTCPPorts = [
+      8080
+      10402
+      15151
+      22752
+    ];
+    allowedUDPPorts = [
+      8080
+      10402
+      15151
+      22752
+    ];
+  };
+
+  # Setup dependencies
+  environment.variables.LD_LIBRARY_PATH = lib.mkForce "${lib.makeLibraryPath (
+    with pkgs;
+    [
+      cairo
+      pipewire.jack
+    ]
+  )}";
+  qt = {
+    enable = true;
+    style = "adwaita";
+  };
+  xdg.icons = {
+    enable = true;
+    fallbackCursorThemes = [ "Adwaita" ];
+  };
+  hardware.graphics.enable = true;
+
+  # User for audio mixing
+  users.users.mixer = {
+    isNormalUser = true;
+    group = "mixer";
+    extraGroups = [ "systemd-journal" ];
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKKxoQSxfYqf9ITN8Fhckk8WbY4dwtBAXOhC9jxihJvq jan@bulthuis.dev"
+    ];
+  };
+  users.groups.mixer = { };
+  users.groups.audio = {
+    members = [
+      "mixer"
+    ];
+  };
+  users.groups.bluetooth = {
+    members = [
+      "mixer"
+    ];
+  };
+
+  # Xpra service
+  systemd.user.services.xpra = {
+    description = "Xpra Service";
+    wantedBy = [ "default.target" ];
+    after = [
+      "network.target"
+    ];
+    unitConfig = {
+      ConditionUser = "mixer";
+    };
+    serviceConfig = {
+      ExecStart = "${pkgs.xpra}/bin/xpra start :7 --bind-tcp=0.0.0.0:15151 --daemon=no";
+      Restart = "always";
+      RestartSec = 5;
+    };
+  };
+
+  # Carla service
+  systemd.user.services.carla = {
+    description = "Carla Service";
+    wantedBy = [ "default.target" ];
+    after = [
+      "network.target"
+      "sound.target"
+    ];
+    requires = [
+      "xpra.service"
+    ];
+    unitConfig = {
+      ConditionUser = "mixer";
+    };
+    serviceConfig = {
+      ExecStart = "${pkgs.carla}/bin/carla /home/mixer/Default.carxp -platform xcb";
+      Environment = "\"DISPLAY=:7\"";
+      Restart = "always";
+      RestartSec = 5;
+    };
+  };
+
+  # Carla service
+  systemd.user.services.carla-bridge = {
+    description = "Carla OSC Bridge";
+    wantedBy = [ "default.target" ];
+    after = [
+      "network.target"
+      "sound.target"
+    ];
+    requires = [
+      "carla.service"
+    ];
+    unitConfig = {
+      ConditionUser = "mixer";
+    };
+    serviceConfig = {
+      ExecStart = "${pkgs.carla_osc_bridge}/bin/carla_osc_bridge --clients \"127.0.0.1:8080\"";
+      Restart = "always";
+      RestartSec = 5;
+    };
+  };
+
+  # Open stage control service
+  systemd.user.services.osc = {
+    description = "OSC Service";
+    wantedBy = [ "default.target" ];
+    after = [
+      "network.target"
+    ];
+    requires = [
+      "carla.service"
+    ];
+    unitConfig = {
+      ConditionUser = "mixer";
+    };
+    serviceConfig = {
+      ExecStart = "${pkgs.open-stage-control}/bin/open-stage-control --no-gui --send 127.0.0.1:10402 --load /home/mixer/open-stage-control/session.json --theme /home/mixer/open-stage-control/theme.css";
+      Environment = "\"ELECTRON_RUN_AS_NODE=1\"";
+      Restart = "always";
+      RestartSec = 5;
+    };
+  };
+
+  # Create bluetooth A2DP source
+  hardware.bluetooth = {
+    enable = true;
+    disabledPlugins = [ "hostname" ];
+    settings.General = {
+      Name = "Linox";
+      Class = "0x240414";
+      DiscoverableTimeout = 0;
+      AlwaysPairable = true;
+      PairableTimeout = 0;
+      FastConnectable = true;
+      JustWorksRepairing = "always";
+    };
+  };
+  services.pipewire.wireplumber.extraConfig."50-bluetooth-a2dp" = {
+    "monitor.bluez.properties" = {
+      "bluez5.roles" = [ "a2dp_source" ];
+    };
+  };
+
+  # Create null sinks
+  services.pipewire.extraConfig.pipewire."91-null-sinks" = {
+    "context.objects" = [
+      {
+        factory = "adapter";
+        args = {
+          "factory.name" = "support.null-audio-sink";
+          "node.name" = "Speaker-Proxy";
+          "node.description" = "Proxy for Speaker Output";
+          "media.class" = "Audio/Sink";
+          "audio.position" = "L,R";
+        };
+      }
+      {
+        factory = "adapter";
+        args = {
+          "factory.name" = "support.null-audio-sink";
+          "node.name" = "Headphone-Proxy";
+          "node.description" = "Proxy for Headphone Output";
+          "media.class" = "Audio/Sink";
+          "audio.position" = "L,R";
+        };
+      }
+      {
+        factory = "adapter";
+        args = {
+          "factory.name" = "support.null-audio-sink";
+          "node.name" = "SpotifyD-Proxy";
+          "node.description" = "Proxy for SpotifyD";
+          "media.class" = "Audio/Sink";
+          "audio.position" = "L,R";
+        };
+      }
+      {
+        factory = "adapter";
+        args = {
+          "factory.name" = "support.null-audio-sink";
+          "node.name" = "AnalogIn-Proxy";
+          "node.description" = "Proxy for the analog input";
+          "media.class" = "Audio/Source/Virtual";
+          "audio.position" = "L,R";
+        };
+      }
+    ];
+  };
+}
@@ -0,0 +1,7 @@
+{ ... }:
+
+{
+  home.stateVersion = "24.11";
+
+  modules.profiles.base.enable = true;
+}
@@ -0,0 +1,45 @@
+{
+  lib,
+  pkgs,
+  config,
+  inputs,
+  ...
+}:
+
+{
+  # State version
+  system.stateVersion = "24.11";
+
+  # Import the nix-minecraft modules
+  imports = [
+    inputs.nix-minecraft.nixosModules.minecraft-servers
+  ];
+
+  # Machine hostname
+  networking.hostName = "vm-minecraft";
+
+  # Enabled modules
+  modules = {
+    profiles.vm.enable = true;
+  };
+
+  # Set up minecraft servers
+  users.users.local.extraGroups = [ "minecraft" ];
+  services.minecraft-servers = {
+    enable = true;
+    eula = true;
+    openFirewall = true;
+    servers = {
+      modpack = {
+        enable = true;
+        autoStart = true;
+        serverProperties = { };
+        package = inputs.nix-modpack.packages.${pkgs.system}.mkModpackServer {
+          packUrl = "https://raw.githubusercontent.com/Jan-Bulthuis/Modpack/refs/heads/master/pack.toml";
+          server = inputs.nix-minecraft.legacyPackages.${pkgs.system}.neoForgeServers.neoforge-20_1_106;
+        };
+        jvmOpts = "-Xms6144M -Xmx8192M";
+      };
+    };
+  };
+}
@@ -0,0 +1,7 @@
+{ ... }:
+
+{
+  home.stateVersion = "24.11";
+
+  modules.profiles.base.enable = true;
+}
@@ -0,0 +1,40 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+
+{
+  # State version
+  system.stateVersion = "24.11";
+
+  # Machine hostname
+  networking.hostName = "vm-vpn";
+
+  # Enabled modules
+  modules = {
+    profiles.vm.enable = true;
+  };
+
+  # Setup wstunnel server
+  services.wstunnel = {
+    enable = true;
+    servers.wg-tunnel = {
+      enableHTTPS = false;
+      listen = {
+        host = "0.0.0.0";
+        port = 8080;
+      };
+      restrictTo = [
+        {
+          host = "10.10.40.100";
+          port = 51820;
+        }
+      ];
+    };
+  };
+  networking.firewall = {
+    allowedTCPPorts = [ 8080 ];
+  };
+}
@@ -0,0 +1,7 @@
+{ ... }:
+
+{
+  home.stateVersion = "24.11";
+
+  modules.profiles.base.enable = true;
+}
@@ -1,61 +0,0 @@
-{ lib, ... }:
-
-{
-  imports = [
-    # Import environment
-    ../default.nix
-  ];
-
-  config = {
-    # State version
-    system.stateVersion = "24.05";
-
-    # Machine hostname
-    networking.hostName = "20212060";
-
-    # Enabled modules
-    modules = {
-      base.enable = true;
-      bluetooth.enable = true;
-      power-saving.enable = false;
-      pipewire.enable = true;
-      wpa_supplicant.enable = true;
-    };
-
-    # User accounts
-    machine.users.jan = {
-      sudo = true;
-      configuration = ../users/jan.nix;
-    };
-
-    # Hardware configuration
-    hardware.enableRedistributableFirmware = true;
-    boot.initrd.availableKernelModules = [
-      "xhci_pci"
-      "nvme"
-      "usb_storage"
-      "sd_mod"
-      "rtsx_pci_sdmmc"
-    ];
-    boot.initrd.kernelModules = [ ];
-    boot.kernelModules = [ "kvm-intel" ];
-    boot.extraModulePackages = [ ];
-    swapDevices = [ ];
-    hardware.cpu.intel.updateMicrocode = true;
-
-    # Filesystems
-    fileSystems."/" = {
-      device = "/dev/disk/by-uuid/3b91eaeb-ea95-4bea-8dc1-f55af7502d23";
-      fsType = "ext4";
-    };
-
-    fileSystems."/boot" = {
-      device = "/dev/disk/by-uuid/46BF-DE2C";
-      fsType = "vfat";
-      options = [
-        "fmask=0077"
-        "dmask=0077"
-      ];
-    };
-  };
-}
@@ -1,92 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.base;
-in
-{
-  options.modules.base = {
-    enable = mkEnableOption "base";
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
-      # Add base linux utilities
-      git
-      wget
-      curl
-      dig
-      procps
-      wireguard-tools
-      usbutils
-      pciutils
-      zip
-      unzip
-
-      # TODO: MOVE
-      quickemu # TODO: Reenable once building this is fixed
-      pdftk
-
-      # TODO: Move to USB module
-      # usbutils
-      # udiskie
-      # udisks
-    ];
-
-    security.krb5 = {
-      enable = true;
-      settings = {
-        libdefaults = {
-          rdns = false;
-        };
-        realms = {
-          "GEWISWG.GEWIS.NL" = {
-            kdc = [
-              "https://gewisvdesktop.gewis.nl/KdcProxy"
-            ];
-          };
-        };
-      };
-    };
-
-    modules = {
-      # Enable base modules
-      clean-tmp.enable = true;
-      fontconfig.enable = true;
-      neovim.enable = true;
-      systemd-boot.enable = true;
-      tuigreet.enable = true;
-      # tailscale.enable = true;
-    };
-
-    # TODO: Remove everything below, it is here out of convenience and should be elsewhere
-    # networking.nameservers = [
-    #   "9.9.9.9"
-    #   "149.112.112.112"
-    # ];
-    # programs.captive-browser.enable = true;
-    services.resolved = {
-      enable = true;
-    };
-    networking.firewall.enable = true;
-    programs.dconf.enable = true;
-    services.libinput.enable = true;
-    modules.unfree.enable = true;
-    modules.unfree.allowedPackages = [
-      "nvidia-x11"
-      "nvidia-settings"
-    ];
-    nix.settings.experimental-features = "nix-command flakes";
-    networking.useDHCP = true;
-    nixpkgs.hostPlatform = "x86_64-linux";
-
-    # TODO: Move to USB module
-    # services.gvfs.enable = true;
-    services.udisks2.enable = true;
-  };
-}
@@ -1,23 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.bluetooth;
-in
-{
-  options.modules.bluetooth = {
-    enable = mkEnableOption "bluetooth";
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [ bluez ];
-
-    hardware.bluetooth.enable = true;
-    hardware.bluetooth.powerOnBoot = true;
-  };
-}
@@ -1,18 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.clean-tmp;
-in
-{
-  options.modules.clean-tmp = {
-    enable = mkEnableOption "clean-tmp";
-  };
-
-  config = mkIf cfg.enable { boot.tmp.cleanOnBoot = true; };
-}
@@ -1,37 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.silent-boot;
-in
-{
-  options.modules.silent-boot = {
-    enable = mkEnableOption "silent-boot";
-  };
-
-  config = mkIf cfg.enable {
-    boot = {
-      loader.timeout = 0;
-
-      consoleLogLevel = 0;
-      initrd.verbose = false;
-      initrd.checkJournalingFS = false;
-
-      kernelParams = [
-        "quiet"
-        "boot.shell_on_fail"
-        "loglevel=3"
-        "rd.systemd.show_status=false"
-        "rd.udev.log_level=3"
-        "udev.log_priority=3"
-        "video=efifb:nobgrt"
-        "bgrt_disable"
-      ];
-    };
-  };
-}
@@ -1,18 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.brightnessctl;
-in
-{
-  options.modules.brightnessctl = {
-    enable = mkEnableOption "brightnessctl";
-  };
-
-  config = mkIf cfg.enable { environment.systemPackages = [ pkgs.brightnessctl ]; };
-}
@@ -1,31 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-{
-  imports = [
-    # Import modules
-    ./base/default.nix
-    ./bluetooth/default.nix
-    ./boot/clean-tmp.nix
-    ./boot/silent-boot.nix
-    ./boot/systemd-boot.nix
-    ./brightnessctl/default.nix
-    ./fontconfig/default.nix
-    ./graphics/default.nix
-    ./greeter/greetd/default.nix
-    ./greeter/greetd/tuigreet.nix
-    ./locale/default.nix
-    ./neovim/default.nix
-    ./power-saving/default.nix
-    ./sound/pipewire.nix
-    ./users/default.nix
-    ./unfree/default.nix
-    ./vpn/tailscale.nix
-    ./wifi/wpa_supplicant.nix
-  ];
-}
@@ -1,27 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.fontconfig;
-in
-{
-  options.modules.fontconfig = {
-    enable = mkEnableOption "fontconfig";
-  };
-
-  config = {
-    fonts.fontconfig.enable = cfg.enable;
-    fonts.enableDefaultPackages = false;
-    fonts.fontconfig.defaultFonts = {
-      serif = mkDefault [ ];
-      sansSerif = mkDefault [ ];
-      monospace = mkDefault [ ];
-      emoji = mkDefault [ ];
-    };
-  };
-}
@@ -1,32 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-{
-  config = {
-    # TODO: Modularize further, especially modesetting should be its own module.
-    # Set up graphics
-    hardware.graphics.enable32Bit = true;
-    hardware.graphics.enable = true;
-    services.xserver.videoDrivers = [ "nvidia" ];
-    hardware.nvidia = {
-      modesetting.enable = true;
-      powerManagement.enable = false;
-      powerManagement.finegrained = false;
-      open = false;
-      nvidiaSettings = true;
-      package = config.boot.kernelPackages.nvidiaPackages.stable;
-      prime = {
-        intelBusId = "PCI:0:2:0";
-        nvidiaBusId = "PCI:1:0:0";
-        offload = {
-          enable = true;
-          enableOffloadCmd = true;
-        };
-      };
-    };
-  };
-}
@@ -1,31 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.greetd;
-in
-{
-  options.modules.greetd = {
-    enable = mkEnableOption "greetd";
-    command = mkOption {
-      type = types.str;
-      default = "";
-      description = "Command to run to show greeter.";
-    };
-  };
-
-  config = mkIf cfg.enable {
-    services.greetd = {
-      enable = true;
-      settings.default_session = {
-        command = cfg.command;
-        user = "greeter";
-      };
-    };
-  };
-}
@@ -1,37 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.tuigreet;
-in
-{
-  options.modules.tuigreet = {
-    enable = mkEnableOption "tuigreet";
-    greeting = mkOption {
-      type = types.str;
-      default = "Hewwo! >_< :3";
-      description = "Greeting message to show.";
-    };
-    command = mkOption {
-      type = types.str;
-      default = "~/.initrc";
-      description = "Command to run after logging in.";
-    };
-  };
-
-  config = mkIf cfg.enable {
-    # Enable greetd
-    modules.greetd = {
-      enable = true;
-      command = "${pkgs.greetd.tuigreet}/bin/tuigreet --remember --greeting \"${cfg.greeting}\" --time --cmd \"${cfg.command}\" --asterisks";
-    };
-
-    # Enable silent boot to prevent late log messages from messing up tuigreet
-    modules.silent-boot.enable = true;
-  };
-}
@@ -0,0 +1,81 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.desktop.gnome;
+in
+{
+  options.modules.desktop.gnome = {
+    enable = mkEnableOption "gnome";
+  };
+
+  config = mkIf cfg.enable {
+    # TODO: Enable extensions with dconf
+
+    home.pointerCursor = {
+      name = "capitaine-cursors";
+      size = 24;
+      package = pkgs.capitaine-cursors;
+      gtk.enable = true;
+      x11.enable = true;
+    };
+
+    home.packages =
+      with pkgs;
+      [
+        gnome-session
+        gnome-shell
+        gnome-tweaks
+        gnome-calculator
+        snapshot
+        gnome-characters
+        gnome-connections
+        blackbox-terminal
+        baobab
+        gnome-disk-utility
+        papers
+        nautilus
+        gnome-font-viewer
+        loupe
+        gnome-maps
+        gnome-music
+        gnome-control-center
+        gnome-text-editor
+        showtime
+        file-roller
+        mission-center
+        dconf-editor
+
+        # For theming gtk3
+        adw-gtk3
+      ]
+      ++ (with pkgs.gnomeExtensions; [
+        gsconnect
+        disable-workspace-animation
+        wallpaper-slideshow
+        media-progress
+        # luminus-desktop
+      ]);
+
+    # Enable and set the gtk themes
+    gtk = {
+      enable = true;
+      gtk3.extraConfig = {
+        gtk-theme-name = "adw-gtk3";
+      };
+      gtk4.extraConfig = {
+        gtk-theme-name = "Adwaita";
+      };
+    };
+
+    # Set the theme with dconf
+    dconf.settings."org/gnome/desktop/interface" = {
+      gtk-theme = "adw-gtk3";
+    };
+  };
+}
@@ -0,0 +1,50 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.cpp;
+in
+{
+  options.modules.cpp = {
+    enable = mkEnableOption "cpp";
+  };
+
+  config = mkIf cfg.enable {
+    # Gitignore additions
+    modules.git.ignores = [
+      ".ccls-cache"
+    ];
+
+    # Development packages
+    home.packages = with pkgs; [
+      gnumake
+      gcc
+    ];
+
+    # VSCode configuration
+    programs.vscode = {
+      profiles.default = {
+        extensions = with pkgs.vscode-extensions; [
+          ms-vscode.cpptools
+          ms-vscode.cmake-tools
+          ms-vscode.cpptools-extension-pack
+        ];
+
+        userSettings = {
+          # TODO: Add setting to set the compiler, it currently needs to be set for each workspace individually
+          # "C_Cpp.clang_format_fallbackStyle" = "{ BasedOnStyle: Google, IndentWidth: 4 }";
+        };
+      };
+    };
+
+    # Neovim configuration
+    # programs.nixvim = {
+    #   plugins.lsp.servers.ccls.enable = true;
+    # };
+  };
+}
@@ -23,18 +23,20 @@ in

    # VSCode configuration
    programs.vscode = {
-      extensions = with pkgs.vscode-extensions; [
-        haskell.haskell
-        justusadam.language-haskell
-      ];
+      profiles.default = {
+        extensions = with pkgs.vscode-extensions; [
+          haskell.haskell
+          justusadam.language-haskell
+        ];

-      userSettings = {
-        "[haskell]" = { };
-        # "haskell.formattingProvider" = "fourmolu";
+        userSettings = {
+          "[haskell]" = { };
+          # "haskell.formattingProvider" = "fourmolu";
+        };
      };
    };

    # Neovim configuration
-    programs.nixvim = { };
+    # programs.nixvim = { };
  };
 }
@@ -23,14 +23,16 @@ in

    # VSCode configuration
    programs.vscode = {
-      extensions = with pkgs.vscode-extensions; [
-        bradlc.vscode-tailwindcss
-      ];
+      profiles.default = {
+        extensions = with pkgs.vscode-extensions; [
+          bradlc.vscode-tailwindcss
+        ];

-      userSettings = { };
+        userSettings = { };
+      };
    };

    # Neovim configuration
-    programs.nixvim = { };
+    # programs.nixvim = { };
  };
 }
@@ -0,0 +1,44 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+# TODO: Move to a module for notebooks in general
+with lib;
+let
+  cfg = config.modules.jupyter;
+in
+{
+  options.modules.jupyter = {
+    enable = mkEnableOption "jupyter";
+  };
+
+  config = mkIf cfg.enable {
+    # Development packages
+    # home.packages = with pkgs; [
+    #   evcxr
+    # ];
+
+    # modules.python.extraPythonPackages = p: [
+    #   p.jupyter
+    #   p.notebook
+    # ];
+
+    # VSCode configuration
+    programs.vscode = {
+      profiles.default = {
+        extensions = with pkgs.vscode-extensions; [
+          ms-toolsai.jupyter
+          ms-toolsai.jupyter-renderers
+        ];
+
+        userSettings = { };
+      };
+    };
+
+    # Neovim configuration
+    # programs.nixvim = { };
+  };
+}
@@ -32,18 +32,20 @@ in

    # VSCode configuration
    programs.vscode = {
-      extensions = with pkgs.vscode-extensions; [ jnoortheen.nix-ide ];
+      profiles.default = {
+        extensions = with pkgs.vscode-extensions; [ jnoortheen.nix-ide ];

-      userSettings = {
-        "[nix]" = {
-          "editor.tabSize" = 2;
-        };
-        "nix.enableLanguageServer" = true;
-        "nix.serverPath" = "nixd";
-        "nix.serverSettings" = {
-          nixd = {
-            formatting = {
-              command = [ "nixfmt" ];
+        userSettings = {
+          "[nix]" = {
+            "editor.tabSize" = 2;
+          };
+          "nix.enableLanguageServer" = true;
+          "nix.serverPath" = "nixd";
+          "nix.serverSettings" = {
+            nixd = {
+              formatting = {
+                command = [ "nixfmt" ];
+              };
            };
          };
        };
@@ -51,8 +53,8 @@ in
    };

    # Neovim configuration
-    programs.nixvim = {
+    # programs.nixvim = {

-    };
+    # };
  };
 }
@@ -8,7 +8,6 @@
 with lib;
 let
  cfg = config.modules.python;
-  package = pkgs.python3.withPackages cfg.extraPythonPackages;
 in
 {
  options.modules.python = {
@@ -26,32 +25,28 @@ in

  config = mkIf cfg.enable {
    # Development packages
-    home.packages = [
-      package
-    ];
-
-    # Allow unfree
-    modules.unfree.allowedPackages = [
-      "vscode-extension-MS-python-vscode-pylance"
-    ];
+    home.packages = [ ];

    # VSCode configuration
    programs.vscode = {
-      extensions = with pkgs.vscode-extensions; [
-        ms-python.python
-        ms-python.debugpy
-        ms-python.vscode-pylance
-        ms-python.black-formatter
-      ];
+      profiles.default = {
+        extensions = with pkgs.vscode-extensions; [
+          ms-python.python
+          ms-python.debugpy
+          ms-python.vscode-pylance
+          ms-python.black-formatter
+        ];

-      userSettings = {
-        "[python]" = {
-          "editor.defaultFormatter" = "ms-python.black-formatter";
+        userSettings = {
+          "python.defaultInterpreterPath" = "\${env:PYTHONINTERPRETER}";
+          "[python]" = {
+            "editor.defaultFormatter" = "ms-python.black-formatter";
+          };
        };
      };
    };

    # Neovim configuration
-    programs.nixvim = { };
+    # programs.nixvim = { };
  };
 }
@@ -0,0 +1,59 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.rust;
+in
+{
+  options.modules.rust = {
+    enable = mkEnableOption "rust";
+  };
+
+  config = mkIf cfg.enable {
+    # Development packages
+    home.packages = with pkgs; [
+      # rustup
+      # rustc
+      # cargo
+      # gcc
+      # lldb
+      # bacon
+      # rust-analyzer
+      # rustfmt
+      # clippy
+      # evcxr
+    ];
+
+    # VSCode configuration
+    programs.vscode = {
+      profiles.default = {
+        extensions = with pkgs.vscode-extensions; [
+          rust-lang.rust-analyzer
+          vadimcn.vscode-lldb
+          tamasfe.even-better-toml
+          serayuzgur.crates
+        ];
+
+        userSettings = {
+          "[rust]" = {
+            "editor.inlayHints.enabled" = "off";
+          };
+          "rust-analyzer.check.command" = "clippy";
+          "rust-analyzer.showUnlinkedFileNotification" = false;
+        };
+      };
+    };
+
+    # Neovim configuration
+    # programs.nixvim = {
+    #   plugins.rustaceanvim = {
+    #     enable = true;
+    #   };
+    # };
+  };
+}
@@ -0,0 +1,69 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.tex;
+in
+{
+  options.modules.tex = {
+    enable = mkEnableOption "tex";
+  };
+
+  config = mkIf cfg.enable {
+    # Development packages
+    home.packages = with pkgs; [
+      (texlive.combine {
+        inherit (texlive) scheme-full;
+      })
+    ];
+
+    # Pygments for minted
+    modules.python.extraPythonPackages = p: [
+      p.pygments
+    ];
+
+    # VSCode configuration
+    programs.vscode = {
+      profiles.default = {
+        extensions = with pkgs.vscode-extensions; [ jnoortheen.nix-ide ];
+
+        userSettings = {
+          "[tex]" = { };
+        };
+      };
+    };
+
+    # Neovim configuration
+    # programs.nixvim = {
+    #   extraConfigVim = ''
+    #     " Enforce latexmk
+    #     let g:vimtex_compiler_method = 'latexmk'
+
+    #     " Set latexmk compilation settings
+    #     let g:vimtex_compiler_latexmk = {
+    #       \ 'options': [
+    #       \   '-shell-escape',
+    #       \   '-verbose',
+    #       \   '-file-line-error',
+    #       \   '-synctex=1',
+    #       \   '-interaction=nonstopmode',
+    #       \ ],
+    #       \}
+    #   '';
+
+    #   # Vimtex plugin
+    #   plugins.vimtex = {
+    #     enable = true;
+    #     texlivePackage = null;
+    #     settings = {
+    #       view_method = "zathura";
+    #     };
+    #   };
+    # };
+  };
+}
@@ -0,0 +1,27 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.mathematica;
+
+  my-mathematica = pkgs.mathematica.override {
+    # TODO: Just use a generic name for the installer?
+    # source = ./Wolfram_14.2.1_LIN_Bndl.sh;
+  };
+in
+{
+  options.modules.mathematica = {
+    enable = mkEnableOption "mathematica";
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [
+      my-mathematica
+    ];
+  };
+}
@@ -0,0 +1,190 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.neovim;
+  # theme = config.desktop.theming;
+  # colors = theme.colors;
+in
+{
+  options.modules.neovim = {
+    enable = mkEnableOption "neovim";
+  };
+
+  config = mkIf cfg.enable {
+    # programs.nixvim = {
+    #   enable = true;
+    #   defaultEditor = true;
+    #   viAlias = true;
+    #   vimAlias = true;
+
+    #   # extraPackages = with pkgs; [ ];
+
+    #   opts = {
+    #     number = true;
+    #     relativenumber = true;
+
+    #     signcolumn = "yes";
+
+    #     ignorecase = true;
+    #     smartcase = true;
+
+    #     tabstop = 4;
+    #     shiftwidth = 4;
+    #     softtabstop = 0;
+    #     expandtab = true;
+    #     smarttab = true;
+
+    #     list = true;
+    #     listchars = "tab:»┈«,trail:·,extends:→,precedes:←,nbsp:␣";
+    #   };
+
+    #   diagnostic.settings = {
+    #     enable = true;
+    #     signs = true;
+    #     underline = true;
+    #     update_in_insert = true;
+    #   };
+
+    #   extraConfigLua = ''
+    #     vim.fn.sign_define("DiagnosticSignError",
+    #       {text = "", texthl = "DiagnosticSignError"})
+    #     vim.fn.sign_define("DiagnosticSignWarn",
+    #       {text = "", texthl = "DiagnosticSignWarn"})
+    #     vim.fn.sign_define("DiagnosticSignInfo",
+    #       {text = "", texthl = "DiagnosticSignInfo"})
+    #     vim.fn.sign_define("DiagnosticSignHint",
+    #       {text = "💡", texthl = "DiagnosticSignHint"})
+    #   '';
+
+    #   keymaps = [
+    #     # Save shortcut
+    #     {
+    #       action = ":update<CR>";
+    #       key = "<C-s>";
+    #       mode = "n";
+    #     }
+    #     {
+    #       action = "<C-o>:update<CR>";
+    #       key = "<C-s>";
+    #       mode = "i";
+    #     }
+
+    #     # Neo tree
+    #     {
+    #       action = ":Neotree action=focus reveal toggle<CR>";
+    #       key = "<leader>n";
+    #       mode = "n";
+    #       options.silent = true;
+    #     }
+    #   ];
+
+    #   autoCmd = [
+    #     {
+    #       desc = "Automatic formatting";
+    #       event = "BufWritePre";
+    #       callback = {
+    #         __raw = ''
+    #           function()
+    #             vim.lsp.buf.format {
+    #               async = false,
+    #             }
+    #           end
+    #         '';
+    #       };
+    #     }
+    #   ];
+
+    #   # highlight = {
+    #   #   Comment = {
+    #   #     italic = true;
+    #   #     fg = theme.schemeColors.withHashtag.base03; # TODO: Come up with a good name colors.muted maybe?
+    #   #   };
+    #   # };
+
+    #   plugins.lsp = {
+    #     enable = true;
+    #   };
+
+    #   #plugins.treesitter = {
+    #   #  enable = true;
+    #   #};
+
+    #   plugins.cmp = {
+    #     enable = true;
+
+    #     settings = {
+    #       mapping = {
+    #         "<C-Space>" = "cmp.mapping.complete()";
+    #         "<C-d>" = "cmp.mapping.scroll_docs(-4)";
+    #         "<C-e>" = "cmp.mapping.close()";
+    #         "<C-f>" = "cmp.mapping.scroll_docs(4)";
+    #         "<CR>" = "cmp.mapping.confirm({ select = true })";
+    #         "<S-Tab>" = "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})";
+    #         "<Tab>" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})";
+    #       };
+    #       sources = [
+    #         { name = "path"; }
+    #         { name = "nvim_lsp"; }
+    #       ];
+    #     };
+    #   };
+
+    #   plugins.web-devicons = {
+    #     enable = true;
+    #   };
+
+    #   plugins.neo-tree = {
+    #     enable = true;
+
+    #     closeIfLastWindow = true;
+    #     window = {
+    #       width = 30;
+    #       autoExpandWidth = true;
+    #     };
+
+    #     extraOptions = {
+    #       default_component_configs.git_status.symbols = {
+    #         # Change type
+    #         added = "+";
+    #         deleted = "✕";
+    #         modified = "✦";
+    #         renamed = "→";
+
+    #         # Status type
+    #         untracked = "?";
+    #         ignored = "▫";
+    #         unstaged = "□";
+    #         staged = "■";
+    #         conflict = "‼";
+    #       };
+    #     };
+    #   };
+
+    #   #plugins.cmp-nvim-lsp.enable = true;
+
+    #   plugins.gitsigns = {
+    #     enable = true;
+    #     settings.current_line_blame = true;
+    #   };
+
+    #   #plugins.copilot-vim = {
+    #   #  enable = true;
+    #   #};
+
+    #   # plugins.vimtex = {
+    #   #   enable = true;
+    #   #   texlivePackage = null;
+    #   #   settings = {
+    #   #     view_method = "zathura";
+    #   #   };
+    #   # };
+    # };
+    # programs.neovim.defaultEditor = true;
+  };
+}
@@ -0,0 +1,99 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.vscode;
+  # theme = config.desktop.theming;
+in
+{
+  options.modules.vscode = {
+    enable = mkEnableOption "vscode";
+    # codeFont = mkOption {
+    #   type = types.anything;
+    #   default = theme.fonts.pkgs."Fira Code";
+    # };
+    # fallbackFont = mkOption {
+    #   type = types.anything;
+    #   default = theme.fonts.pkgs."Symbols Nerd Font Mono";
+    # };
+  };
+
+  config = mkIf cfg.enable {
+    # TODO: Fix theming
+    # desktop.theming.fonts.extraFonts = [ cfg.codeFont ];
+
+    programs.vscode = {
+      enable = true;
+
+      mutableExtensionsDir = false;
+      profiles.default = {
+        extensions = with pkgs.vscode-extensions; [
+          eamodio.gitlens
+          ms-vscode.hexeditor
+          mkhl.direnv
+          usernamehw.errorlens
+          gruntfuggly.todo-tree
+          github.copilot
+          github.copilot-chat
+          tomoki1207.pdf
+          ms-vsliveshare.vsliveshare
+          ms-vscode-remote.remote-ssh
+        ];
+
+        userSettings =
+          let
+            # font-family = mkForce "'${cfg.codeFont.name}', '${cfg.fallbackFont.name}'";
+            # TODO: Move the conversion factor to theme settings
+            # font-size = mkForce cfg.codeFont.recommendedSize; # Convert pt to px
+          in
+          {
+            # Font setup
+            # "editor.fontFamily" = font-family;
+            # "editor.inlayHints.fontFamily" = font-family;
+            # "editor.inlineSuggest.fontFamily" = font-family;
+            # "editor.fontSize" = font-size;
+            # "editor.fontLigatures" = true;
+            # "terminal.integrated.fontFamily" = font-family;
+            # "terminal.integrated.fontSize" = font-size;
+            # "chat.editor.fontFamily" = font-family; # TODO: Change this font to the standard UI font
+            # "chat.editor.fontSize" = font-size;
+            # "debug.console.fontFamily" = font-family;
+            # "debug.console.fontSize" = font-size;
+            # "scm.inputFontFamily" = font-family; # TODO: Change this font to the standard UI font
+            # "scm.inputFontSize" = font-size;
+            # "markdown.preview.fontFamily" = mkForce theme.fonts.sansSerif.name; # TODO: Change this font to the standard UI font
+            # "markdown.preview.fontSize" = mkForce theme.fonts.sansSerif.recommendedSize;
+
+            # Formatting
+            "editor.formatOnSave" = true;
+            "editor.tabSize" = 4;
+
+            # Layout
+            "window.menuBarVisibility" = "hidden";
+
+            # Git settings
+            "git.autofetch" = true;
+            "git.enableSmartCommit" = false;
+            "git.suggestSmartCommit" = false;
+
+            # Disable update notifications
+            "update.mode" = "none";
+
+            # Set themes
+            "window.autoDetectColorScheme" = true;
+
+            # TODO: Move to direnv module
+            # Ignore direnv folder
+            "files.exclude" = {
+              ".direnv" = true;
+            };
+          };
+      };
+    };
+  };
+}
@@ -1,13 +1,16 @@
 {
-  pkgs,
  lib,
  config,
  ...
 }:

 with lib;
+let
+  cfg = config.modules.bash;
+in
 {
-  options.modules.shell = {
+  options.modules.bash = {
+    enable = mkEnableOption "bash";
    aliases = mkOption {
      type = types.attrsOf types.str;
      default = {
@@ -16,4 +19,9 @@ with lib;
      description = "Shell aliases";
    };
  };
+
+  config.programs.bash = {
+    enable = cfg.enable;
+    shellAliases = cfg.aliases;
+  };
 }
@@ -0,0 +1,26 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.direnv;
+in
+{
+  options.modules.direnv = {
+    enable = mkEnableOption "direnv";
+  };
+
+  config = mkIf cfg.enable {
+    programs.direnv = {
+      enable = true;
+      nix-direnv.enable = true;
+    };
+    modules.git.ignores = [
+      ".direnv"
+    ];
+  };
+}
@@ -12,12 +12,6 @@ in
 {
  options.modules.fish = {
    enable = mkEnableOption "fish";
-
-    plugins = {
-      done = mkEnableOption "done";
-      fzf = mkEnableOption "fzf";
-      grc = mkEnableOption "grc";
-    };
  };

  config = mkIf cfg.enable {
@@ -36,28 +30,28 @@ in
    programs.fish = {
      enable = true;

-      shellAliases = config.modules.shell.aliases;
+      shellAliases = config.modules.bash.aliases;

      plugins = [
-        (mkIf cfg.plugins.done {
+        {
          name = "done";
          src = pkgs.fishPlugins.done.src;
-        })
-        (mkIf cfg.plugins.fzf {
+        }
+        {
          name = "fzf";
          src = pkgs.fishPlugins.fzf-fish.src;
-        })
-        (mkIf cfg.plugins.grc {
+        }
+        {
          name = "grc";
          src = pkgs.fishPlugins.grc.src;
-        })
+        }
      ];
    };

    # Fish plugin dependencies
    home.packages = with pkgs; [
-      (mkIf cfg.plugins.fzf fzf)
-      (mkIf cfg.plugins.grc grc)
+      fzf
+      grc
    ];
  };
 }
@@ -0,0 +1,35 @@
+{ lib, config, ... }:
+
+with lib;
+let
+  cfg = config.modules.impermanence;
+in
+{
+  options.modules.impermanence = {
+    enable = mkEnableOption "Impermanence";
+    directories = mkOption {
+      type = types.listOf types.str;
+      default = [ ];
+      description = ''
+        Directories that should be stored in persistent storage.
+      '';
+    };
+    files = mkOption {
+      type = types.listOf types.str;
+      default = [ ];
+      description = ''
+        Files that should be stored in persistent storage.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.persistence."/persist/home/${config.home.username}" = {
+      enable = true;
+      hideMounts = true;
+      allowOther = true;
+      directories = cfg.directories;
+      files = cfg.files;
+    };
+  };
+}
@@ -0,0 +1,63 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.xpra;
+in
+{
+  options.modules.xpra = {
+    enable = mkEnableOption "Enable xpra";
+    hosts = mkOption {
+      type = types.listOf types.str;
+      default = { };
+      description = "xpra hosts";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      xpra
+    ];
+
+    xdg.desktopEntries = (
+      listToAttrs (
+        map
+          (entry: {
+            name = "xpra${
+              builtins.substring 0 12 (builtins.hashString "sha256" "${entry.name} (${entry.comment})")
+            }";
+            value = entry // {
+              type = "Application";
+              terminal = false;
+              genericName = entry.comment;
+            };
+          })
+          (
+            concatMap (
+              host:
+              let
+                uri = "tcp://${host}:15151/7";
+              in
+              [
+                {
+                  name = "Xpra - Attach";
+                  comment = host;
+                  exec = "xpra attach --min-quality=100 --min-speed=100 --encoding=png --speaker=off ${uri}";
+                }
+                {
+                  name = "Xpra - Detach";
+                  comment = host;
+                  exec = "xpra detach ${uri}";
+                }
+              ]
+            ) cfg.hosts
+          )
+      )
+    );
+  };
+}
@@ -1,14 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-{
-  config = {
-    time.timeZone = "Europe/Amsterdam";
-    i18n.defaultLocale = "en_US.UTF-8";
-    console.keyMap = "us";
-  };
-}
@@ -1,23 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.neovim;
-in
-{
-  options.modules.neovim = {
-    enable = mkEnableOption "neovim";
-  };
-
-  config = mkIf cfg.enable {
-    programs.neovim = {
-      enable = true;
-      defaultEditor = true;
-    };
-  };
-}
@@ -0,0 +1,18 @@
+{ lib, config, ... }:
+
+with lib;
+let
+  cfg = config.modules.bluetooth;
+in
+{
+  options.modules.bluetooth = {
+    enable = mkEnableOption "bluetooth";
+  };
+  config = mkIf cfg.enable {
+    # Enable bluetooth
+    hardware.bluetooth = {
+      enable = true;
+      powerOnBoot = true;
+    };
+  };
+}
@@ -1,21 +1,17 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
+{ lib, config, ... }:

 with lib;
 let
-  cfg = config.modules.systemd-boot;
+  cfg = config.modules.bootloader;
 in
 {
-  options.modules.systemd-boot = {
-    enable = mkEnableOption "systemd-boot";
+  options.modules.bootloader = {
+    enable = mkEnableOption "bootloader";
  };
-
  config = mkIf cfg.enable {
+    # Bootloader
    boot.loader = {
+      timeout = 0;
      systemd-boot.enable = true;
      systemd-boot.editor = false;
      efi.canTouchEfiVariables = true;
@@ -0,0 +1,24 @@
+{
+  lib,
+  config,
+  inputs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.disko;
+  profile = import "${inputs.self}/profiles/disko/${cfg.profile}.nix";
+in
+{
+  options.modules.disko = {
+    enable = mkEnableOption "Disko module";
+    profile = mkOption {
+      type = types.str;
+      default = null;
+      description = "The profile to use for the disko module.";
+    };
+  };
+
+  config = mkIf cfg.enable { disko.devices = profile.disko.devices; };
+}
@@ -0,0 +1,35 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.fonts;
+in
+{
+  options.modules.fonts = {
+    enable = mkEnableOption "fonts";
+  };
+  config = mkIf cfg.enable {
+    console.packages = [
+      pkgs.dina-psfu
+    ];
+    console.font = "dina";
+    console.earlySetup = true;
+
+    # TODO: Disable default fonts, fonts should be managed per user
+    # fonts.enableDefaultPackages = false;
+    # fonts.fontconfig = {
+    #   enable = true;
+    #   defaultFonts = {
+    #     serif = mkDefault [ ];
+    #     sansSerif = mkDefault [ ];
+    #     monospace = mkDefault [ ];
+    #     emoji = mkDefault [ ];
+    #   };
+    # };
+  };
+}
@@ -0,0 +1,79 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.gnome;
+in
+{
+  options.modules.gnome = {
+    enable = mkEnableOption "gnome";
+    # TODO: Add RDP toggle
+  };
+
+  config = mkIf cfg.enable {
+    # Enable GDM and Gnome
+    services.xserver.enable = true;
+    services.xserver.displayManager.gdm.enable = true;
+    services.xserver.desktopManager.gnome.enable = true;
+    services.gnome.core-utilities.enable = false;
+    services.gnome.games.enable = false;
+    services.gnome.core-developer-tools.enable = false;
+    environment.gnome.excludePackages = with pkgs; [
+      adwaita-icon-theme
+      (derivation { name = "nixos-background-info"; })
+      gnome-backgrounds
+      gnome-bluetooth
+      gnome-color-manager
+      gnome-control-center
+      gnome-shell-extensions
+      gnome-tour
+      gnome-user-docs
+      glib
+      gnome-menus
+      gtk3.out
+      xdg-user-dirs
+      xdg-user-dirs-gtk
+    ];
+
+    # Enable Gnome Remote Desktop
+    services.gnome.gnome-remote-desktop.enable = true;
+    systemd.services."gnome-remote-desktop".wantedBy = [ "graphical.target" ];
+    networking.firewall = {
+      allowedTCPPorts = [
+        3389
+        3390
+      ];
+      allowedUDPPorts = [
+        3389
+        3390
+      ];
+    };
+
+    # For GSConnect/KDE Connect
+    # TODO: Move to host config?
+    networking.firewall = {
+      allowedTCPPortRanges = [
+        {
+          from = 1714;
+          to = 1764;
+        }
+      ];
+      allowedUDPPortRanges = [
+        {
+          from = 1714;
+          to = 1764;
+        }
+      ];
+    };
+
+    # Enable dependencies
+    modules = {
+      networkmanager.enable = true;
+    };
+  };
+}
@@ -0,0 +1,22 @@
+{ lib, config, ... }:
+
+with lib;
+let
+  cfg = config.modules.graphics;
+in
+{
+  options.modules.graphics = {
+    enable = mkEnableOption "graphics";
+    # TODO: Add toggle for hybrid graphics
+  };
+  config = mkIf cfg.enable {
+    hardware.graphics.enable = true;
+    hardware.graphics.enable32Bit = true;
+    services.xserver.videoDrivers = [ "nvidia" ];
+    # TODO: Add nvidia settings back in
+    # TODO: Move to nvidia module
+    hardware.nvidia = {
+      open = true;
+    };
+  };
+}
@@ -0,0 +1,46 @@
+{ lib, config, ... }:
+
+with lib;
+let
+  cfg = config.modules.impermanence;
+in
+{
+  options.modules.impermanence = {
+    enable = mkEnableOption "Impermanence";
+    directories = mkOption {
+      type = types.listOf types.str;
+      default = [ ];
+      description = ''
+        Directories that should be stored in persistent storage.
+      '';
+    };
+    files = mkOption {
+      type = types.listOf types.str;
+      default = [ ];
+      description = ''
+        Files that should be stored in persistent storage.
+      '';
+    };
+    resetScript = mkOption {
+      type = types.lines;
+      description = ''
+        Script to run on boot that resets the root partition.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    fileSystems."/persist".neededForBoot = true;
+    boot.initrd.postResumeCommands = mkAfter cfg.resetScript;
+
+    # For home-manager persistence
+    programs.fuse.userAllowOther = true;
+
+    environment.persistence."/persist/system" = {
+      enable = true;
+      hideMounts = true;
+      directories = cfg.directories;
+      files = cfg.files;
+    };
+  };
+}
@@ -0,0 +1,15 @@
+{ lib, config, ... }:
+
+with lib;
+let
+  cfg = config.modules.networkmanager;
+in
+{
+  options.modules.networkmanager = {
+    enable = mkEnableOption "networkmanager";
+  };
+  config = mkIf cfg.enable {
+    # TODO: Add sudo users to the networkmanager group?
+    networking.networkmanager.enable = true;
+  };
+}
@@ -0,0 +1,20 @@
+{ lib, config, ... }:
+
+with lib;
+let
+  cfg = config.modules.power-saving;
+in
+{
+  options.modules.power-saving = {
+    enable = mkEnableOption "power saving";
+  };
+  config = mkIf cfg.enable {
+    # Setup power management
+    powerManagement.enable = true;
+    services.thermald.enable = true;
+    services.power-profiles-daemon.enable = true;
+
+    # Enable wifi power saving
+    networking.networkmanager.wifi.powersave = true;
+  };
+}
@@ -0,0 +1,25 @@
+{ lib, config, ... }:
+
+with lib;
+let
+  cfg = config.modules.printing;
+in
+{
+  options.modules.printing = {
+    enable = mkEnableOption "printing";
+  };
+  config = mkIf cfg.enable {
+    # Enable CUPS
+    services.printing.enable = true;
+
+    # Enable Avahi to auto-detect network printers
+    services.avahi = {
+      enable = true;
+      nssmdns4 = true;
+      openFirewall = true;
+    };
+
+    # For SMB network printers
+    services.samba.enable = true;
+  };
+}
@@ -0,0 +1,24 @@
+{ lib, config, ... }:
+
+with lib;
+let
+  cfg = config.modules.sound;
+in
+{
+  options.modules.sound = {
+    enable = mkEnableOption "sound";
+  };
+  config = mkIf cfg.enable {
+    # Enable pipewire
+    services.pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+      jack.enable = true;
+    };
+
+    # Recommended by wiki, allows user processes to use realtime kernel
+    security.rtkit.enable = true;
+  };
+}
@@ -0,0 +1,15 @@
+{ lib, config, ... }:
+
+with lib;
+let
+  cfg = config.modules.ssh;
+in
+{
+  options.modules.ssh = {
+    enable = mkEnableOption "ssh";
+  };
+  config = mkIf cfg.enable {
+    services.openssh.enable = true;
+    # TODO: Is this default configuration secure?
+  };
+}
@@ -1,37 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.power-saving;
-in
-{
-  options.modules.power-saving = {
-    enable = mkEnableOption "power-saving";
-  };
-
-  config = mkIf cfg.enable {
-    powerManagement.enable = true;
-    services.thermald.enable = true;
-    services.tlp = {
-      enable = true;
-
-      settings = {
-        CPU_SCALING_GOVERNOR_ON_AC = "performance";
-        CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
-
-        CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
-        CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
-
-        CPU_MIN_PERF_ON_AC = 0;
-        CPU_MAX_PERF_ON_AC = 100;
-        CPU_MIN_PERF_ON_BAT = 0;
-        CPU_MAX_PERF_ON_BAT = 20;
-      };
-    };
-  };
-}
@@ -1,24 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.pipewire;
-in
-{
-  options.modules.pipewire = {
-    enable = mkEnableOption "pipewire";
-  };
-
-  config = mkIf cfg.enable {
-    services.pipewire = {
-      enable = true;
-      alsa.enable = true;
-      pulse.enable = true;
-    };
-  };
-}
@@ -1,24 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.unfree;
-in
-{
-  options.modules.unfree = {
-    enable = mkEnableOption "unfree";
-    allowedPackages = mkOption {
-      type = types.listOf types.str;
-      default = [ ];
-    };
-  };
-
-  config = mkIf cfg.enable {
-    nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (getName pkg) cfg.allowedPackages;
-  };
-}
@@ -1,82 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  # User configuration
-  userModule = types.submodule {
-    options = {
-      sudo = mkOption {
-        type = types.bool;
-        default = false;
-        example = true;
-        description = "Whether the user is allowed sudo access.";
-      };
-      configuration = mkOption {
-        type = types.path;
-        default = ./users/base.nix;
-        description = "What home manager configuration to use for this user.";
-      };
-      desktopInit = mkOption {
-        type = types.lines;
-        default = "";
-        description = "Bash script to execute after initial log in.";
-      };
-    };
-  };
-in
-{
-  imports = [
-    # Import home manager
-    # <home-manager/nixos>
-
-    # Import system wide configuration required for user modules
-    ../../user-modules/systemwide/default.nix
-  ];
-
-  options = {
-    machine.sudo-groups = mkOption {
-      type = types.listOf types.str;
-      default = [ ];
-      description = "Groups assigned to sudo users.";
-    };
-    machine.users = mkOption {
-      type = types.attrsOf userModule;
-      default = { };
-      description = "Users configured on this system.";
-    };
-  };
-
-  config = {
-    # Add required home manager modules
-    home-manager.sharedModules = [
-      # Modules
-      ../../user-modules/default.nix
-
-      # Custom packages
-      ../../pkgs/default.nix
-    ];
-
-    # Create users
-    users.users = attrsets.concatMapAttrs (name: value: {
-      ${name} = {
-        isNormalUser = true;
-        extraGroups = mkIf value.sudo (
-          [
-            "wheel"
-          ]
-          ++ config.machine.sudo-groups
-        );
-      };
-    }) config.machine.users;
-
-    # Create home manager configuration for users
-    home-manager.users = attrsets.concatMapAttrs (name: value: {
-      ${name} = value.configuration;
-    }) config.machine.users;
-  };
-}
@@ -1,23 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.tailscale;
-in
-{
-  options.modules.tailscale = {
-    enable = mkEnableOption "tailscale";
-  };
-
-  config = mkIf cfg.enable {
-    services.tailscale = {
-      enable = true;
-      useRoutingFeatures = "client";
-    };
-  };
-}
@@ -1,24 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.wpa_supplicant;
-in
-{
-  options.modules.wpa_supplicant = {
-    enable = mkEnableOption "wpa_supplicant";
-  };
-
-  config = mkIf cfg.enable {
-    networking.wireless = {
-      enable = true;
-      userControlled.enable = true;
-      allowAuxiliaryImperativeNetworks = true;
-    };
-  };
-}
@@ -0,0 +1,73 @@
+{
+  pkgs,
+  ...
+}:
+
+pkgs.stdenv.mkDerivation {
+  pname = "dina-psfu";
+  version = "1.0.0";
+
+  src = pkgs.fetchzip {
+    url = "https://www.dcmembers.com/jibsen/download/61/?wpdmdl=61";
+    hash = "sha256-JK+vnOyhAbwT825S+WKbQuWgRrfZZHfyhaMQ/6ljO8s=";
+    extension = "zip";
+    stripRoot = false;
+  };
+
+  buildInputs = with pkgs; [
+    bdf2psf
+    fontforge
+  ];
+
+  buildPhase = ''
+    # Get the base Dina font
+    cp BDF/Dina_r400-9.bdf ./dina.bdf
+
+    # Set the AVERAGE_WIDTH property on the font
+    sed 's/STARTPROPERTIES 16/STARTPROPERTIES 17\
+    AVERAGE_WIDTH 70/' ./dina.bdf > ./dina-mod.bdf
+
+    # Reencode the font from code page CP1252 (Windows) to unicode
+    fontforge -lang=ff -c "Open(\"dina-mod.bdf\"); Reencode(\"win\", 1); Reencode(\"iso10646-1\"); Generate(\"dina-enc.bdf\")"
+    mv dina-enc-*.bdf dina-enc.bdf
+
+    # Move the artsy characters around
+    sed -i 's/STARTCHAR uni000E$/STARTCHAR uni2518/' ./dina-enc.bdf
+    sed -i 's/ENCODING 14$/ENCODING 9496/' ./dina-enc.bdf
+    sed -i 's/STARTCHAR uni000F$/STARTCHAR uni2514/' ./dina-enc.bdf
+    sed -i 's/ENCODING 15$/ENCODING 9492/' ./dina-enc.bdf
+    sed -i 's/STARTCHAR uni0010$/STARTCHAR uni250C/' ./dina-enc.bdf
+    sed -i 's/ENCODING 16$/ENCODING 9484/' ./dina-enc.bdf
+    sed -i 's/STARTCHAR uni0011$/STARTCHAR uni2510/' ./dina-enc.bdf
+    sed -i 's/ENCODING 17$/ENCODING 9488/' ./dina-enc.bdf
+    sed -i 's/STARTCHAR uni0012$/STARTCHAR uni2500/' ./dina-enc.bdf
+    sed -i 's/ENCODING 18$/ENCODING 9472/' ./dina-enc.bdf
+    sed -i 's/STARTCHAR uni0013$/STARTCHAR uni2502/' ./dina-enc.bdf
+    sed -i 's/ENCODING 19$/ENCODING 9474/' ./dina-enc.bdf
+    sed -i 's/STARTCHAR uni0014$/STARTCHAR uni2524/' ./dina-enc.bdf
+    sed -i 's/ENCODING 20$/ENCODING 9508/' ./dina-enc.bdf
+    sed -i 's/STARTCHAR uni0015$/STARTCHAR uni2534/' ./dina-enc.bdf
+    sed -i 's/ENCODING 21$/ENCODING 9524/' ./dina-enc.bdf
+    sed -i 's/STARTCHAR uni0016$/STARTCHAR uni251C/' ./dina-enc.bdf
+    sed -i 's/ENCODING 22$/ENCODING 9500/' ./dina-enc.bdf
+    sed -i 's/STARTCHAR uni0017$/STARTCHAR uni252C/' ./dina-enc.bdf
+    sed -i 's/ENCODING 23$/ENCODING 9516/' ./dina-enc.bdf
+    sed -i 's/STARTCHAR uni0018$/STARTCHAR uni253C/' ./dina-enc.bdf
+    sed -i 's/ENCODING 24$/ENCODING 9532/' ./dina-enc.bdf
+    sed -i 's/STARTCHAR uni0019$/STARTCHAR uni2592/' ./dina-enc.bdf
+    sed -i 's/ENCODING 25$/ENCODING 9618/' ./dina-enc.bdf
+
+    # Create the equivalents file
+    touch empty.equivalents
+
+    # Convert the bdf to psf
+    bdf2psf --fb ./dina-enc.bdf \
+      ./empty.equivalents \
+      ${pkgs.bdf2psf}/share/bdf2psf/fontsets/Uni2.512 \
+      512 ./dina.psfu ./dina.sfm
+  '';
+
+  installPhase = ''
+    install -Dm644 -t $out/share/consolefonts dina.psfu
+  '';
+}
@@ -1,59 +0,0 @@
-{
-  fetchFromGitHub,
-  lib,
-  linux-pam,
-  rustPlatform,
-  testers,
-  lemurs,
-  pkgs,
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "jellyfin-tui";
-  version = "1.0.1";
-
-  src = fetchFromGitHub {
-    owner = "dhonus";
-    repo = "jellyfin-tui";
-    rev = "v${version}";
-    hash = "sha256-jHjTckdyPMJO1INF1AdJvvWTJ0ZJJGOxkBc0YZx9HWI=";
-  };
-
-  cargoHash = "sha256-H6JTupGh1ec6/RIkoAPMl2agNSbF9B5CuJlxDNEwDc4=";
-
-  buildInputs = with pkgs; [
-    mpv
-  ];
-
-  nativeBuildInputs = with pkgs; [
-    pkg-config
-    openssl
-    openssl.dev
-  ];
-
-  desktopItems =
-    let
-      desktopEntry = pkgs.makeDesktopItem {
-        name = "siyuan";
-        desktopName = "SiYuan";
-        comment = "Refactor your thinking";
-        terminal = true;
-        exec = "jellyfin-tui";
-      };
-    in
-    [
-      desktopEntry
-    ];
-
-  PKG_CONFIG_PATH = "${pkgs.openssl.dev}/lib/pkgconfig";
-
-  meta = with lib; {
-    description = "Jellyfin TUI music client written in Rust";
-    homepage = "https://github.com/dhonus/jellyfin-tui";
-    license = with licenses; [
-      gpl3
-    ];
-    maintainers = with maintainers; [ ];
-    mainProgram = "jellyfin-tui";
-  };
-}
@@ -1,18 +0,0 @@
-{
-  ...
-}:
-
-{
-  nixpkgs.config = {
-    # android_sdk.accept_license = true; # TODO: Move to android module
-    packageOverrides = pkgs: {
-      dina-vector = pkgs.callPackage ./fonts/dina-vector.nix { };
-      wqy-zenhei = pkgs.callPackage ./fonts/wqy-zenhei.nix { };
-      wqy-microhei = pkgs.callPackage ./fonts/wqy-microhei.nix { };
-      wqy-bitmapsong = pkgs.callPackage ./fonts/wqy-bitmapsong.nix { };
-      temp-quickgui = pkgs.callPackage ./temp/quickgui.nix { };
-      # qutebrowser = pkgs.callPackage ./fixes/qutebrowser/default.nix { };
-      jellyfin-tui = pkgs.callPackage ./custom/jellyfin-tui.nix { };
-    };
-  };
-}
@@ -1,167 +0,0 @@
-{
-  pkgs,
-  stdenv,
-  lib,
-  fetchurl,
-  fetchzip,
-  python3,
-  glib-networking,
-  asciidoc,
-  docbook_xml_dtd_45,
-  docbook_xsl,
-  libxml2,
-  libxslt,
-  withPdfReader ? true,
-  pipewireSupport ? stdenv.hostPlatform.isLinux,
-  pipewire,
-  enableWideVine ? false,
-  widevine-cdm,
-  # can cause issues on some graphics chips
-  enableVulkan ? false,
-  vulkan-loader,
-}:
-
-let
-  # Load in Qt packages.
-  qtbase = pkgs.kdePackages.qtbase;
-  qtwebengine = pkgs.kdePackages.qtwebengine;
-  qtwayland = pkgs.kdePackages.qtwayland;
-  wrapQtAppsHook = pkgs.kdePackages.wrapQtAppsHook;
-
-  isQt6 = lib.versions.major qtbase.version == "6";
-  pdfjs =
-    let
-      version = "4.2.67";
-    in
-    fetchzip {
-      url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/pdfjs-${version}-dist.zip";
-      hash = "sha256-7kfT3+ZwoGqZ5OwkO9h3DIuBFd0v8fRlcufxoBdcy8c=";
-      stripRoot = false;
-    };
-
-  version = "3.2.1";
-in
-
-python3.pkgs.buildPythonApplication {
-  pname = "qutebrowser" + lib.optionalString (!isQt6) "-qt5";
-  inherit version;
-  src = fetchurl {
-    url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz";
-    hash = "sha256-AqevKmxds42HsiWwuEEsgNmDgzXzLQ6KOPbX+804iX0=";
-  };
-
-  # Needs tox
-  doCheck = false;
-
-  buildInputs =
-    [
-      qtbase
-      glib-networking
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      qtwayland
-    ];
-
-  nativeBuildInputs = [
-    wrapQtAppsHook
-    asciidoc
-    docbook_xml_dtd_45
-    docbook_xsl
-    libxml2
-    libxslt
-  ];
-
-  dependencies = with python3.pkgs; [
-    colorama
-    pyyaml
-    (if isQt6 then pyqt6-webengine else pyqtwebengine)
-    jinja2
-    pygments
-    # scripts and userscripts libs
-    tldextract
-    beautifulsoup4
-    readability-lxml
-    pykeepass
-    stem
-    pynacl
-    # extensive ad blocking
-    adblock
-    # for the qute-bitwarden user script to be able to copy the TOTP token to clipboard
-    pyperclip
-  ];
-
-  patches = [
-    ./fix-restart.patch
-  ];
-
-  dontWrapQtApps = true;
-
-  postPatch =
-    ''
-      substituteInPlace qutebrowser/misc/quitter.py --subst-var-by qutebrowser "$out/bin/qutebrowser"
-
-      sed -i "s,/usr,$out,g" qutebrowser/utils/standarddir.py
-    ''
-    + lib.optionalString withPdfReader ''
-      sed -i "s,/usr/share/pdf.js,${pdfjs},g" qutebrowser/browser/pdfjs.py
-    '';
-
-  installPhase = ''
-    runHook preInstall
-
-    make -f misc/Makefile \
-      PYTHON=${(python3.pythonOnBuildForHost.withPackages (ps: with ps; [ setuptools ])).interpreter} \
-      PREFIX=. \
-      DESTDIR="$out" \
-      DATAROOTDIR=/share \
-      install
-
-    runHook postInstall
-  '';
-
-  postInstall = ''
-    # Patch python scripts
-    buildPythonPath "$out $propagatedBuildInputs"
-    scripts=$(grep -rl python "$out"/share/qutebrowser/{user,}scripts/)
-    for i in $scripts; do
-      patchPythonScript "$i"
-    done
-  '';
-
-  preFixup =
-    let
-      libPath = lib.makeLibraryPath [ pipewire ];
-    in
-    ''
-      makeWrapperArgs+=(
-        # Force the app to use QT_PLUGIN_PATH values from wrapper
-        --unset QT_PLUGIN_PATH
-        "''${qtWrapperArgs[@]}"
-        # avoid persistant warning on starup
-        --set QT_STYLE_OVERRIDE Fusion
-        ${lib.optionalString pipewireSupport ''--prefix LD_LIBRARY_PATH : ${libPath}''}
-        ${lib.optionalString (enableVulkan) ''
-          --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}
-          --set-default QSG_RHI_BACKEND vulkan
-        ''}
-        ${lib.optionalString enableWideVine ''--add-flags "--qt-flag widevine-path=${widevine-cdm}/share/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so"''}
-        --set QTWEBENGINE_RESOURCES_PATH "${qtwebengine}/resources"
-      )
-    '';
-
-  meta = with lib; {
-    homepage = "https://github.com/qutebrowser/qutebrowser";
-    changelog = "https://github.com/qutebrowser/qutebrowser/blob/v${version}/doc/changelog.asciidoc";
-    description = "Keyboard-focused browser with a minimal GUI";
-    license = licenses.gpl3Plus;
-    mainProgram = "qutebrowser";
-    platforms = if enableWideVine then [ "x86_64-linux" ] else qtwebengine.meta.platforms;
-    maintainers = with maintainers; [
-      jagajaga
-      rnhmjoj
-      ebzzry
-      dotlambda
-      nrdxp
-    ];
-  };
-}
@@ -1,19 +0,0 @@
-diff --git a/quitter.py b/quitter.py
-index a42b9d0..f544ccb 100644
--- a/qutebrowser/misc/quitter.py
-+++ b/qutebrowser/misc/quitter.py
-@@ -112,13 +112,7 @@ class Quitter(QObject):
-         Return:
-             The commandline as a list of strings.
-         """
-        if os.path.basename(sys.argv[0]) == 'qutebrowser':
-            # Launched via launcher script
-            args = [sys.argv[0]]
-        elif hasattr(sys, 'frozen'):
-            args = [sys.executable]
-        else:
-            args = [sys.executable, '-m', 'qutebrowser']
-+        args = ['@qutebrowser@']
- 
-         # Add all open pages so they get reopened.
-         page_args = []  # type: typing.MutableSequence[str]
@@ -1,32 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-pkgs.stdenv.mkDerivation {
-  pname = "dina-font";
-  version = "1.0.0";
-
-  # src = pkgs.fetchurl {
-  #   url = "mirror://sourceforge/wqy/${pname}-${version}.tar.gz";
-  #   # hash = "sha256-r2Vf7ftJCqu7jOc2AqCKaoR/r8eNw2P/OQGqbDOEyl0=";
-  #   hash = "sha256-0uvwkRUbvJ0remTnlP8dElRjaBVd6iukNYBTE/CTO7s=";
-  # };
-
-  unpackPhase = "true";
-
-  buildInputs = [
-    pkgs.fontforge
-    pkgs.dina-font
-    pkgs.wqy-bitmapsong
-    pkgs.tree
-  ];
-  buildPhase = ''
-    tree > debug.txt
-  '';
-  installPhase = ''
-    install -Dm644 $out/debug.txt
-  '';
-}
@@ -1,38 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-pkgs.stdenv.mkDerivation rec {
-  pname = "wqy-bitmapsong-pcf";
-  version = "1.0.0-RC1";
-
-  src = pkgs.fetchurl {
-    url = "mirror://sourceforge/wqy/${pname}-${version}.tar.gz";
-    # hash = "sha256-r2Vf7ftJCqu7jOc2AqCKaoR/r8eNw2P/OQGqbDOEyl0=";
-    hash = "sha256-0uvwkRUbvJ0remTnlP8dElRjaBVd6iukNYBTE/CTO7s=";
-  };
-
-  buildInputs = [ pkgs.fontforge ];
-  buildPhase = ''
-    newName() {
-    test "''${1:5:1}" = i && _it=Italic || _it=
-    case ''${1:6:3} in
-        400) test -z $it && _weight=Medium ;;
-        700) _weight=Bold ;;
-    esac
-    _pt=''${1%.pcf}
-    _pt=''${_pt#*-}
-    echo "WenQuanYi_Bitmap_Song$_weight$_it$_pt"
-    }
-
-    for i in *.pcf; do
-    fontforge -lang=ff -c "Open(\"$i\"); Generate(\"$(newName $i).otb\")"
-    done
-  '';
-  installPhase = ''
-    install -Dm644 *.otb -t $out/share/fonts/
-  '';
-}
@@ -1,24 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-pkgs.stdenv.mkDerivation rec {
-  pname = "wqy-microhei";
-  version = "0.2.0-beta";
-
-  src = pkgs.fetchurl {
-    url = "mirror://sourceforge/wqy/${pname}-${version}.tar.gz";
-    hash = "sha256-KAKsgCOqNqZupudEWFTjoHjTd///QhaTQb0jeHH3IT4=";
-  };
-
-  installPhase = ''
-    runHook preInstall
-
-    install -Dm644 *.ttc -t $out/share/fonts/
-
-    runHook postInstall
-  '';
-}
@@ -1,24 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-pkgs.stdenv.mkDerivation rec {
-  pname = "wqy-zenhei";
-  version = "0.9.45";
-
-  src = pkgs.fetchurl {
-    url = "mirror://sourceforge/wqy/${pname}-${version}.tar.gz";
-    hash = "sha256-5LfjBkdb+UJ9F1dXjw5FKJMMhMROqj8WfUxC8RDuddY=";
-  };
-
-  installPhase = ''
-    runHook preInstall
-
-    install -Dm644 *.ttc -t $out/share/fonts/
-
-    runHook postInstall
-  '';
-}
@@ -1,20 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-pkgs.rustPlatform.buildRustPackage rec {
-  pname = "owm";
-  version = "0.1.0";
-
-  src = pkgs.fetchFromGitHub {
-    owner = "justinlovinger";
-    repo = pname;
-    rev = "master";
-    sha256 = "sha256-l9usg0XGtghCX8elvjExYJgMuMGeujOoS2n1hCQkN78=";
-  };
-
-  cargoSha256 = "";
-}
@@ -1,70 +0,0 @@
-{
-  fetchFromGitHub,
-  makeDesktopItem,
-  copyDesktopItems,
-  lib,
-  flutter,
-  quickemu,
-  zenity,
-}:
-flutter.buildFlutterApplication rec {
-  pname = "quickgui";
-  version = "1.2.10";
-  src = fetchFromGitHub {
-    owner = "quickemu-project";
-    repo = "quickgui";
-    rev = version;
-    hash = "sha256-M2Qy66RqsjXg7ZpHwaXCN8qXRIsisnIyaENx3KqmUfQ=";
-  };
-
-  pubspecLock = lib.importJSON ./pubspec.lock.json;
-
-  gitHashes = {
-    window_size = "sha256-XelNtp7tpZ91QCEcvewVphNUtgQX7xrp5QP0oFo6DgM=";
-  };
-
-  extraWrapProgramArgs = "--prefix PATH : ${
-    lib.makeBinPath [
-      quickemu
-      zenity
-    ]
-  }";
-
-  nativeBuildInputs = [
-    copyDesktopItems
-  ];
-
-  postFixup = ''
-    for SIZE in 16 32 48 64 128 256 512; do
-      mkdir -p $out/share/icons/hicolor/$SIZEx$SIZE/apps/
-      cp -av assets/resources/quickgui_$SIZE.png $out/share/icons/hicolor/$SIZEx$SIZE/apps/quickgui.png
-    done
-  '';
-
-  desktopItems = [
-    (makeDesktopItem {
-      name = "quickgui";
-      exec = "quickgui";
-      icon = "quickgui";
-      desktopName = "Quickgui";
-      comment = "An elegant virtual machine manager for the desktop";
-      categories = [
-        "Development"
-        "System"
-      ];
-    })
-  ];
-
-  meta = with lib; {
-    description = "Elegant virtual machine manager for the desktop";
-    homepage = "https://github.com/quickemu-project/quickgui";
-    changelog = "https://github.com/quickemu-project/quickgui/releases/";
-    license = licenses.mit;
-    maintainers = with maintainers; [
-      flexiondotorg
-      heyimnova
-    ];
-    platforms = [ "x86_64-linux" ];
-    mainProgram = "quickgui";
-  };
-}
@@ -0,0 +1,56 @@
+{
+  disko.devices = {
+    disk = {
+      main = {
+        type = "disk";
+        content = {
+          type = "gpt";
+          partitions = {
+            boot = {
+              size = "512M";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+                mountOptions = [ "umask=0077" ];
+              };
+            };
+            zfs = {
+              size = "100%";
+              content = {
+                type = "zfs";
+                pool = "tank";
+              };
+            };
+          };
+        };
+      };
+    };
+    zpool = {
+      tank = {
+        type = "zpool";
+        rootFsOptions = {
+          compression = "zstd";
+        };
+        mountpoint = null;
+        postCreateHook = "zfs snapshot -r tank@blank && zfs hold -r blank tank@blank";
+
+        datasets = {
+          root = {
+            type = "zfs_fs";
+            mountpoint = "/";
+          };
+          nix = {
+            type = "zfs_fs";
+            mountpoint = "/nix";
+          };
+          persist = {
+            type = "zfs_fs";
+            mountpoint = "/persist";
+          };
+        };
+      };
+    };
+  };
+}
@@ -0,0 +1,31 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.profiles.base;
+in
+{
+  options.modules.profiles.base = {
+    enable = mkEnableOption "Base home-manager profile";
+  };
+
+  config = mkIf cfg.enable {
+    modules = {
+      # btop.enable = true;
+      direnv.enable = true;
+      fish.enable = true;
+      # scripts.enable = true;
+
+      # Development
+      # neovim.enable = true;
+
+      # Languages
+      nix.enable = true;
+    };
+  };
+}
@@ -0,0 +1,48 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.profiles.gnome;
+in
+{
+  options.modules.profiles.gnome = {
+    enable = mkEnableOption "Graphical GNOME environment";
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      firefox # TODO: Move to dediated module
+    ];
+
+    modules = {
+      profiles.base.enable = true;
+
+      # Desktop environment
+      desktop.gnome.enable = true;
+      # desktop.tiling.enable = true;
+
+      # Browser
+      # firefox = {
+      #   enable = true;
+      #   default = false;
+      # };
+      # qutebrowser = {
+      #   enable = true;
+      #   default = true;
+      # };
+
+      # Tools
+      # obsidian.enable = true;
+      # zathura.enable = true;
+
+      # Development
+      # neovim.enable = true;
+      vscode.enable = true;
+    };
+  };
+}
@@ -0,0 +1,87 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.profiles.jan;
+in
+{
+  options.modules.profiles.jan = {
+    enable = mkEnableOption "Jan's personal profile";
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      libreoffice-still
+      remmina
+      thunderbird
+      signal-desktop
+      prusa-slicer
+      freecad-wayland
+      inkscape
+      ente-auth
+      bitwarden
+      carla
+      winbox
+      whatsapp-for-linux
+      discord
+      steam
+      spotify
+      # feishin # TODO: Fix or replace as insecure
+      eduvpn-client
+      river # TODO: Move
+      ryubing
+      bottles
+      prismlauncher
+      foliate
+      wireshark
+    ];
+
+    modules = {
+      profiles.gnome.enable = true;
+
+      # Gaming
+      # retroarch.enable = true;
+      # ryujinx.enable = true;
+
+      # Tools
+      git = {
+        enable = true;
+        user = "Jan-Bulthuis";
+        email = "git@bulthuis.dev";
+        # TODO: Move
+        ignores = [
+          ".envrc"
+          ".direnv"
+          "flake.nix"
+          "flake.lock"
+        ];
+      };
+      xpra = {
+        enable = true;
+        hosts = [
+          "mixer@10.20.60.251"
+        ];
+      };
+
+      # Development
+      # docker.enable = true;
+      # matlab.enable = true;
+      mathematica.enable = true;
+
+      # Languages
+      haskell.enable = false;
+      js.enable = true;
+      nix.enable = true;
+      rust.enable = true;
+      python.enable = true;
+      cpp.enable = true;
+      tex.enable = true;
+      jupyter.enable = false;
+    };
+  };
+}
@@ -0,0 +1,70 @@
+{
+  mkModule,
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.profiles.base;
+in
+{
+  options.modules.profiles.base = {
+    enable = mkEnableOption "base profile";
+  };
+
+  config = mkIf cfg.enable {
+    modules = {
+      bootloader.enable = mkDefault true;
+      ssh.enable = mkDefault true;
+
+      # Setup sensible default persistent data
+      impermanence.directories = [
+        "/var/lib/nixos"
+      ];
+      impermanence.files = [
+        "/etc/shadow"
+      ];
+    };
+
+    # Localization
+    time.timeZone = "Europe/Amsterdam";
+    i18n.defaultLocale = "en_US.UTF-8";
+    console.keyMap = "us";
+
+    # Enable neovim
+    programs.neovim = {
+      enable = true;
+      defaultEditor = true;
+    };
+
+    # Allow unfree packages
+    nixpkgs.config.allowUnfree = true;
+
+    # Enable the usage of flakes
+    nix.settings.experimental-features = [
+      "nix-command"
+      "flakes"
+    ];
+
+    # Clean tmp
+    boot.tmp.cleanOnBoot = true;
+
+    # Base packages
+    environment.systemPackages = with pkgs; [
+      git
+      wget
+      curl
+      dig
+      procps
+      wireguard-tools
+      usbutils
+      pciutils
+      zip
+      unzip
+      tmux
+    ];
+  };
+}
@@ -0,0 +1,28 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.profiles.desktop;
+in
+{
+  options.modules.profiles.desktop = {
+    enable = mkEnableOption "desktop profile";
+  };
+
+  config = mkIf cfg.enable {
+    modules = {
+      profiles.base.enable = mkDefault true;
+      fonts.enable = mkDefault true;
+      graphics.enable = mkDefault true;
+      gnome.enable = mkDefault true; # TODO: Rename to display manager?
+      networkmanager.enable = mkDefault true;
+      printing.enable = mkDefault true;
+      sound.enable = mkDefault true;
+    };
+  };
+}
@@ -0,0 +1,30 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.profiles.laptop;
+in
+{
+  options.modules.profiles.laptop = {
+    enable = mkEnableOption "laptop profile";
+  };
+
+  config = mkIf cfg.enable {
+    # Setup modules
+    modules = {
+      profiles.desktop.enable = mkDefault true;
+      bluetooth.enable = mkDefault true;
+      power-saving.enable = mkDefault true;
+    };
+
+    # Add packages
+    environment.systemPackages = with pkgs; [
+      brightnessctl
+    ];
+  };
+}
@@ -0,0 +1,77 @@
+{
+  mkModule,
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.profiles.vm;
+in
+{
+  options.modules.profiles.vm = {
+    enable = mkEnableOption "Base VM profile";
+  };
+
+  config = mkIf cfg.enable {
+    # Enabled modules
+    modules = {
+      profiles.base.enable = true;
+      disko = {
+        enable = true;
+        profile = "vm";
+      };
+      impermanence = {
+        enable = true;
+        resetScript = ''
+          # Revert to the blank state for the root directory
+          zfs rollback -r tank/root@blank
+        '';
+      };
+      ssh.enable = true;
+    };
+
+    # Admin users
+    users.users.local = {
+      initialPassword = "local";
+      extraGroups = [ "wheel" ];
+      openssh.authorizedKeys.keys = [
+        "ssh-ed25519  jan@bulthuis.dev"
+      ];
+    };
+
+    # Enable qemu guest agent
+    services.qemuGuest.enable = true;
+
+    # Machine platform
+    nixpkgs.hostPlatform = "x86_64-linux";
+
+    # Set hostid for ZFS
+    networking.hostId = "deadbeef";
+
+    # Hardware configuration
+    hardware.enableRedistributableFirmware = true;
+    boot.initrd.availableKernelModules = [
+      "ata_piix"
+      "uhci_hcd"
+      "virtio_pci"
+      "virtio_scsi"
+      "sd_mod"
+      "sr_mod"
+    ];
+    boot.initrd.kernelModules = [ ];
+    boot.kernelModules = [ "kvm-intel" ];
+    boot.extraModulePackages = [ ];
+    hardware.cpu.intel.updateMicrocode = true;
+
+    # Swapfile
+    swapDevices = [
+      {
+        device = "/var/lib/swapfile";
+        size = 6 * 1024;
+      }
+    ];
+  };
+}
@@ -1,28 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.bluetuith;
-in
-{
-  options.modules.bluetuith = {
-    enable = mkEnableOption "bluetuith";
-  };
-
-  config = mkIf cfg.enable {
-    home.packages = with pkgs; [ bluetuith ];
-
-    # Add nix tree
-    xdg.desktopEntries.bluetuith = {
-      exec = "${pkgs.bluetuith}/bin/bluetuith";
-      name = "Bluetuith";
-      terminal = true;
-      type = "Application";
-    };
-  };
-}
@@ -1,34 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-{
-  imports = [
-    ./firefox/default.nix
-    ./qutebrowser/default.nix
-  ];
-
-  options.default.browser = mkOption {
-    type = types.str;
-    default = "";
-    description = "Default browser";
-  };
-
-  config = {
-    xdg.mimeApps = {
-      enable = true;
-
-      defaultApplications = {
-        "text/html" = "${config.default.browser}";
-        "x-scheme-handler/http" = "${config.default.browser}";
-        "x-scheme-handler/https" = "${config.default.browser}";
-        "x-scheme-handler/about" = "${config.default.browser}";
-        "x-scheme-handler/unknown" = "${config.default.browser}";
-      };
-    };
-  };
-}
@@ -1,77 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.firefox;
-in
-{
-  options.modules.firefox = {
-    enable = lib.mkEnableOption "firefox";
-    default = lib.mkEnableOption "default";
-  };
-
-  config = lib.mkIf cfg.enable {
-    default.browser = mkIf cfg.default "firefox.desktop";
-
-    programs.firefox = {
-      enable = true;
-
-      policies = {
-        AppAutoUpdate = false;
-        BlockAboutAddons = true;
-        BlockAboutConfig = true;
-        BlockAboutProfiles = true;
-        DisableAppUpdate = true;
-        DisableFeedbackCommands = true;
-        DisableMasterPasswordCreation = true;
-        DisablePocket = true;
-        DisableProfileImport = true;
-        DisableProfileRefresh = true;
-        DisableSetDesktopBackground = true;
-        DisableTelemetry = true;
-        DisplayBookmarksToolbar = "never";
-        DisplayMenuBar = "never";
-        DNSOverHTTPS = {
-          Enabled = false;
-        };
-        DontCheckDefaultBrowser = true;
-        PasswordManagerEnabled = false;
-        TranslateEnabled = true;
-        UseSystemPrintDialog = true;
-      };
-
-      profiles.nixos = {
-        search.default = "DuckDuckGo";
-
-        extensions = with pkgs.nur.repos.rycee.firefox-addons; [
-          ublock-origin
-        ];
-
-        # Theming
-        userChrome = readFile (
-          pkgs.substituteAll {
-            src = ./userChrome.css;
-            colors = config.theming.colorsCSS;
-          }
-        );
-
-        settings = {
-          "browser.tabs.inTitlebar" = 0;
-          "extensions.autoDisableScopes" = 0;
-          "devtools.chrome.enabled" = true;
-          "devtools.debugger.remote-enabled" = true;
-          "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
-        };
-
-        # Force overwriting configuration file
-        search.force = true;
-        containersForce = true;
-      };
-    };
-  };
-}
@@ -1,73 +0,0 @@
-/* Import theme colors */
-@colors@
-
-/* Configure titlebar */
-#titlebar {
-    /* Add consistent margins to tab bar */
-    padding: 0 2px !important;
-
-    /* Add emphasized color to background of tab bar */
-    background-color: var(--nix-color-bg-status) !important;
-
-    /* Set correct text color */
-    color: var(--nix-color-fg) !important;
-}
-
-.tab-background:is([selected], [multiselected]) {
-    /* Set correct background color */
-    background-color: var(--nix-color-bg) !important;
-}
-
-.tab-content {
-    /* Set correct text color */
-    color: var(--nix-color-fg) !important;
-}
-
-/* Configure navigation bar */
-#nav-bar {
-    /* Set correct background color */
-    background-color: var(--nix-color-bg) !important;
-
-    /* Set correct text color */
-    color: var(--nix-color-fg) !important;
-}
-
-#urlbar {
-    /* Set correct text color */
-    color: var(--nix-color-fg) !important;
-}
-
-#urlbar[open]>#urlbar-background {
-    /* Set correct background color when opened */
-    background-color: var(--nix-color-bg) !important;
-
-    /* Use same box-shadow as tabs when opened */
-    border: none !important;
-    box-shadow: 0 0 4px rgba(0, 0, 0, .4) !important;
-}
-
-#urlbar[focused]:not([suppress-focus-border])>#urlbar-background {
-    /* Set better outline for focused urlbar */
-    outline-color: var(--nix-color-border-focused) !important;
-    outline-width: 1px !important;
-    outline-offset: 0 !important;
-}
-
-#urlbar-background {
-    /* Set the correct background color */
-    background-color: var(--nix-color-bg-status) !important;
-}
-
-/* Configure popups */
-panelview {
-    /* Set correct background color for popups */
-    background-color: var(--nix-color-bg) !important;
-
-    /* Set correct text color */
-    color: var(--nix-color-fg) !important;
-}
-
-menupopup {
-    /* Set correct background color for context menus */
-    --panel-background: var(--nix-color-bg) !important;
-}
@@ -1,51 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.qutebrowser;
-  theme = config.theming;
-in
-{
-  options.modules.qutebrowser = {
-    enable = mkEnableOption "qutebrowser";
-    default = mkEnableOption "default";
-  };
-
-  config = mkIf cfg.enable {
-    default.browser = mkIf cfg.default "org.qutebrowser.qutebrowser.desktop";
-
-    # TODO: Remove once nixpkgs updates
-    # nixpkgs.config.packageOverrides = pkgs: {
-    #   python3 = pkgs.python3.override {
-    #     packageOverrides = self: super: {
-    #       pykeepass = super.pykeepass.overrideAttrs (attrs: {
-    #         version = "4.1.0.post1";
-    #         src = pkgs.fetchFromGitHub {
-    #           owner = "libkeepass";
-    #           repo = "pykeepass";
-    #           rev = "refs/tags/v4.1.0.post1";
-    #           hash = "sha256-64is/XoRF/kojqd4jQIAQi1od8TRhiv9uR+WNIGvP2A=";
-    #         };
-    #       });
-    #     };
-    #   };
-    # };
-
-    programs.qutebrowser = {
-      enable = true;
-
-      extraConfig = ''
-        # config.set("completion.web_history.max_items", 30)
-        config.set("colors.webpage.darkmode.enabled", False)
-        config.set("colors.webpage.preferred_color_scheme", "${if theme.darkMode then "dark" else "light"}")
-        config.set("fonts.default_family", "${theme.fonts.monospace.name}")
-        config.set("fonts.default_size", "${toString theme.fonts.monospace.recommendedSize}pt")
-      '';
-    };
-  };
-}
@@ -1,368 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.btop;
-  colors = config.theming.schemeColors;
-in
-{
-  options.modules.btop = {
-    enable = mkEnableOption "btop";
-  };
-
-  config = mkIf cfg.enable {
-    home.packages = with pkgs; [ btop ];
-
-    xdg.configFile."btop/btop.conf" = {
-      enable = true;
-      text = ''
-        #? Config file for btop v. 1.4.0
-
-        #* Name of a btop++/bpytop/bashtop formatted ".theme" file, "Default" and "TTY" for builtin themes.
-        #* Themes should be placed in "../share/btop/themes" relative to binary or "$HOME/.config/btop/themes"
-        color_theme = "nixos"
-
-        #* If the theme set background should be shown, set to False if you want terminal background transparency.
-        theme_background = True
-
-        #* Sets if 24-bit truecolor should be used, will convert 24-bit colors to 256 color (6x6x6 color cube) if false.
-        truecolor = True
-
-        #* Set to true to force tty mode regardless if a real tty has been detected or not.
-        #* Will force 16-color mode and TTY theme, set all graph symbols to "tty" and swap out other non tty friendly symbols.
-        force_tty = False
-
-        #* Define presets for the layout of the boxes. Preset 0 is always all boxes shown with default settings. Max 9 presets.
-        #* Format: "box_name:P:G,box_name:P:G" P=(0 or 1) for alternate positions, G=graph symbol to use for box.
-        #* Use whitespace " " as separator between different presets.
-        #* Example: "cpu:0:default,mem:0:tty,proc:1:default cpu:0:braille,proc:0:tty"
-        presets = "cpu:1:default,proc:0:default cpu:0:default,mem:0:default,net:0:default cpu:0:block,net:0:tty"
-
-        #* Set to True to enable "h,j,k,l,g,G" keys for directional control in lists.
-        #* Conflicting keys for h:"help" and k:"kill" is accessible while holding shift.
-        vim_keys = False
-
-        #* Rounded corners on boxes, is ignored if TTY mode is ON.
-        rounded_corners = False
-
-        #* Default symbols to use for graph creation, "braille", "block" or "tty".
-        #* "braille" offers the highest resolution but might not be included in all fonts.
-        #* "block" has half the resolution of braille but uses more common characters.
-        #* "tty" uses only 3 different symbols but will work with most fonts and should work in a real TTY.
-        #* Note that "tty" only has half the horizontal resolution of the other two, so will show a shorter historical view.
-        graph_symbol = "braille"
-
-        # Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty".
-        graph_symbol_cpu = "default"
-
-        # Graph symbol to use for graphs in gpu box, "default", "braille", "block" or "tty".
-        graph_symbol_gpu = "default"
-
-        # Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty".
-        graph_symbol_mem = "default"
-
-        # Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty".
-        graph_symbol_net = "default"
-
-        # Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty".
-        graph_symbol_proc = "default"
-
-        #* Manually set which boxes to show. Available values are "cpu mem net proc" and "gpu0" through "gpu5", separate values with whitespace.
-        shown_boxes = "cpu net proc mem"
-
-        #* Update time in milliseconds, recommended 2000 ms or above for better sample times for graphs.
-        update_ms = 500
-
-        #* Processes sorting, "pid" "program" "arguments" "threads" "user" "memory" "cpu lazy" "cpu direct",
-        #* "cpu lazy" sorts top process over time (easier to follow), "cpu direct" updates top process directly.
-        proc_sorting = "cpu lazy"
-
-        #* Reverse sorting order, True or False.
-        proc_reversed = False
-
-        #* Show processes as a tree.
-        proc_tree = False
-
-        #* Use the cpu graph colors in the process list.
-        proc_colors = True
-
-        #* Use a darkening gradient in the process list.
-        proc_gradient = True
-
-        #* If process cpu usage should be of the core it's running on or usage of the total available cpu power.
-        proc_per_core = False
-
-        #* Show process memory as bytes instead of percent.
-        proc_mem_bytes = True
-
-        #* Show cpu graph for each process.
-        proc_cpu_graphs = True
-
-        #* Use /proc/[pid]/smaps for memory information in the process info box (very slow but more accurate)
-        proc_info_smaps = False
-
-        #* Show proc box on left side of screen instead of right.
-        proc_left = False
-
-        #* (Linux) Filter processes tied to the Linux kernel(similar behavior to htop).
-        proc_filter_kernel = False
-
-        #* In tree-view, always accumulate child process resources in the parent process.
-        proc_aggregate = False
-
-        #* Sets the CPU stat shown in upper half of the CPU graph, "total" is always available.
-        #* Select from a list of detected attributes from the options menu.
-        cpu_graph_upper = "Auto"
-
-        #* Sets the CPU stat shown in lower half of the CPU graph, "total" is always available.
-        #* Select from a list of detected attributes from the options menu.
-        cpu_graph_lower = "Auto"
-
-        #* If gpu info should be shown in the cpu box. Available values = "Auto", "On" and "Off".
-        show_gpu_info = "Auto"
-
-        #* Toggles if the lower CPU graph should be inverted.
-        cpu_invert_lower = True
-
-        #* Set to True to completely disable the lower CPU graph.
-        cpu_single_graph = False
-
-        #* Show cpu box at bottom of screen instead of top.
-        cpu_bottom = False
-
-        #* Shows the system uptime in the CPU box.
-        show_uptime = True
-
-        #* Show cpu temperature.
-        check_temp = True
-
-        #* Which sensor to use for cpu temperature, use options menu to select from list of available sensors.
-        cpu_sensor = "Auto"
-
-        #* Show temperatures for cpu cores also if check_temp is True and sensors has been found.
-        show_coretemp = True
-
-        #* Set a custom mapping between core and coretemp, can be needed on certain cpus to get correct temperature for correct core.
-        #* Use lm-sensors or similar to see which cores are reporting temperatures on your machine.
-        #* Format "x:y" x=core with wrong temp, y=core with correct temp, use space as separator between multiple entries.
-        #* Example: "4:0 5:1 6:3"
-        cpu_core_map = ""
-
-        #* Which temperature scale to use, available values: "celsius", "fahrenheit", "kelvin" and "rankine".
-        temp_scale = "celsius"
-
-        #* Use base 10 for bits/bytes sizes, KB = 1000 instead of KiB = 1024.
-        base_10_sizes = False
-
-        #* Show CPU frequency.
-        show_cpu_freq = True
-
-        #* Draw a clock at top of screen, formatting according to strftime, empty string to disable.
-        #* Special formatting: /host = hostname | /user = username | /uptime = system uptime
-        clock_format = "%X"
-
-        #* Update main ui in background when menus are showing, set this to false if the menus is flickering too much for comfort.
-        background_update = True
-
-        #* Custom cpu model name, empty string to disable.
-        custom_cpu_name = ""
-
-        #* Optional filter for shown disks, should be full path of a mountpoint, separate multiple values with whitespace " ".
-        #* Begin line with "exclude=" to change to exclude filter, otherwise defaults to "most include" filter. Example: disks_filter="exclude=/boot /home/user".
-        disks_filter = ""
-
-        #* Show graphs instead of meters for memory values.
-        mem_graphs = True
-
-        #* Show mem box below net box instead of above.
-        mem_below_net = False
-
-        #* Count ZFS ARC in cached and available memory.
-        zfs_arc_cached = True
-
-        #* If swap memory should be shown in memory box.
-        show_swap = True
-
-        #* Show swap as a disk, ignores show_swap value above, inserts itself after first disk.
-        swap_disk = True
-
-        #* If mem box should be split to also show disks info.
-        show_disks = True
-
-        #* Filter out non physical disks. Set this to False to include network disks, RAM disks and similar.
-        only_physical = True
-
-        #* Read disks list from /etc/fstab. This also disables only_physical.
-        use_fstab = True
-
-        #* Setting this to True will hide all datasets, and only show ZFS pools. (IO stats will be calculated per-pool)
-        zfs_hide_datasets = False
-
-        #* Set to true to show available disk space for privileged users.
-        disk_free_priv = False
-
-        #* Toggles if io activity % (disk busy time) should be shown in regular disk usage view.
-        show_io_stat = True
-
-        #* Toggles io mode for disks, showing big graphs for disk read/write speeds.
-        io_mode = True
-
-        #* Set to True to show combined read/write io graphs in io mode.
-        io_graph_combined = False
-
-        #* Set the top speed for the io graphs in MiB/s (100 by default), use format "mountpoint:speed" separate disks with whitespace " ".
-        #* Example: "/mnt/media:100 /:20 /boot:1".
-        io_graph_speeds = ""
-
-        #* Set fixed values for network graphs in Mebibits. Is only used if net_auto is also set to False.
-        net_download = 100
-
-        net_upload = 100
-
-        #* Use network graphs auto rescaling mode, ignores any values set above and rescales down to 10 Kibibytes at the lowest.
-        net_auto = True
-
-        #* Sync the auto scaling for download and upload to whichever currently has the highest scale.
-        net_sync = True
-
-        #* Starts with the Network Interface specified here.
-        net_iface = ""
-
-        #* Show battery stats in top right if battery is present.
-        show_battery = False
-
-        #* Which battery to use if multiple are present. "Auto" for auto detection.
-        selected_battery = "Auto"
-
-        #* Show power stats of battery next to charge indicator.
-        show_battery_watts = True
-
-        #* Set loglevel for "~/.config/btop/btop.log" levels are: "ERROR" "WARNING" "INFO" "DEBUG".
-        #* The level set includes all lower levels, i.e. "DEBUG" will show all logging info.
-        log_level = "WARNING"
-
-        #* Measure PCIe throughput on NVIDIA cards, may impact performance on certain cards.
-        nvml_measure_pcie_speeds = True
-
-        #* Horizontally mirror the GPU graph.
-        gpu_mirror_graph = True
-
-        #* Custom gpu0 model name, empty string to disable.
-        custom_gpu_name0 = ""
-
-        #* Custom gpu1 model name, empty string to disable.
-        custom_gpu_name1 = ""
-
-        #* Custom gpu2 model name, empty string to disable.
-        custom_gpu_name2 = ""
-
-        #* Custom gpu3 model name, empty string to disable.
-        custom_gpu_name3 = ""
-
-        #* Custom gpu4 model name, empty string to disable.
-        custom_gpu_name4 = ""
-
-        #* Custom gpu5 model name, empty string to disable.
-        custom_gpu_name5 = ""
-      '';
-    };
-
-    xdg.configFile."btop/themes/nixos.theme" = {
-      enable = true;
-      text = with colors; ''
-        # Main background, empty for terminal default, need to be empty if you want transparent background
-        theme[main_bg]="#${base00}"
-
-        # Main text color
-        theme[main_fg]="#${base05}"
-
-        # Title color for boxes
-        theme[title]="#${base05}"
-
-        # Highlight color for keyboard shortcuts
-        theme[hi_fg]="#${base0D}"
-
-        # Background color of selected item in processes box
-        theme[selected_bg]="#${base03}"
-
-        # Foreground color of selected item in processes box
-        theme[selected_fg]="#${base0D}"
-
-        # Color of inactive/disabled text
-        theme[inactive_fg]="#8c8fa1"
-
-        # Color of text appearing on top of graphs, i.e uptime and current network graph scaling
-        theme[graph_text]="#${base06}"
-
-        # Background color of the percentage meters
-        theme[meter_bg]="#${base03}"
-
-        # Misc colors for processes box including mini cpu graphs, details memory graph and details status text
-        theme[proc_misc]="#${base06}"
-
-        # CPU, Memory, Network, Proc box outline colors
-        theme[cpu_box]="#${base0E}" #Mauve
-        theme[mem_box]="#${base0B}" #Green
-        theme[net_box]="#e64553" #Maroon
-        theme[proc_box]="#${colors.base0D}" #Blue
-
-        # Box divider line and small boxes line color
-        theme[div_line]="#9ca0b0"
-
-        # Temperature graph color (Green -> Yellow -> Red)
-        theme[temp_start]="#${base0B}"
-        theme[temp_mid]="#${base0A}"
-        theme[temp_end]="#${base08}"
-
-        # CPU graph colors (Teal -> Lavender)
-        theme[cpu_start]="#${base0C}"
-        theme[cpu_mid]="#209fb5"
-        theme[cpu_end]="#${base07}"
-
-        # Mem/Disk free meter (Mauve -> Lavender -> Blue)
-        theme[free_start]="#${base0E}"
-        theme[free_mid]="#${base07}"
-        theme[free_end]="#${base0D}"
-
-        # Mem/Disk cached meter (Sapphire -> Lavender)
-        theme[cached_start]="#209fb5"
-        theme[cached_mid]="#${base0D}"
-        theme[cached_end]="#${base07}"
-
-        # Mem/Disk available meter (Peach -> Red)
-        theme[available_start]="#${base09}"
-        theme[available_mid]="#e64553"
-        theme[available_end]="#${base08}"
-
-        # Mem/Disk used meter (Green -> Sky)
-        theme[used_start]="#${base0B}"
-        theme[used_mid]="#${base0C}"
-        theme[used_end]="#04a5e5"
-
-        # Download graph colors (Peach -> Red)
-        theme[download_start]="#${base09}"
-        theme[download_mid]="#e64553"
-        theme[download_end]="#${base08}"
-
-        # Upload graph colors (Green -> Sky)
-        theme[upload_start]="#${base0B}"
-        theme[upload_mid]="#${base0C}"
-        theme[upload_end]="#04a5e5"
-
-        # Process box color gradient for threads, mem and cpu usage (Sapphire -> Mauve)
-        theme[process_start]="#209fb5"
-        theme[process_mid]="#${base07}"
-        theme[process_end]="#${base0E}"
-      '';
-    };
-
-    modules.shell.aliases = {
-      top = "btop";
-    };
-  };
-}
@@ -1,47 +0,0 @@
-{
-  ...
-}:
-
-{
-  imports = [
-    # Import all modules
-    ./bluetuith/default.nix
-    ./browser/default.nix
-    ./btop/default.nix
-    ./desktop/default.nix
-    ./development/default.nix
-    ./discord/default.nix
-    ./feishin/default.nix
-    ./fontconfig/default.nix
-    ./games/modrinth.nix
-    ./git/default.nix
-    ./language/cpp.nix
-    ./language/haskell.nix
-    ./language/js.nix
-    ./language/jupyter.nix
-    ./language/nix.nix
-    ./language/python.nix
-    ./language/rust.nix
-    ./language/tex.nix
-    ./mako/default.nix
-    ./neovim/default.nix
-    ./obsidian/default.nix
-    ./rofi/default.nix
-    ./rofi/rofi-rbw.nix
-    ./shell/default.nix
-    ./shell/bash.nix
-    ./shell/fish.nix
-    ./spotify/default.nix
-    ./steam/default.nix
-    ./terminal/default.nix
-    ./terminal/foot/default.nix
-    ./theming/default.nix
-    ./vscode/default.nix
-    ./whatsapp/default.nix
-    ./winbox/default.nix
-    ./zathura/default.nix
-
-    # Import unfree helper
-    ../modules/unfree/default.nix
-  ];
-}
@@ -1,23 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.glpaper;
-in
-{
-  options.modules.glpaper = {
-    enable = mkEnableOption "glpaper";
-    shader = mkOption {
-      type = types.path;
-      default = ./shaders/waves.glsl;
-      description = "Shader to use for the background";
-    };
-  };
-
-  config = mkIf cfg.enable { home.packages = [ pkgs.glpaper ]; };
-}
@@ -1,169 +0,0 @@
-#define zoom 0.900
-#define tile 0.850
-#define speed2 0.0
-
-#ifdef GL_ES
-precision highp float;
-#endif
- 
-uniform float time;
-uniform vec2 resolution;
-
-#define time3 (time * 0.01)
-
-#define mouse vec2(sin(time3)/48., cos(time3)/48.)
-#define iterations 14
-#define formuparam2 0.79
- 
-#define volsteps 5
-#define stepsize 0.390
- 
-#define brightness 0.003
-#define darkmatter 0.400
-#define distfading 0.560
-#define saturation 0.800
-
-#define transverseSpeed zoom*2.0
-#define cloud 0.11 
- 
-float triangle(float x, float a) { 
-    float output2 = 2.0 * abs(2.0 * ((x/a) - floor((x/a) + 0.5))) - 1.0;
-    return output2;
-}
- 
-float field(in vec3 p) {	
-    float strength = 7. + .03 * log(1.e-6 + fract(sin(time3) * 4373.11));
-    float accum = 0.;
-    float prev = 0.;
-    float tw = 0.;	
-
-    // Replace or uncomment the for-loop as intended in your logic
-    float mag = dot(p, p);
-    p = abs(p) / mag + vec3(-.5, -.8 + 0.1*sin(time3*0.7 + 2.0), -1.1+0.3*cos(time3*0.3));
-    float w = exp(-float(0) / 7.);
-    accum += w * exp(-strength * pow(abs(mag - prev), 2.3));
-    tw += w;
-    prev = mag;
-
-    return max(0., 5. * accum / tw - .7);
-}
-
-void main() {   
-
-     	vec2 uv2 = 2. * gl_FragCoord.xy / vec2(512) - 1.;
-	vec2 uvs = uv2 * vec2(512)  / 512.;
-
-	float time2 = time3;               
-        float speed = speed2;
-        speed = .01 * cos(time2*0.02 + 3.1415926/4.0);          
-		
-    	float formuparam = formuparam2;
-	
-    		
-	vec2 uv = uvs;		       
-	
-	float a_xz = 0.9;
-	float a_yz = -.6;
-	float a_xy = 0.9 + time3*0.08;	
-	
-	mat2 rot_xz = mat2(cos(a_xz),sin(a_xz),-sin(a_xz),cos(a_xz));	
-	mat2 rot_yz = mat2(cos(a_yz),sin(a_yz),-sin(a_yz),cos(a_yz));		
-	mat2 rot_xy = mat2(cos(a_xy),sin(a_xy),-sin(a_xy),cos(a_xy));
-	
-
-	float v2 =1.0;	
-	vec3 dir=vec3(uv*zoom,1.); 
-	vec3 from=vec3(0.0, 0.0,0.0);                               
-        from.x -= 5.0*(mouse.x-0.5);
-        from.y -= 5.0*(mouse.y-0.5);
-               
-               
-	vec3 forward = vec3(0.,0.,1.);   
-	from.x += transverseSpeed*(1.0)*cos(0.01*time3) + 0.001*time3;
-	from.y += transverseSpeed*(1.0)*sin(0.01*time3) +0.001*time3;
-	from.z += 0.003*time3;	
-	
-	dir.xy*=rot_xy;
-	forward.xy *= rot_xy;
-	dir.xz*=rot_xz;
-	forward.xz *= rot_xz;	
-	dir.yz*= rot_yz;
-	forward.yz *= rot_yz;
-	
-	from.xy*=-rot_xy;
-	from.xz*=rot_xz;
-	from.yz*= rot_yz;
-	
-	float zooom = (time2-3311.)*speed;
-	from += forward* zooom;
-	float sampleShift = mod( zooom, stepsize );
-	 
-	float zoffset = -sampleShift;
-	sampleShift /= stepsize;
-	
-	
-	float s=0.24;
-	float s3 = s + stepsize/2.0;
-	vec3 v=vec3(0.);
-	float t3 = 0.0;	
-	
-	vec3 backCol2 = vec3(0.);
-	for (int r=0; r<volsteps; r++) {
-		vec3 p2=from+(s+zoffset)*dir;
-		vec3 p3=from+(s3+zoffset)*dir;
-		
-		p2 = abs(vec3(tile)-mod(p2,vec3(tile*2.)));
-		p3 = abs(vec3(tile)-mod(p3,vec3(tile*2.)));		
-		#ifdef cloud
-		t3 = field(p3);
-		#endif
-		
-		float pa,a=pa=0.;
-		for (int i=0; i<iterations; i++) {
-			p2=abs(p2)/dot(p2,p2)-formuparam;
-			
-			float D = abs(length(p2)-pa);
-			a += i > 7 ? min( 12., D) : D;
-			pa=length(p2);
-		}
-		
-		
-		
-		a*=a*a;
-		
-		float s1 = s+zoffset;
-		
-		float fade = pow(distfading,max(0.,float(r)-sampleShift));		
-			
-		v+=fade;
-	       	
-
-		
-		if( r == 0 )
-			fade *= (1. - (sampleShift));
-		
-		if( r == volsteps-1 )
-			fade *= sampleShift;
-		v+=vec3(s1,s1*s1,s1*s1*s1*s1)*a*brightness*fade;
-		
-		backCol2 += mix(.11, 1., v2) * vec3(1.8 * t3 * t3 * t3, 1.4 * t3 * t3, t3) * fade;
-
-		
-		s+=stepsize;
-		s3 += stepsize;		
-	}
-		       
-	v=mix(vec3(length(v)),v,saturation);	
-
-	vec4 forCol2 = vec4(v*.01,1.);	
-	#ifdef cloud
-	backCol2 *= cloud;
-	#endif	
-	backCol2.b *= 1.8;
-	backCol2.r *= 0.05;	
-	
-	backCol2.b = 0.5*mix(backCol2.g, backCol2.b, 0.8);
-	backCol2.g = 0.0;
-	backCol2.bg = mix(backCol2.gb, backCol2.bg, 0.5*(cos(time3*0.01) + 1.0));	
-	gl_FragColor = forCol2 + vec4(backCol2, 1.0);
-}
@@ -1,118 +0,0 @@
-#ifdef GL_ES
-precision mediump float;
-#endif
-
-// glslsandbox uniforms
-uniform float time;
-uniform vec2 resolution;
-
-// shadertoy emulation
-#define iTime time * 0.01 + 10.0
-#define iResolution resolution
-#define fragCoord gl_FragCoord
-#define fragColor gl_FragColor
-
-float colormap_red(float x) {
-    if (x < 0.0) {
-        return 54.0 / 255.0;
-    } else if (x < 20049.0 / 82979.0) {
-        return (829.79 * x + 54.51) / 255.0;
-    } else {
-        return 1.0;
-    }
-}
-
-float colormap_green(float x) {
-    if (x < 20049.0 / 82979.0) {
-        return 0.0;
-    } else if (x < 327013.0 / 810990.0) {
-        return (8546482679670.0 / 10875673217.0 * x - 2064961390770.0 / 10875673217.0) / 255.0;
-    } else if (x <= 1.0) {
-        return (103806720.0 / 483977.0 * x + 19607415.0 / 483977.0) / 255.0;
-    } else {
-        return 1.0;
-    }
-}
-
-float colormap_blue(float x) {
-    if (x < 0.0) {
-        return 54.0 / 255.0;
-    } else if (x < 7249.0 / 82979.0) {
-        return (829.79 * x + 54.51) / 255.0;
-    } else if (x < 20049.0 / 82979.0) {
-        return 127.0 / 255.0;
-    } else if (x < 327013.0 / 810990.0) {
-        return (792.02249341361393720147485376583 * x - 64.364790735602331034989206222672) / 255.0;
-    } else {
-        return 1.0;
-    }
-}
-
-vec4 colormap(float x) {
-    return vec4(colormap_red(x), colormap_green(x), colormap_blue(x), 1.0);
-}
-
-// https://iquilezles.org/articles/warp
-/*float noise( in vec2 x )
-{
-    vec2 p = floor(x);
-    vec2 f = fract(x);
-    f = f*f*(3.0-2.0*f);
-    float a = textureLod(iChannel0,(p+vec2(0.5,0.5))/256.0,0.0).x;
-	float b = textureLod(iChannel0,(p+vec2(1.5,0.5))/256.0,0.0).x;
-	float c = textureLod(iChannel0,(p+vec2(0.5,1.5))/256.0,0.0).x;
-	float d = textureLod(iChannel0,(p+vec2(1.5,1.5))/256.0,0.0).x;
-    return mix(mix( a, b,f.x), mix( c, d,f.x),f.y);
-}*/
-
-
-float rand(vec2 n) { 
-    return fract(sin(dot(n, vec2(12.9898, 4.1414))) * 43758.5453);
-}
-
-float noise(vec2 p){
-    vec2 ip = floor(p);
-    vec2 u = fract(p);
-    u = u*u*(3.0-2.0*u);
-
-    float res = mix(
-        mix(rand(ip),rand(ip+vec2(1.0,0.0)),u.x),
-        mix(rand(ip+vec2(0.0,1.0)),rand(ip+vec2(1.0,1.0)),u.x),u.y);
-    return res*res;
-}
-
-const mat2 mtx = mat2( 0.80,  0.60, -0.60,  0.80 );
-
-float fbm( vec2 p )
-{
-    float f = 0.0;
-
-    f += 0.500000*noise( p + iTime  ); p = mtx*p*2.02;
-    f += 0.031250*noise( p ); p = mtx*p*2.01;
-    f += 0.250000*noise( p ); p = mtx*p*2.03;
-    f += 0.125000*noise( p ); p = mtx*p*2.01;
-    f += 0.062500*noise( p ); p = mtx*p*2.04;
-    f += 0.015625*noise( p + sin(iTime) );
-
-    return f/0.96875;
-}
-
-float pattern( in vec2 p )
-{
-	return fbm( p + fbm( p + fbm( p ) ) );
-}
-
-void main()
-{
-    vec2 uv = fragCoord.xy/iResolution.x;
-	float shade = pattern(uv);
-    fragColor = vec4(colormap(shade).rgb, shade);
-}
-
-/** SHADERDATA
-{
-	"title": "Base warp fBM",
-	"description": "Noise but Pink",
-	"model": "person"
-}
-*/
@@ -1,13 +0,0 @@
-#ifdef GL_ES
-precision mediump float;
-#endif
-
-// glslsandbox uniforms
-uniform float time;
-uniform vec2 resolution;
-
-// shadertoy emulation
-#define iTime time
-#define iResolution resolution
-#define fragCoord gl_FragCoord
-#define fragColor gl_FragColor
@@ -1,208 +0,0 @@
-#ifdef GL_ES
-precision highp float;
-#endif
-
-uniform float time;
-uniform vec2 resolution;
-
-#define CHAR_SIZE vec2(6, 7)
-#define CHAR_SPACING vec2(6, 9)
-
-vec2 start_pos = vec2(0);
-vec2 print_pos = vec2(0);
-vec2 print_pos_pre_move = vec2(0);
-vec3 text_color = vec3(1);
-
-/*
-Top left pixel is the most significant bit.
-Bottom right pixel is the least significant bit.
-
- ███  |
-█   █ |
-█   █ |  
-█   █ |
-█████ |
-█   █ |
-█   █ |
-
-000000 
-100010
-100010  
-100010
-111110
-100010
-100010
-
-011100 (upper 21 bits)
-100010 -> 011100 100010 100010 100 -> 935188
-100010  
-100
-   010 (lower 21 bits)
-111110 -> 010 111110 100010 100010 -> 780450
-100010
-100010
-
-vec2(935188.0,780450.0)
-*/
-
-//Text coloring
-#define HEX(i) text_color = mod(vec3(i / 65536,i / 256,i),vec3(256.0))/255.0;
-#define RGB(r,g,b) text_color = vec3(r,g,b);
-
-#define STRWIDTH(c) (c * CHAR_SPACING.x)
-#define STRHEIGHT(c) (c * CHAR_SPACING.y)
-#define BEGIN_TEXT(x,y) print_pos = floor(vec2(x,y)); start_pos = floor(vec2(x,y));
-
-//Automatically generated from the sprite sheet here: http://uzebox.org/wiki/index.php?title=File:Font6x8.png
-#define _ col+=char(vec2(0.0,0.0),uv);
-#define _spc col+=char(vec2(0.0,0.0),uv)*text_color;
-#define _exc col+=char(vec2(276705.0,32776.0),uv)*text_color;
-#define _quo col+=char(vec2(1797408.0,0.0),uv)*text_color;
-#define _hsh col+=char(vec2(10738.0,1134484.0),uv)*text_color;
-#define _dol col+=char(vec2(538883.0,19976.0),uv)*text_color;
-#define _pct col+=char(vec2(1664033.0,68006.0),uv)*text_color;
-#define _amp col+=char(vec2(545090.0,174362.0),uv)*text_color;
-#define _apo col+=char(vec2(798848.0,0.0),uv)*text_color;
-#define _lbr col+=char(vec2(270466.0,66568.0),uv)*text_color;
-#define _rbr col+=char(vec2(528449.0,33296.0),uv)*text_color;
-#define _ast col+=char(vec2(10471.0,1688832.0),uv)*text_color;
-#define _crs col+=char(vec2(4167.0,1606144.0),uv)*text_color;
-#define _per col+=char(vec2(0.0,1560.0),uv)*text_color;
-#define _dsh col+=char(vec2(7.0,1572864.0),uv)*text_color;
-#define _com col+=char(vec2(0.0,1544.0),uv)*text_color;
-#define _lsl col+=char(vec2(1057.0,67584.0),uv)*text_color;
-#define _0 col+=char(vec2(935221.0,731292.0),uv)*text_color;
-#define _1 col+=char(vec2(274497.0,33308.0),uv)*text_color;
-#define _2 col+=char(vec2(934929.0,1116222.0),uv)*text_color;
-#define _3 col+=char(vec2(934931.0,1058972.0),uv)*text_color;
-#define _4 col+=char(vec2(137380.0,1302788.0),uv)*text_color;
-#define _5 col+=char(vec2(2048263.0,1058972.0),uv)*text_color;
-#define _6 col+=char(vec2(401671.0,1190044.0),uv)*text_color;
-#define _7 col+=char(vec2(2032673.0,66576.0),uv)*text_color;
-#define _8 col+=char(vec2(935187.0,1190044.0),uv)*text_color;
-#define _9 col+=char(vec2(935187.0,1581336.0),uv)*text_color;
-#define _col col+=char(vec2(195.0,1560.0),uv)*text_color;
-#define _scl col+=char(vec2(195.0,1544.0),uv)*text_color;
-#define _les col+=char(vec2(135300.0,66052.0),uv)*text_color;
-#define _equ col+=char(vec2(496.0,3968.0),uv)*text_color;
-#define _grt col+=char(vec2(528416.0,541200.0),uv)*text_color;
-#define _que col+=char(vec2(934929.0,1081352.0),uv)*text_color;
-#define _ats col+=char(vec2(935285.0,714780.0),uv)*text_color;
-#define _A col+=char(vec2(935188.0,780450.0),uv)*text_color;
-#define _B col+=char(vec2(1983767.0,1190076.0),uv)*text_color;
-#define _C col+=char(vec2(935172.0,133276.0),uv)*text_color;
-#define _D col+=char(vec2(1983764.0,665788.0),uv)*text_color;
-#define _E col+=char(vec2(2048263.0,1181758.0),uv)*text_color;
-#define _F col+=char(vec2(2048263.0,1181728.0),uv)*text_color;
-#define _G col+=char(vec2(935173.0,1714334.0),uv)*text_color;
-#define _H col+=char(vec2(1131799.0,1714338.0),uv)*text_color;
-#define _I col+=char(vec2(921665.0,33308.0),uv)*text_color;
-#define _J col+=char(vec2(66576.0,665756.0),uv)*text_color;
-#define _K col+=char(vec2(1132870.0,166178.0),uv)*text_color;
-#define _L col+=char(vec2(1065220.0,133182.0),uv)*text_color;
-#define _M col+=char(vec2(1142100.0,665762.0),uv)*text_color;
-#define _N col+=char(vec2(1140052.0,1714338.0),uv)*text_color;
-#define _O col+=char(vec2(935188.0,665756.0),uv)*text_color;
-#define _P col+=char(vec2(1983767.0,1181728.0),uv)*text_color;
-#define _Q col+=char(vec2(935188.0,698650.0),uv)*text_color;
-#define _R col+=char(vec2(1983767.0,1198242.0),uv)*text_color;
-#define _S col+=char(vec2(935171.0,1058972.0),uv)*text_color;
-#define _T col+=char(vec2(2035777.0,33288.0),uv)*text_color;
-#define _U col+=char(vec2(1131796.0,665756.0),uv)*text_color;
-#define _V col+=char(vec2(1131796.0,664840.0),uv)*text_color;
-#define _W col+=char(vec2(1131861.0,699028.0),uv)*text_color;
-#define _X col+=char(vec2(1131681.0,84130.0),uv)*text_color;
-#define _Y col+=char(vec2(1131794.0,1081864.0),uv)*text_color;
-#define _Z col+=char(vec2(1968194.0,133180.0),uv)*text_color;
-#define _lsb col+=char(vec2(925826.0,66588.0),uv)*text_color;
-#define _rsl col+=char(vec2(16513.0,16512.0),uv)*text_color;
-#define _rsb col+=char(vec2(919584.0,1065244.0),uv)*text_color;
-#define _pow col+=char(vec2(272656.0,0.0),uv)*text_color;
-#define _usc col+=char(vec2(0.0,62.0),uv)*text_color;
-#define _a col+=char(vec2(224.0,649374.0),uv)*text_color;
-#define _b col+=char(vec2(1065444.0,665788.0),uv)*text_color;
-#define _c col+=char(vec2(228.0,657564.0),uv)*text_color;
-#define _d col+=char(vec2(66804.0,665758.0),uv)*text_color;
-#define _e col+=char(vec2(228.0,772124.0),uv)*text_color;
-#define _f col+=char(vec2(401543.0,1115152.0),uv)*text_color;
-#define _g col+=char(vec2(244.0,665474.0),uv)*text_color;
-#define _h col+=char(vec2(1065444.0,665762.0),uv)*text_color;
-#define _i col+=char(vec2(262209.0,33292.0),uv)*text_color;
-#define _j col+=char(vec2(131168.0,1066252.0),uv)*text_color;
-#define _k col+=char(vec2(1065253.0,199204.0),uv)*text_color;
-#define _l col+=char(vec2(266305.0,33292.0),uv)*text_color;
-#define _m col+=char(vec2(421.0,698530.0),uv)*text_color;
-#define _n col+=char(vec2(452.0,1198372.0),uv)*text_color;
-#define _o col+=char(vec2(228.0,665756.0),uv)*text_color;
-#define _p col+=char(vec2(484.0,667424.0),uv)*text_color;
-#define _q col+=char(vec2(244.0,665474.0),uv)*text_color;
-#define _r col+=char(vec2(354.0,590904.0),uv)*text_color;
-#define _s col+=char(vec2(228.0,114844.0),uv)*text_color;
-#define _t col+=char(vec2(8674.0,66824.0),uv)*text_color;
-#define _u col+=char(vec2(292.0,1198868.0),uv)*text_color;
-#define _v col+=char(vec2(276.0,664840.0),uv)*text_color;
-#define _w col+=char(vec2(276.0,700308.0),uv)*text_color;
-#define _x col+=char(vec2(292.0,1149220.0),uv)*text_color;
-#define _y col+=char(vec2(292.0,1163824.0),uv)*text_color;
-#define _z col+=char(vec2(480.0,1148988.0),uv)*text_color;
-#define _lpa col+=char(vec2(401542.0,66572.0),uv)*text_color;
-#define _bar col+=char(vec2(266304.0,33288.0),uv)*text_color;
-#define _rpa col+=char(vec2(788512.0,1589528.0),uv)*text_color;
-#define _tid col+=char(vec2(675840.0,0.0),uv)*text_color;
-#define _lar col+=char(vec2(8387.0,1147904.0),uv)*text_color;
-#define _nl print_pos = start_pos - vec2(0,CHAR_SPACING.y);
-
-//Extracts bit b from the given number.
-float extract_bit(float n, float b)
-{
-	b = clamp(b,-1.0,22.0);
-	return floor(mod(floor(n / pow(2.0,floor(b))),2.0));   
-}
-
-//Returns the pixel at uv in the given bit-packed sprite.
-float sprite(vec2 spr, vec2 size, vec2 uv)
-{
-	uv = floor(uv);
-	float bit = (size.x-uv.x-1.0) + uv.y * size.x;  
-	bool bounds = all(greaterThanEqual(uv,vec2(0)))&& all(lessThan(uv,size)); 
-	return bounds ? extract_bit(spr.x, bit - 21.0) + extract_bit(spr.y, bit) : 0.0;
-}
-
-//Prints a character and moves the print position forward by 1 character width.
-vec3 char(vec2 ch, vec2 uv)
-{
-	float px = sprite(ch, CHAR_SIZE, uv - print_pos);
-	print_pos.x += CHAR_SPACING.x;
-	print_pos.y += sin(4.*print_pos.x-time*10.);
-	return vec3(px);
-}
-
-
-vec3 Text(vec2 uv)
-{
-    	vec3 col = vec3(0.0);
-    	
-    	vec2 center_pos = vec2(resolution.x/2.0 - STRWIDTH(20.0)/2.0,resolution.y/2.0 - STRHEIGHT(1.0)/2.0);
-       	
-    	BEGIN_TEXT(center_pos.x,center_pos.y)
-	HEX(0x00ffFF) _ _ _w _a _t _e _r _ _;
-	BEGIN_TEXT(resolution.x/2.0-STRWIDTH(11.0)/2.0,resolution.y/2.0)
-	print_pos += vec2(cos(time)*96.,sin(time)*96.);
-	
-	// RGB(1,0,0) _M RGB(1,.5,0)_o RGB(1,1,0)_v RGB(0,1,0)_i RGB(0,.5,1)_n RGB(0.5,0,1)_g _ RGB(1,0,0)_T RGB(1,.5,0)_e RGB(1,1,0)_x RGB(0,1,0)_t
-    
-    	return col;
-}
-
-void main( void )
-{
-	vec2 uv = gl_FragCoord.xy;
-	vec2 duv = floor(gl_FragCoord.xy);
-    
-	vec3 pixel = Text(duv);
-    
-	vec3 col = pixel*0.9+0.1;
-	col *= (1.-distance(mod(uv,vec2(1.0)),vec2(0.65)))*1.2;
-	
-	gl_FragColor = vec4(vec3(col), 1.0);
-}
@@ -1,108 +0,0 @@
-#ifdef GL_ES
-precision mediump float;
-#endif
-
-uniform float time;
-uniform vec2 resolution;
-
-#define iTime time * 0.05 + 50.0
-#define iResolution resolution
-#define fragCoord gl_FragCoord
-#define fragColor gl_FragColor
-
-float colormap_red(float x) {
-    if (x < 0.0) {
-        return 54.0 / 255.0;
-    } else if (x < 20049.0 / 82979.0) {
-        return (829.79 * x + 54.51) / 255.0;
-    } else {
-        return 1.0;
-    }
-}
-
-float colormap_green(float x) {
-    if (x < 20049.0 / 82979.0) {
-        return 0.0;
-    } else if (x < 327013.0 / 810990.0) {
-        return (8546482679670.0 / 10875673217.0 * x - 2064961390770.0 / 10875673217.0) / 255.0;
-    } else if (x <= 1.0) {
-        return (103806720.0 / 483977.0 * x + 19607415.0 / 483977.0) / 255.0;
-    } else {
-        return 1.0;
-    }
-}
-
-float colormap_blue(float x) {
-    if (x < 0.0) {
-        return 54.0 / 255.0;
-    } else if (x < 7249.0 / 82979.0) {
-        return (829.79 * x + 54.51) / 255.0;
-    } else if (x < 20049.0 / 82979.0) {
-        return 127.0 / 255.0;
-    } else if (x < 327013.0 / 810990.0) {
-        return (792.02249341361393720147485376583 * x - 64.364790735602331034989206222672) / 255.0;
-    } else {
-        return 1.0;
-    }
-}
-
-vec4 colormap(float x) {
-    return vec4(colormap_red(x), colormap_green(x), colormap_blue(x), 1.0);
-}
-
-// https://iquilezles.org/articles/warp
-/*float noise( in vec2 x )
-{
-    vec2 p = floor(x);
-    vec2 f = fract(x);
-    f = f*f*(3.0-2.0*f);
-    float a = textureLod(iChannel0,(p+vec2(0.5,0.5))/256.0,0.0).x;
-	float b = textureLod(iChannel0,(p+vec2(1.5,0.5))/256.0,0.0).x;
-	float c = textureLod(iChannel0,(p+vec2(0.5,1.5))/256.0,0.0).x;
-	float d = textureLod(iChannel0,(p+vec2(1.5,1.5))/256.0,0.0).x;
-    return mix(mix( a, b,f.x), mix( c, d,f.x),f.y);
-}*/
-
-
-float rand(vec2 n) { 
-    return fract(sin(dot(n, vec2(12.9898, 4.1414))) * 43758.5453);
-}
-
-float noise(vec2 p){
-    vec2 ip = floor(p);
-    vec2 u = fract(p);
-    u = u*u*(3.0-2.0*u);
-
-    float res = mix(
-        mix(rand(ip),rand(ip+vec2(1.0,0.0)),u.x),
-        mix(rand(ip+vec2(0.0,1.0)),rand(ip+vec2(1.0,1.0)),u.x),u.y);
-    return res*res;
-}
-
-const mat2 mtx = mat2( 0.80,  0.60, -0.60,  0.80 );
-
-float fbm( vec2 p )
-{
-    float f = 0.0;
-
-    f += 0.500000*noise( p + iTime  ); p = mtx*p*2.02;
-    f += 0.031250*noise( p ); p = mtx*p*2.01;
-    f += 0.250000*noise( p ); p = mtx*p*2.03;
-    f += 0.125000*noise( p ); p = mtx*p*2.01;
-    f += 0.062500*noise( p ); p = mtx*p*2.04;
-    f += 0.015625*noise( p + sin(iTime) );
-
-    return f/0.96875;
-}
-
-float pattern( in vec2 p )
-{
-	return fbm( p + fbm( p + fbm( p ) ) );
-}
-
-void main()
-{
-    vec2 uv = fragCoord.xy/iResolution.x;
-	float shade = pattern(uv);
-    fragColor = vec4(colormap(shade).rgb, shade);
-}
@@ -1,162 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.waybar;
-  theme = config.theming;
-  colors = theme.colors;
-in
-{
-  options.modules.waybar = {
-    enable = mkEnableOption "waybar";
-  };
-
-  config = mkIf cfg.enable {
-    home.packages = with pkgs; [
-      pulsemixer
-      playerctl
-      wpa_supplicant_gui # TODO: Move
-    ];
-
-    modules.desktop.reloadScript = ''
-      # if ${pkgs.procps}/bin/pgrep waybar; then
-      #   ${pkgs.procps}/bin/pkill waybar
-      # fi
-      ${pkgs.waybar}/bin/waybar &
-    '';
-
-    programs.waybar = {
-      enable = true;
-      settings = {
-        mainBar = {
-          layer = "top";
-          spacing = 16;
-          modules-left = [ "river/tags" ];
-          modules-center = [
-            #"river/window"
-            "mpris"
-          ];
-          modules-right = [
-            "bluetooth"
-            "network"
-            "pulseaudio"
-            "battery"
-            "clock"
-          ];
-          "river/window" = {
-            max-length = 50;
-          };
-          "river/tags" = {
-            tag-labels = [
-              "一"
-              "二"
-              "三"
-              "四"
-              "五"
-              "六"
-              "七"
-              "八"
-              "九"
-            ];
-            disable-click = false;
-          };
-          network = {
-            tooltip = false;
-            on-click = "wpa_gui";
-            format-wifi = "直 {essid}"; # Spacing achieved using "Thin Space"
-            format-ethernet = "TODO";
-            format-disconnected = "睊";
-          };
-          pulseaudio = {
-            tooltip = false;
-            format = "{icon}   {volume}%"; # Spacing achieved using "Thin Space"
-            #format-muted = "";
-            format-muted = "{icon}  --%"; # Spacing achieved using "Thin Space"
-            format-icons = {
-              #headphone = "";
-              #default = [ "" "" ];
-              headphone = "";
-              headphone-muted = "";
-              default = [
-                ""
-                ""
-                ""
-              ];
-            };
-          };
-          battery = {
-            format = "{icon} {capacity}%"; # Spacing achieved using "Thin Space"
-            format-charging = " {capacity}%"; # Spacing achieved using "Thin Space"
-            #format-icons = [ "󰂎" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹" ];
-            format-icons = [
-              ""
-              ""
-              ""
-              ""
-              ""
-              ""
-              ""
-              ""
-              ""
-              ""
-              ""
-            ];
-            interval = 1;
-          };
-          clock = {
-            #format = "󰅐 {:%H:%M}";
-            #format = "   {:%H:%M}"; # Spacing achieved using "Thin Space"
-            format = "{:%H:%M}";
-          };
-          mpris = {
-            format = "{dynamic}";
-            tooltip-format = "";
-            interval = 1;
-          };
-          bluetooth = {
-            tooltip = false;
-            format = "  {status}"; # Spacing achieved using "Thin Space"
-            format-connected = "  {device_alias}"; # Spacing achieved using "Thin Space"
-          };
-        };
-      };
-      # TODO: Replace base03 color with named color
-      style = ''
-        window#waybar {
-          color: #${colors.fg};
-          background-color: #${colors.bg};
-          border-style: none none solid none;
-          border-width: ${toString theme.layout.borderSize}px;
-          border-color: #${colors.border-unfocused};
-          font-size: 12px;
-          font-family: "${theme.fonts.monospace.name}";
-        }
-
-        .modules-right {
-          margin: 0 8px 0 0;
-        }
-
-        #tags button {
-          color: #${theme.schemeColors.base03};
-          padding: 0 5px 1px 5px;
-          border-radius: 0;
-          font-size: 16px;
-          font-family: "wenquanyi bitmap song";
-        }
-
-        #tags button.occupied {
-          color: #${colors.fg};
-        }
-
-        #tags button.focused {
-          color: #${colors.accent};
-        }
-      '';
-    };
-  };
-}
@@ -1,69 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.desktop;
-in
-{
-  imports = [
-    # Import desktop environment modules
-    ./background/glpaper/default.nix
-    ./bar/waybar.nix
-    ./lock-screen/waylock.nix
-    ./window-manager/river.nix
-  ];
-
-  options.modules.desktop = {
-    wayland = mkEnableOption "wayland";
-    initScript = mkOption {
-      type = types.lines;
-      default = "${pkgs.bash}/bin/bash";
-      description = "Bash script to execute after logging in.";
-    };
-    reloadScript = mkOption {
-      type = types.lines;
-      default = "";
-      description = "Shell script to execute after reload/rebuild.";
-    };
-  };
-
-  config = {
-    # Ensure desktop related systemd services (xdg) have access to session variables.
-    systemd.user.sessionVariables = config.home.sessionVariables;
-
-    home.packages = optionals cfg.wayland (
-      with pkgs;
-      [
-        wl-clipboard
-        wtype
-        grim
-        slurp
-      ]
-    );
-
-    home.activation = {
-      customReloadScript = lib.hm.dag.entryAfter [ "writeBoundary" ] (
-        ''
-          #!${pkgs.bash}/bin/bash
-        ''
-        + cfg.reloadScript
-      );
-    };
-
-    home.file.".initrc" = {
-      enable = true;
-      executable = true;
-      text =
-        ''
-          #!${pkgs.bash}/bin/bash
-
-        ''
-        + cfg.initScript;
-    };
-  };
-}
@@ -1,20 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.waylock;
-in
-{
-  options.modules.waylock = {
-    enable = mkEnableOption "waylock";
-  };
-
-  config = {
-    home.packages = mkIf cfg.enable (with pkgs; [ waylock ]);
-  };
-}